X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=getmanga;h=bd8401eda887715d90b91db93983f8c92877206f;hb=71fc6aff8f1763c61e42d63f26b125292fecbc25;hp=e6a9c96d34ffd5c05f9c6cc0a9b7383c86605114;hpb=67983628115ac32e2bdce3b8ab4649743ef2b836;p=automanga.git

diff --git a/getmanga b/getmanga
index e6a9c96..bd8401e 100755
--- a/getmanga
+++ b/getmanga
@@ -12,7 +12,7 @@ def msg(vl, msg, *args):
         sys.stderr.write("getmanga: " + (msg % args) + "\n")
 
 def getprop(nm, default=None):
-    if "dl-" + nm in mprof.props:
+    if mprof and "dl-" + nm in mprof.props:
         return mprof.props["dl-" + nm]
     if nm in props:
         return props[nm]
@@ -83,11 +83,17 @@ def download(mng, tdir, pattern):
         msg(1, "getting %s...", nm)
         with page.open() as fp:
             with open(path, "wb") as out:
-                while True:
-                    data = fp.read(65536)
-                    if data == b"":
-                        break
-                    out.write(data)
+                done = False
+                try:
+                    while True:
+                        data = fp.read(65536)
+                        if data == b"":
+                            done = True
+                            break
+                        out.write(data)
+                finally:
+                    if not done:
+                        os.unlink(path)
             try:
                 img = Image.open(path)
             except OSError:
@@ -104,13 +110,18 @@ def download(mng, tdir, pattern):
         time.sleep(cwait)
 
 def usage(out):
-    out.write("usage: getmanga [-hv] [-w WAIT] [-p PROFILE] DIRECTORY [LIBRARY ID]\n")
+    out.write("usage: getmanga [-hv] [-w WAIT] [-p PROFILE] [-P PATTERN] DIRECTORY [LIBRARY ID]\n")
+    out.write("\tpattern templates:\n")
+    out.write("\t  %i\tSequence number\n")
+    out.write("\t  %n\tName\n")
+    out.write("\t  %d\tID\n")
 
 def main():
     global verbose, wait, mprof, props
 
-    opts, args = getopt.getopt(sys.argv[1:], "hvp:w:")
-    profnm = ""
+    opts, args = getopt.getopt(sys.argv[1:], "hvp:w:P:")
+    profnm = None
+    pattern = None
     for o, a in opts:
         if o == "-h":
             usage(sys.stdout)
@@ -121,6 +132,8 @@ def main():
             verbose += 1
         elif o == "-w":
             wait = int(a)
+        elif o == "-P":
+            pattern = a
     if len(args) < 1:
         usage(sys.stderr)
         sys.exit(1)
@@ -140,8 +153,10 @@ def main():
                 elif words[0] == "lset" and len(words) > 1:
                     props[words[1]] = words[2:]
 
-    if profnm == "":
+    if profnm is None:
         profile = manga.profile.profile.last()
+    elif profnm == "":
+        profile = None
     else:
         profile = manga.profile.profile.byname(profnm)
 
@@ -165,9 +180,12 @@ def main():
     except KeyError:
         sys.stderr.write("getmanga: no such manga: %s\n" % (mid))
         sys.exit(1)
-    mprof = profile.getmanga(libnm, mng.id)
+    if profile is not None:
+        mprof = profile.getmanga(libnm, mng.id)
+    else:
+        mprof = None
 
-    download(mprof.open(), tdir, getprop("pattern"))
+    download(mng, tdir, pattern or getprop("pattern"))
 
 if __name__ == "__main__":
     try: