mirror of
https://github.com/meeb/tubesync.git
synced 2025-06-25 14:36:34 +00:00
Merge pull request #652 from tcely/patch-8
DRY {json,nfo,thumb}name functions
This commit is contained in:
commit
63dbb4d8a3
@ -1302,13 +1302,20 @@ class Media(models.Model):
|
|||||||
def filepath(self):
|
def filepath(self):
|
||||||
return self.source.directory_path / self.filename
|
return self.source.directory_path / self.filename
|
||||||
|
|
||||||
@property
|
def filename_prefix(self):
|
||||||
def thumbname(self):
|
|
||||||
if self.downloaded and self.media_file:
|
if self.downloaded and self.media_file:
|
||||||
filename = self.media_file.path
|
filename = self.media_file.path
|
||||||
else:
|
else:
|
||||||
filename = self.filename
|
filename = self.filename
|
||||||
|
# The returned prefix should not contain any directories.
|
||||||
|
# So, we do not care about the different directories
|
||||||
|
# used for filename in the cases above.
|
||||||
prefix, ext = os.path.splitext(os.path.basename(filename))
|
prefix, ext = os.path.splitext(os.path.basename(filename))
|
||||||
|
return prefix
|
||||||
|
|
||||||
|
@property
|
||||||
|
def thumbname(self):
|
||||||
|
prefix = self.filename_prefix()
|
||||||
return f'{prefix}.jpg'
|
return f'{prefix}.jpg'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -1317,11 +1324,7 @@ class Media(models.Model):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def nfoname(self):
|
def nfoname(self):
|
||||||
if self.downloaded and self.media_file:
|
prefix = self.filename_prefix()
|
||||||
filename = self.media_file.path
|
|
||||||
else:
|
|
||||||
filename = self.filename
|
|
||||||
prefix, ext = os.path.splitext(os.path.basename(filename))
|
|
||||||
return f'{prefix}.nfo'
|
return f'{prefix}.nfo'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -1330,11 +1333,7 @@ class Media(models.Model):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def jsonname(self):
|
def jsonname(self):
|
||||||
if self.downloaded and self.media_file:
|
prefix = self.filename_prefix()
|
||||||
filename = self.media_file.path
|
|
||||||
else:
|
|
||||||
filename = self.filename
|
|
||||||
prefix, ext = os.path.splitext(os.path.basename(filename))
|
|
||||||
return f'{prefix}.info.json'
|
return f'{prefix}.info.json'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
Loading…
Reference in New Issue
Block a user