Minor changes

fix style
fix tests
add exponential back-off to login

Author: mueslo

pythonbits/__main__.py

@@ -103,10 +103,6 @@ def n_to_p(x): return "--" + x.replace('_', '-')
     set_field['title_arg'] = args.title
     get_field = args.fields + args.fields_ex
 
-    if sys.version_info[0] == 2:  # PY2. Please die already.
-        for k, v in set_field.items():
-            set_field[k] = v.decode('utf8')
-
     return Category, set_field, get_field
 
 

pythonbits/bb.py

@@ -23,7 +23,7 @@
 from . import templating as bb
 from .submission import (Submission, form_field, finalize,
                          SubmissionAttributeError)
-from .tracker import Tracker, TrackerException
+from .tracker import Tracker
 from .scene import is_scene_crc, query_scene_fname
 
 
@@ -249,7 +249,6 @@ def _render_tv_specifier(self):
             return TvSpecifier(title, guess['season'],
                                guess.get('episode', None))
 
-
     @form_field('tags')
     def _render_tags(self):
         # todo: get episode-specific actors (from imdb?)
@@ -269,7 +268,8 @@ def _render_mediainfo_path(self):
         contained_files = []
         for dp, dns, fns in os.walk(self['path']):
             contained_files += [os.path.join(dp, fn) for fn in fns
-                                if os.path.getsize(os.path.join(dp, fn)) > 10 * 2**20]
+                                if (os.path.getsize(os.path.join(dp, fn))
+                                    > 10 * 2**20)]
         if len(contained_files) == 1:
             return contained_files[0]
 
@@ -359,16 +359,14 @@ def _render_source(self):
         #          TC, SDTV, DVD5, DVD9, HD-DVD
 
         # todo: replace with guess from self['guess']
-        if ('bluray' in self['path'].lower() or
-            'blu-ray' in self['path'].lower()):
-            return 'BluRay'
-            # todo: 3d
-        elif ('web-dl' in self['path'].lower() or
-              'webdl' in self['path'].lower()):
+        regpath = self['path'].lower().strip('-')
+        if 'bluray' in regpath:
+            return 'BluRay'  # todo: 3d
+        elif 'webdl' in regpath:
             return 'WEB-DL'
-        elif 'webrip' in self['path'].lower():
+        elif 'webrip' in regpath:
             return 'WebRip'
-        elif 'hdtv' in self['path'].lower():
+        elif 'hdtv' in regpath:
             return 'HDTV'
         # elif 'dvdscr' in self['path'].lower():
         #    markers['source'] = 'DVDSCR'
@@ -393,14 +391,15 @@ def _render_container(self):
         elif general['format'] == 'BDAV':
             return 'm2ts'
         else:
-            raise Exception("Unknown or unsupported container: %r" % (general.format,))
+            raise RuntimeError("Unknown or unsupported container '{}'".format(
+                general.format))
 
     def _render_video_codec(self):
         video_track = self['tracks']['video']
         # norm_bitrate = (float(bit_rate) /
         #     (video_track.width*video_track.height))
         if (video_track['codec_id'] in ('V_MPEG4/ISO/AVC', 'AVC', 'avc1') or
-            video_track['format'] == 'AVC'):
+                video_track['format'] == 'AVC'):
             if 'x264' in video_track.get('writing_library', ''):
                 return 'x264'
             else:
@@ -419,14 +418,15 @@ def _render_video_codec(self):
         elif video_track['format'] == 'MPEG Video':
             return 'MPEG-2'
         else:
-            raise Exception("Unknown or unsupported video codec: %r, %r" %
-                            (video_track.get('codec_id', '[NO CODEC]'),
-                             video_track.get('writing_library', '[NO LIBRARY]')))
+            msg = "Unknown or unsupported video codec '{}' ({})".format(
+                            video_track.get('codec_id'),
+                            video_track.get('writing_library'))
+            raise RuntimeError(msg)
 
     def _render_audio_codec(self):
         audio_track = self['tracks']['audio'][0]  # main audio track
         if (audio_track.get('codec_id_hint') == 'MP3' or
-            audio_track['codec_id'] in ('MPA1L3', '55')):
+                audio_track['codec_id'] in ('MPA1L3', '55')):
             return 'MP3'
         elif audio_track['codec_id'].lower().startswith('mp4a'):
             return 'AAC'
