Output errors to standard error

[software/subdivxget.git] / subdivxget

diff --git a/subdivxget b/subdivxget
index ae79cde813d65ece9e591c2973104e3565c1d613..e938ac8e3b01c1d2254134922889f98573619c3b 100755 (executable)
--- a/subdivxget
+++ b/subdivxget
@@ -16,6 +16,19 @@ else:
 import zipfile
 import subprocess
 
+
+def output(fo, fmt, *args, **kargs):
+       if not args:
+               args = kargs
+       fo.write((fmt % args) + '\n')
+
+def echo(fmt, *args, **kargs):
+       output(sys.stdout, fmt, *args, **kargs)
+
+def error(fmt, *args, **kargs):
+       output(sys.stderr, fmt, *args, **kargs)
+
+
 class SubDivXQuery:
        def __init__(self, to_search, page_number):
                self.host = "www.subdivx.com"
@@ -202,42 +215,44 @@ def subdivx_get_subs(query_str):
                subs.extend(parser.subs)
                page_number += 1
 
-       return sorted(subs, key=lambda s: int(s['downloads']), reverse=True)
+       return subs
 
 
 def get_subs(query_str, filters):
+       sub_exts = ('.srt', '.sub')
        zip_exts = ('application/zip',)
        rar_exts = ('application/rar', 'application/x-rar-compressed')
 
        subs = subdivx_get_subs(query_str)
        subs = filter_subtitles(subs, filters)
+       subs.sort(key=lambda s: int(s['downloads']), reverse=True)
 
        for sub in subs:
-               print('''\
+               echo('''\
 - %(titulo)s (%(autor)s - %(fecha)s - %(downloads)s - %(comentarios)s)
   %(desc)s
        DOWNLOADING ...
-''' % sub)
-               continue
+''', **sub)
                fname, headers = urlretrieve(sub['url'])
                if 'Content-Type' in headers:
                        if headers['Content-Type'] in zip_exts:
                                z = zipfile.ZipFile(fname, 'r')
                                z.printdir()
                                for fn in z.namelist():
-                                       if fn.endswith('.srt') or fn.endswith('.sub'):
+                                       if fn.endswith(sub_exts):
                                                if '..' in fn or fn.startswith('/'):
-                                                       print('Dangerous file name:', fn)
+                                                       error('Dangerous file name: %s', fn)
                                                        continue
-                                               print('Extracting', fn, '...')
+                                               echo('Extracting %s...', fn)
                                                z.extract(fn)
                        elif headers['Content-Type'] in rar_exts:
                                if subprocess.call(['rar', 'x', fname]) != 0:
-                                       print('Error unraring file %s' % fname)
+                                       error('Error unraring file %s', fname)
                        else:
-                               print('Unrecognized file type:', headers['Content-Type'])
+                               error('Unrecognized file type:',
+                                               headers['Content-Type'])
                else:
-                       print('No Content-Type!')
+                       error('No Content-Type!')
 
 
 get_subs(sys.argv[1], sys.argv[2:])