Methods should not have been tagged with classmethods and now the basename of class name is attributed to the final home path.
This commit is contained in:
13
src/video.py
13
src/video.py
@@ -48,7 +48,7 @@ class Video(object):
|
|||||||
self.format = format
|
self.format = format
|
||||||
|
|
||||||
#: Release group of the video
|
#: Release group of the video
|
||||||
self.home = home
|
self.release_group = release_group
|
||||||
|
|
||||||
#: Resolution of the video stream (480p, 720p, 1080p or 1080i)
|
#: Resolution of the video stream (480p, 720p, 1080p or 1080i)
|
||||||
self.resolution = resolution
|
self.resolution = resolution
|
||||||
@@ -166,11 +166,9 @@ class Episode(Video):
|
|||||||
def fromname(cls, name):
|
def fromname(cls, name):
|
||||||
return cls.fromguess(name, guessit(name, {'type': 'episode'}))
|
return cls.fromguess(name, guessit(name, {'type': 'episode'}))
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def sufficientInfo(self):
|
def sufficientInfo(self):
|
||||||
return None not in [self.series, self.season, self.episode] and list not in [type(self.series), type(self.episode)]
|
return None not in [self.series, self.season, self.episode] and list not in [type(self.series), type(self.episode)]
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def moveLocation(self):
|
def moveLocation(self):
|
||||||
series = titlecase(self.series)
|
series = titlecase(self.series)
|
||||||
grandParent = '{}/{} {:02d}'.format(series, series, self.season)
|
grandParent = '{}/{} {:02d}'.format(series, series, self.season)
|
||||||
@@ -216,16 +214,15 @@ class Movie(Video):
|
|||||||
def fromname(cls, name):
|
def fromname(cls, name):
|
||||||
return cls.fromguess(name, guessit(name, {'type': 'movie'}))
|
return cls.fromguess(name, guessit(name, {'type': 'movie'}))
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def sufficientInfo(self):
|
def sufficientInfo(self):
|
||||||
return None not in [self.title, self.year]
|
t = hasattr(self, "title")
|
||||||
|
y = hasattr(self, "year")
|
||||||
|
return None not in [t, y]
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def moveLocation(self):
|
def moveLocation(self):
|
||||||
title = titlecase(self.title)
|
title = titlecase(self.title)
|
||||||
parent = '{} ({})'.format(title, self.year)
|
parent = '{} ({})'.format(title, self.year)
|
||||||
self.home = os.path.join(parent, self.name)
|
self.home = os.path.join(parent, os.path.basename(self.name))
|
||||||
|
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
if self.year is None:
|
if self.year is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user