@@ -439,19 +439,21 @@ def _render_audio_codec(self):
 
         if audio_track['codec_id'].startswith('A_'):
             audio_track['codec_id'] = audio_track['codec_id'][2:]
-        audio_codecs = ('AC3', 'EAC3', 'DTS', 'FLAC', 'AAC', 'MP3', 'TRUEHD', 'PCM')
+        audio_codecs = ('AC3', 'EAC3', 'DTS', 'FLAC', 'AAC', 'MP3', 'TRUEHD',
+                        'PCM')
         for c in audio_codecs:
             if audio_track['codec_id'].startswith(c):
                 c = c.replace('EAC3', 'AC-3') \
                      .replace('AC3', 'AC-3') \
                      .replace('TRUEHD', 'True-HD')
                 return c
 
-        raise Exception("Unknown or unsupported audio codec: %r" %
-                        (audio_track['codec_id'],))
+        raise ValueError("Unknown or unsupported audio codec '{}'".format(
+            audio_track['codec_id']))
 
     def _render_resolution(self):
-        resolutions = ('2160p', '1080p', '720p', '1080i', '720i', '480p', '480i', 'SD')
+        resolutions = ('2160p', '1080p', '720p', '1080i', '720i',
+                       '480p', '480i', 'SD')
 
         # todo: replace with regex?
         # todo: compare result with mediainfo
@@ -594,7 +596,7 @@ def imdb_link(r):
             [b]Writer(s)[/b]: {writers}
             [b]Content rating[/b]: {contentrating}""").format(
                 title=s['episode_title'],
-                links=", ".join(bb.link(*l) for l in links),
+                links=", ".join(bb.link(*l) for l in links),  # noqa: E741
                 air_date=s['air_date'],
                 network=s['network'],
                 rating=rating_bb,
@@ -713,7 +715,7 @@ def imdb_link(r):
         [b]Director(s)[/b]: {directors}
         [b]Writer(s)[/b]: {writers}
         [b]Cast[/b]: {cast}""").format(
-            links=", ".join(bb.link(*l) for l in links),
+            links=", ".join(bb.link(*l) for l in links),  # noqa: E741
             name=summary['name'],
             mpaa=summary['mpaa'],
             rating=bb.format_rating(summary['rating'][0],

pythonbits/submission.py

@@ -276,9 +276,6 @@ def confirm_finalization(self, fields):
 
                     new_value = rlinput("New (empty to cancel): ", val)
 
-                    if sys.version_info[0] == 2:  # PY2 compatibility
-                        new_value = new_value.decode('utf8')
-
                     if new_value:
                         if isinstance(val, bool):
                             string_true = {'true', 'True', 'y', 'yes'}

pythonbits/tracker.py

@@ -2,6 +2,7 @@
 import requests
 import contextlib
 import re
+import time
 
 from . import __version__ as version, __title__ as title
 from .config import config
@@ -23,6 +24,8 @@ class Tracker():
     headers = {'User-Agent': '{}/{}'.format(title, version)}
 
     def _login(self, session, _tries=0):
+        maxtries = 10
+
         domain = config.get('Tracker', 'domain')
         login_url = "https://{}/login.php".format(domain)
         payload = {'username': config.get('Tracker', 'username'),
@@ -37,21 +40,29 @@ def _login(self, session, _tries=0):
             if 'id="loginform"' in resp.text:
                 raise TrackerException("Login failed")
             elif 'You are banned' in resp.text:
-                raise TrackerException("Login failed (login attempts exceeded)")
+                raise TrackerException(
+                    "Login failed (login attempts exceeded)")
             else:
                 # We encountered the login bug that sends you to "/" (which
                 # doesn't contain the login form) without logging you in
-                if _tries < 10:
-                    log.debug('Encountered login bug; trying again')
+                # todo: convert this to a retry decorator
+                if _tries < maxtries:
+                    backoff = min(10**_tries/1000, 16.)
+                    log.debug('Encountered login bug; trying again after '
+                              '{}s back-off'.format(backoff))
+                    time.sleep(backoff)
                     self._login(session, _tries=_tries+1)
                 else:
-                    log.debug('Encountered login bug; giving up after 10 login attempts')
+                    log.debug('Encountered login bug; '
+                              'giving up after '
+                              '{} login attempts'.format(_tries))
                     raise TrackerException("Login failed")
         elif 'logout.php' in resp.text:
             # Login successful, find and remember logout URL
             match = re.search(r"logout\.php\?auth=[0-9a-f]{32}", resp.text)
             if match:
-                self._logout_url = "https://{}/{}".format(domain, match.group(0))
+                self._logout_url = "https://{}/{}".format(
+                    domain, match.group(0))
             else:
                 raise TrackerException("Couldn't find logout URL")
         else:
@@ -90,17 +101,19 @@ def upload(self, **kwargs):
             resp.raise_for_status()
 
             # TODO: Catch this somehow:
-            # <p style="color: red;text-align:center;">You must enter at least one tag. Maximum length is 200 characters.</p>
+            # <p style="color: red;text-align:center;">You must enter at least
+            # one tag. Maximum length is 200 characters.</p>
 
             if resp.history:
                 # todo: check if url is good, might have been logged out
                 # (unlikely)
                 return resp.url
             else:
                 log.error('Response: %s' % resp)
-                err_match = re.search(r''.join((r'(No torrent file uploaded.*?)',
-                                                re.escape(r'</p>'))),
-                                      resp.text)
+                err_match = re.search(r''.join(
+                        (r'(No torrent file uploaded.*?)',
+                         re.escape(r'</p>'))),
+                    resp.text)
                 if err_match:
                     log.error('Error: %s' % err_match.group(1))
                 else:

pythonbits/tvdb.py

@@ -22,15 +22,18 @@ def get_rating(banner):
 
         try:
             season_banners = self.show['_banners']['season']
-            best_banner = best_banner([banner for banner in season_banners['raw']
-                                       if banner['subKey'] == str(season_number)])
-            return season_banners[best_banner['resolution']][best_banner['id']]['_bannerpath']
+            best_banner = best_banner(
+                [banner for banner in season_banners['raw']
+                 if banner['subKey'] == str(season_number)])
+            return (season_banners[best_banner['resolution']]
+                    [best_banner['id']]['_bannerpath'])
         except (IndexError, KeyError):
             for key in ('poster', 'series', 'fanart'):
                 try:
                     series_banners = self.show['_banners'][key]
                     best_banner = best_banner(series_banners['raw'])
-                    return series_banners[best_banner['resolution']][best_banner['id']]['_bannerpath']
+                    return (series_banners[best_banner['resolution']]
+                            [best_banner['id']]['_bannerpath'])
                 except (IndexError, KeyError):
                     pass
         raise Exception('Unable to find cover')
@@ -61,8 +64,8 @@ def add_show_titles(self, summary):
             summary['title'] = imdb_sum['title']
             # dict of international titles
             summary['titles'] = imdb_sum['titles']
-            # "XWW" is IMDb's international title, but unlike TVDB, it doesn't include the
-            # year if there are multiple shows with the same name.
+            # "XWW" is IMDb's international title, but unlike TVDB, it doesn't
+            # include the year if there are multiple shows with the same name.
             if 'XWW' in summary['titles']:
                 summary['titles']['XWW'] = tvdb_title
 
@@ -110,7 +113,8 @@ def summary(self):
                 'votes': self.episode['siteRatingCount'],
                 'episodesummary': self.episode['overview'],
                 'language': self.episode['language'],
-                'url': 'https://thetvdb.com/series/{}'.format(self.show['slug']),
+                'url': 'https://thetvdb.com/series/{}'.format(
+                    self.show['slug']),
                 'cover': self.banner(self.episode['seasonnumber'])})
         self.add_show_titles(summary)
         return summary

tests/test_dummy.py

@@ -41,7 +41,7 @@ def test_tv_specifier(title, path, specifier):
 
 def test_proper():
     tracks = {'general': "",
-              'video': "",
+              'video': dict(),
               'audio': "",
               'text': ["sub", "title"]}