X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=automanga;h=39262a75e1912cd0f3a3370577f9cb38d86844ca;hb=9bdfc96815a1515db28e08d63eab05f2b925fb82;hp=e5f0a7a7acc95a4edf36f7be3e6d41615dc7e73e;hpb=1e28222bb93251b69b2dccdc1ef4fe524a73e84a;p=automanga.git diff --git a/automanga b/automanga index e5f0a7a..39262a7 100755 --- a/automanga +++ b/automanga @@ -1,11 +1,11 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys, getopt import manga.lib, manga.reader, manga.profile, manga.local -import glib, gobject, gtk +from gi.repository import Gtk, Gdk, GObject -gobject.threads_init() -gtk.gdk.threads_init() +GObject.threads_init() +Gdk.threads_init() def usage(out): out.write("usage: automanga [-h] [-p PROFILE] {DIRECTORY|-l LIBRARY ID|-a ALIAS}\n") @@ -110,7 +110,7 @@ def main(): 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) @@ -139,10 +139,10 @@ def main(): else: libname = "local" try: - if len(args) > 0: - mdir = args.pop(0) - else: - mdir = "." + if len(args) < 1: + usage(sys.stderr) + sys.exit(1) + mdir = args.pop(0) mng = manga.local.manga(mdir) except TypeError: sys.stderr.write("automanga: not a valid manga directory: %s\n" % mdir) @@ -162,7 +162,7 @@ def main(): reader = manga.reader.reader(mng, mprof) reader.show() - gtk.main() + Gtk.main() try: main()