Skip to content

Commit

Permalink
Flip underscore on reverse file reference of Episodes so it's not pro…
Browse files Browse the repository at this point in the history
…tected
  • Loading branch information
ghickman committed Dec 24, 2015
1 parent 3c03dfd commit cf3136b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tvrenamr/cli/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def rename(config, canonical, debug, dry_run, episode, # pylint: disable-msg=to

config = get_config(config)

for episode in _file.episodes:
for episode in file_.episodes:
canonical = config.get(
'canonical',
_file.show_name,
Expand Down
16 changes: 8 additions & 8 deletions tvrenamr/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

class Episode(object):

def __init__(self, _file, number):
self._file = _file # cache reverse reference to parent object
def __init__(self, file_, number):
self.file_ = file_ # cache reverse reference to parent object
self.number = number

def __getattr__(self, name):
Expand All @@ -35,7 +35,7 @@ def __getattribute__(self, item):
return object.__getattribute__(self, item)

def __repr__(self):
return 'Episode: {} (season {})'.format(self.number, self._file.season)
return 'Episode: {} (season {})'.format(self.number, self.file_.season)

def __str__(self):
return '{} - {}'.format(self.number, self.title)
Expand All @@ -47,7 +47,7 @@ class File(object):
def __init__(self, show_name=None, season=None, episodes=(), extension=''):
self.show_name = show_name
self.season = season
self.episodes = [Episode(_file=self, number=i) for i in episodes]
self.episodes = [Episode(file_=self, number=i) for i in episodes]
self.extension = extension

def __repr__(self):
Expand Down Expand Up @@ -125,7 +125,7 @@ def user_overrides(self, show_name, season, episode):
for e in self.episodes:
e.number = int(episode)
else:
self.episodes = [Episode(_file=self, number=episode)]
self.episodes = [Episode(file_=self, number=episode)]


class TvRenamr(object):
Expand Down Expand Up @@ -179,11 +179,11 @@ def retrieve_episode_title(self, episode, canonical=None, override=None):
the episode's title.
"""
if canonical is not None:
episode._file.show_name = canonical
episode.file_.show_name = canonical

log.debug('Show Name: %s', episode._file.show_name)
log.debug('Show Name: %s', episode.file_.show_name)

args = (episode._file.show_name, episode._file.season, episode.number, self.cache)
args = (episode.file_.show_name, episode.file_.season, episode.number, self.cache)
self.lookup = TVDB(*args) # assign to self for use in format_show_name

log.info('Episode: %s', self.lookup.title)
Expand Down

0 comments on commit cf3136b

Please sign in to comment.