Add --continue option.
This commit is contained in:
parent
77b8daf2f9
commit
fbef0e5b73
5 changed files with 43 additions and 33 deletions
|
@ -6,6 +6,9 @@ Features:
|
||||||
- comics: Added GrrlPower comic strip.
|
- comics: Added GrrlPower comic strip.
|
||||||
- comics: Added Spinnerette comic strip.
|
- comics: Added Spinnerette comic strip.
|
||||||
|
|
||||||
|
Changes:
|
||||||
|
- cmdline: Added the --continue option.
|
||||||
|
|
||||||
Fixes:
|
Fixes:
|
||||||
- comics: Fixed Gunnerkrigcourt comic strip.
|
- comics: Fixed Gunnerkrigcourt comic strip.
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,9 @@ sections for more information. This is useful when you missed some days
|
||||||
and want only to download the missing files. To make this task easy,
|
and want only to download the missing files. To make this task easy,
|
||||||
the traversal ends at the first existing image file when starting from
|
the traversal ends at the first existing image file when starting from
|
||||||
an index (excluding the index itself).
|
an index (excluding the index itself).
|
||||||
|
\fB\-c\fP, \fB\-\-continue\fP
|
||||||
|
Same as \fB\-\-all\fP, but stop at the first existing image file.
|
||||||
|
Useful for cron jobs that are not executed every day.
|
||||||
.TP
|
.TP
|
||||||
\fB\-h\fP, \fB\-\-help\fP
|
\fB\-h\fP, \fB\-\-help\fP
|
||||||
Output brief help information.
|
Output brief help information.
|
||||||
|
|
|
@ -46,6 +46,9 @@ sections for more information. This is useful when you missed some days
|
||||||
and want only to download the missing files. To make this task easy,
|
and want only to download the missing files. To make this task easy,
|
||||||
the traversal ends at the first existing image file when starting from
|
the traversal ends at the first existing image file when starting from
|
||||||
an index (excluding the index itself).
|
an index (excluding the index itself).
|
||||||
|
<B>-c</B>, <B>--continue</B>
|
||||||
|
Same as <B>--all</B>, but stop at the first existing image file.
|
||||||
|
Useful for cron jobs that are not executed every day.
|
||||||
<DT><B>-h</B>, <B>--help</B><DD>
|
<DT><B>-h</B>, <B>--help</B><DD>
|
||||||
Output brief help information.
|
Output brief help information.
|
||||||
<DT><B>-l</B>, <B>--list</B><DD>
|
<DT><B>-l</B>, <B>--list</B><DD>
|
||||||
|
|
|
@ -34,6 +34,9 @@ OPTIONS
|
||||||
download the missing files. To make this task easy, the
|
download the missing files. To make this task easy, the
|
||||||
traversal ends at the first existing image file when
|
traversal ends at the first existing image file when
|
||||||
starting from an index (excluding the index itself).
|
starting from an index (excluding the index itself).
|
||||||
|
-c, --continue Same as --all, but stop at the first
|
||||||
|
existing image file. Useful for cron jobs that are not
|
||||||
|
executed every day.
|
||||||
|
|
||||||
-h, --help
|
-h, --help
|
||||||
Output brief help information.
|
Output brief help information.
|
||||||
|
|
8
dosage
8
dosage
|
@ -24,6 +24,7 @@ def setupOptions():
|
||||||
parser.add_option('-v', '--verbose', action='count', dest='verbose', default=0, help='provides verbose output, use multiple times for more verbosity')
|
parser.add_option('-v', '--verbose', action='count', dest='verbose', default=0, help='provides verbose output, use multiple times for more verbosity')
|
||||||
parser.add_option('-n', '--numstrips', action='store', dest='numstrips', type='int', default=0, help='traverse and retrieve the given number of comic strips; use --all to retrieve all comic strips')
|
parser.add_option('-n', '--numstrips', action='store', dest='numstrips', type='int', default=0, help='traverse and retrieve the given number of comic strips; use --all to retrieve all comic strips')
|
||||||
parser.add_option('-a', '--all', action='store_true', dest='all', default=None, help='traverse and retrieve all comic strips')
|
parser.add_option('-a', '--all', action='store_true', dest='all', default=None, help='traverse and retrieve all comic strips')
|
||||||
|
parser.add_option('-c', '--continue', action='store_true', dest='cont', default=None, help='traverse and retrieve comic strips until an existing one is found')
|
||||||
parser.add_option('-b', '--basepath', action='store', dest='basepath', default='Comics', help='set the path to create invidivual comic directories in, default is Comics', metavar='PATH')
|
parser.add_option('-b', '--basepath', action='store', dest='basepath', default='Comics', help='set the path to create invidivual comic directories in, default is Comics', metavar='PATH')
|
||||||
parser.add_option('--baseurl', action='store', dest='baseurl', default=None, help='the base URL of your comics directory (for RSS, HTML, etc.); this should correspond to --base-path', metavar='PATH')
|
parser.add_option('--baseurl', action='store', dest='baseurl', default=None, help='the base URL of your comics directory (for RSS, HTML, etc.); this should correspond to --base-path', metavar='PATH')
|
||||||
parser.add_option('-l', '--list', action='store_const', const=1, dest='list', help='list available comic modules')
|
parser.add_option('-l', '--list', action='store_const', const=1, dest='list', help='list available comic modules')
|
||||||
|
@ -125,17 +126,14 @@ def getStrips(scraperobj, options):
|
||||||
strips = scraperobj.getAllStrips(options.numstrips)
|
strips = scraperobj.getAllStrips(options.numstrips)
|
||||||
else:
|
else:
|
||||||
strips = scraperobj.getCurrentStrips()
|
strips = scraperobj.getCurrentStrips()
|
||||||
first = True
|
|
||||||
try:
|
try:
|
||||||
for strip in strips:
|
for strip in strips:
|
||||||
_errors, skipped = saveComicStrip(strip, options.basepath)
|
_errors, skipped = saveComicStrip(strip, options.basepath)
|
||||||
errors += _errors
|
errors += _errors
|
||||||
if not first and skipped and scraperobj.indexes:
|
if skipped and options.cont:
|
||||||
# stop when indexed retrieval skipped all images for one
|
# stop when retrieval skipped an image for one comic strip
|
||||||
# comic strip (except the first one)
|
|
||||||
out.info("Stop retrieval because image file already exists")
|
out.info("Stop retrieval because image file already exists")
|
||||||
break
|
break
|
||||||
first = False
|
|
||||||
except (ValueError, IOError) as msg:
|
except (ValueError, IOError) as msg:
|
||||||
out.error(msg)
|
out.error(msg)
|
||||||
errors += 1
|
errors += 1
|
||||||
|
|
Loading…
Reference in a new issue