dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Merge branch 'master' into htmlparser

Browse source
This commit is contained in:
Bastian Kleineidam 2014-08-07 18:10:15 +02:00
commit e87f5993b8
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/web/content/comics/CyanideAndHappiness.md
View file

@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') {
<th>Status</th><td>ok on 22.01.2014</td>
</tr>
<tr>
<th>Votes</th><td>2
<th>Votes</th><td>3
<form action="http://gaecounter.appspot.com/count/" method="POST">
<input name="name" type="hidden" value="CyanideAndHappiness"/>
<input name="uid" type="hidden" id="voteuid" value=""/>

2
doc/web/content/comics/NichtLustig.md
View file

@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') {
<th>Status</th><td>ok on 22.01.2014</td>
</tr>
<tr>
<th>Votes</th><td>4
<th>Votes</th><td>5
<form action="http://gaecounter.appspot.com/count/" method="POST">
<input name="name" type="hidden" value="NichtLustig"/>
<input name="uid" type="hidden" id="voteuid" value=""/>

2
doc/web/content/comics/Ruthe.md
View file

@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') {
<th>Status</th><td>ok on 22.01.2014</td>
</tr>
<tr>
<th>Votes</th><td>1
<th>Votes</th><td>2
<form action="http://gaecounter.appspot.com/count/" method="POST">
<input name="name" type="hidden" value="Ruthe"/>
<input name="uid" type="hidden" id="voteuid" value=""/>

6
doc/web/media/js/comicdata.js
View file

@ -464,7 +464,7 @@ $(document).ready(function() {
["<a href=\"comics/CucumberQuest.html\">CucumberQuest</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/Curtailed.html\">Curtailed</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/Curvy.html\">Curvy</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/CyanideAndHappiness.html\">CyanideAndHappiness</a>", "Other", "English", "ok", "2"],
["<a href=\"comics/CyanideAndHappiness.html\">CyanideAndHappiness</a>", "Other", "English", "ok", "3"],
["<a href=\"comics/DMFA.html\">DMFA</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/DailyDose.html\">DailyDose</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/DamnLol.html\">DamnLol</a>", "Other", "English", "ok", "0"],
@ -1146,7 +1146,7 @@ $(document).ready(function() {
["<a href=\"comics/NeoEarth.html\">NeoEarth</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/NewAdventuresOfBobbin.html\">NewAdventuresOfBobbin</a>", "Other", "English", "error", "0"],
["<a href=\"comics/NewWorld.html\">NewWorld</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/NichtLustig.html\">NichtLustig</a>", "Other", "German", "ok", "4"],
["<a href=\"comics/NichtLustig.html\">NichtLustig</a>", "Other", "German", "ok", "5"],
["<a href=\"comics/Nicky510.html\">Nicky510</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/NineteenNinetySeven.html\">1997</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/Nnewts.html\">Nnewts</a>", "Other", "English", "ok", "0"],
@ -1210,7 +1210,7 @@ $(document).ready(function() {
["<a href=\"comics/RedsPlanet.html\">RedsPlanet</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/RomanticallyApocalyptic.html\">RomanticallyApocalyptic</a>", "Other", "English", "error", "0"],
["<a href=\"comics/Roza.html\">Roza</a>", "Other", "English", "error", "0"],
["<a href=\"comics/Ruthe.html\">Ruthe</a>", "Other", "German", "ok", "1"],
["<a href=\"comics/Ruthe.html\">Ruthe</a>", "Other", "German", "ok", "2"],
["<a href=\"comics/SMBC.html\">SMBC</a>", "Other", "English", "ok", "2"],
["<a href=\"comics/SPQRBlues.html\">SPQRBlues</a>", "Other", "English", "ok", "0"],
["<a href=\"comics/SabrinaOnline.html\">SabrinaOnline</a>", "Other", "English", "ok", "0"],

2
dosagelib/plugins/d.py
View file

@ -159,7 +159,7 @@ class DieFruehreifen(_BasicScraper):
url = 'http://www.die-fruehreifen.de/index.php'
stripUrl = url + '?id=%s&order=DESC'
firstStripUrl = stripUrl % '1'
imageSearch = compile(tagre("img", "src", r"(strips/[F,f]rueh[_]?[S,s]trip_\d+.jpg)"))
imageSearch = compile(tagre("img", "src", r'([^"]*/strips/[Ff]rueh_?[Ss]trip_\d+.jpg)'))
prevSearch = compile(tagre("a", "href", r"(index\.php\?id=\d+&order=DESC)") + tagre("img","id",r"naechster"))
help = 'Index format: n (unpadded)'
lang = 'de'

4
dosagelib/plugins/r.py
View file

@ -96,6 +96,6 @@ class Ruthe(_BasicScraper):
stripUrl = url + 'index.php?pic=%s&sort=datum&order=ASC'
firstStripUrl = stripUrl % '1'
lang = 'de'
imageSearch = compile(tagre("img", "src", r'(cartoons/strip_\d+[^"]+)'))
prevSearch = compile(tagre("a", "href", r'(index\.php\?pic=[^"]+)', before="b_back"))
imageSearch = compile(tagre("img", "src", r'(/?cartoons/strip_\d+[^"]+)'))
prevSearch = compile(tagre("a", "href", r'(/cartoon/\d+/datum/asc/)')+'vorheriger')
help = 'Index format: number'