From c467260b6532524f7358d35c25f9c7f8bad63ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= Date: Sat, 20 Feb 2016 16:14:40 +0100 Subject: [PATCH] nicer messages --- napi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/napi b/napi index 8cee28c..252e8d9 100755 --- a/napi +++ b/napi @@ -29,8 +29,8 @@ input_filename = '/tmp/napi-temp-file' language = "PL" -if(len(sys.argv)==1): - print "wy*dalaj na stadion po film" +if len(sys.argv) < 2: + print "usage: %s " % sys.argv[0] sys.exit(2) d = md5.new() @@ -56,7 +56,7 @@ def download_subtitles(digest): xml = ET.XML(response.read()) content = xml.find("subtitles").find("content").text except: - print "nie ma napisa do filmu: ", sys.argv[1] + print "%s: No subtitles" % (movie_filename,) sys.exit(2) with open(input_filename, "w") as input_file: input_file.write(base64.b64decode(content)) @@ -76,11 +76,11 @@ def download_subtitles(digest): result = process.wait() if result != 0: - print "nie ma napisa do filmu", sys.argv[1] - os.remove(nazwa) - else: - print "napisy pobrano, milordzie!" - + print "%s: 7zip returned non-zero code: %s" % (movie_filename, subtitle_filename) + os.remove(nazwa) + sys.exit(3) + + print "%s: Subtitles fetched successfully to %s" % (movie_filename, nazwa) os.remove(input_filename) download_subtitles(d.hexdigest())