Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'python3' of wolf:src/automanga into python3
[automanga.git]
/
automanga
diff --git
a/automanga
b/automanga
index
98b3c9b
..
bb6c4d5
100755
(executable)
--- a/
automanga
+++ b/
automanga
@@
-1,11
+1,11
@@
-#!/usr/bin/python
+#!/usr/bin/python
3
import sys, getopt
import manga.lib, manga.reader, manga.profile, manga.local
import sys, getopt
import manga.lib, manga.reader, manga.profile, manga.local
-import glib, gobject, gtk
+from gi.repository import Gtk, Gdk, GObject
-
go
bject.threads_init()
-
gtk.g
dk.threads_init()
+
GO
bject.threads_init()
+
G
dk.threads_init()
def usage(out):
out.write("usage: automanga [-h] [-p PROFILE] {DIRECTORY|-l LIBRARY ID|-a ALIAS}\n")
def usage(out):
out.write("usage: automanga [-h] [-p PROFILE] {DIRECTORY|-l LIBRARY ID|-a ALIAS}\n")
@@
-79,7
+79,11
@@
def main():
if listtag is not None:
if profile is not None:
for mprof in profile.bytag(listtag):
if listtag is not None:
if profile is not None:
for mprof in profile.bytag(listtag):
- mng = mprof.open()
+ try:
+ mng = mprof.open()
+ except KeyError:
+ sys.stderr.write("%s %s: no longer found\n" % (mprof.libnm, mprof.id))
+ continue
sys.stdout.write("%s %s: \"%s\"\n" % (mprof.libnm, mprof.id, mng.name))
return
sys.stdout.write("%s %s: \"%s\"\n" % (mprof.libnm, mprof.id, mng.name))
return
@@
-106,7
+110,7
@@
def main():
try:
libname, mid = profile.getalias(alias)
except KeyError:
try:
libname, mid = profile.getalias(alias)
except KeyError:
- sys.stderr("automanga: no such alias: %s\n" % alias)
+ sys.stderr
.write
("automanga: no such alias: %s\n" % alias)
sys.exit(1)
try:
lib = manga.lib.findlib(libname)
sys.exit(1)
try:
lib = manga.lib.findlib(libname)
@@
-158,7
+162,7
@@
def main():
reader = manga.reader.reader(mng, mprof)
reader.show()
reader = manga.reader.reader(mng, mprof)
reader.show()
-
g
tk.main()
+
G
tk.main()
try:
main()
try:
main()