Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coalesce local isolated pages.
[automanga.git]
/
automanga
diff --git
a/automanga
b/automanga
index
e80db3f
..
34c0805
100755
(executable)
--- a/
automanga
+++ b/
automanga
@@
-1,7
+1,7
@@
#!/usr/bin/python
import sys, getopt
#!/usr/bin/python
import sys, getopt
-import manga.lib, manga.reader
+import manga.lib, manga.reader
, manga.local
import glib, gobject, gtk
gobject.threads_init()
import glib, gobject, gtk
gobject.threads_init()
@@
-29,8
+29,8
@@
if search:
usage(sys.stderr)
sys.exit(1)
try:
usage(sys.stderr)
sys.exit(1)
try:
- lib = manga.lib.
libraries[args[0]]
- except
Key
Error:
+ lib = manga.lib.
findlib(args[0])
+ except
Import
Error:
sys.stderr.write("automanga: no such library: %s\n" % args[0])
sys.exit(1)
for manga in lib.byname(args[1]):
sys.stderr.write("automanga: no such library: %s\n" % args[0])
sys.exit(1)
for manga in lib.byname(args[1]):
@@
-42,8
+42,8
@@
if libname is not None:
usage(sys.stderr)
sys.exit(1)
try:
usage(sys.stderr)
sys.exit(1)
try:
- lib = manga.lib.
libraries[libname]
- except
Key
Error:
+ lib = manga.lib.
findlib(libname)
+ except
Import
Error:
sys.stderr.write("automanga: no such library: %s\n" % libname)
sys.exit(1)
try:
sys.stderr.write("automanga: no such library: %s\n" % libname)
sys.exit(1)
try:
@@
-52,8
+52,10
@@
if libname is not None:
sys.stderr.write("automanga: no such manga: %s\n" % args[0])
sys.exit(1)
else:
sys.stderr.write("automanga: no such manga: %s\n" % args[0])
sys.exit(1)
else:
- sys.stderr.write("automanga: local manga not yet implemented\n")
- sys.exit(1)
+ if len(args) > 0:
+ mng = manga.local.manga(args[0])
+ else:
+ mng = manga.local.manga(".")
reader = manga.reader.reader(mng)
reader.show()
reader = manga.reader.reader(mng)
reader.show()