github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-06 13:11:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't use "cdx" labels when concat in use. Fixes #570

Browse source
This commit is contained in:
clinton-hall 2014-10-21 11:18:40 +10:30
parent c7d4160a06
commit a8d52e6e8f
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nzbtomedia/transcoder/transcoder.py
View file

@ -113,8 +113,12 @@ def buildCommands(file, newDir, movieName, bitbucket):
dir, name = os.path.split(file)
name, ext = os.path.splitext(name)
check = re.match("VTS_([0-9][0-9])_[0-9]+", name)
if check:
if check and nzbtomedia.CONCAT:
name = movieName
elif check:
name = ('%s.cd%s' % (movieName, check.groups()[0]))
elif nzbtomedia.CONCAT and re.match("(.+)[cC][dD][0-9]", name):
name = re.match("(.+)[cC][dD][0-9]", name).groups()[0][:-1]
if ext == nzbtomedia.VEXTENSION and newDir == dir: # we need to change the name to prevent overwriting itself.
nzbtomedia.VEXTENSION = '-transcoded' + nzbtomedia.VEXTENSION # adds '-transcoded.ext'
else:
@ -616,7 +620,7 @@ def combineCD(combine):
for item in set([ re.match("(.+)[cC][dD][0-9].",item).groups()[0] for item in combine ]):
concat = ''
for n in range(99):
files = [ file for file in combine if n+1 == int(re.match(".+[cC][dD]([0-9]).",file).groups()[0]) and item in file ]
files = [ file for file in combine if n+1 == int(re.match(".+[cC][dD]([0-9]+).",file).groups()[0]) and item in file ]
if files:
concat = concat + files[0] + '|'
else: