dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't download html files as trailers. fixes #1658

Browse Source
This commit is contained in:
Ruud
2013-04-26 18:49:39 +02:00
parent e786c9c79a
commit 6e45c14ac5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/trailer/__init__.py
+1 -1
View File
@@ -29,7 +29,7 @@ config = [{
'label': 'Naming', 'label': 'Naming',
'default': '<filename>-trailer', 'default': '<filename>-trailer',
'advanced': True, 'advanced': True,
'description': 'Use <filename> to use above settings.' 'description': 'Use <strong>&lt;filename&gt;</strong> to use above settings.'
}, },
], ],
}, },
couchpotato/core/plugins/trailer/main.py
+7 -2
View File
@@ -22,10 +22,15 @@ class Trailer(Plugin):
return False return False
for trailer in trailers.get(self.conf('quality'), []): for trailer in trailers.get(self.conf('quality'), []):
filename = self.conf('name').replace('<filename>', group['filename']) + ('.%s' % getExt(trailer))
ext = getExt(trailer)
filename = self.conf('name').replace('<filename>', group['filename']) + ('.%s' % ('mp4' if len(ext) > 5 else ext))
destination = os.path.join(group['destination_dir'], filename) destination = os.path.join(group['destination_dir'], filename)
if not os.path.isfile(destination): if not os.path.isfile(destination):
fireEvent('file.download', url = trailer, dest = destination, urlopen_kwargs = {'headers': {'User-Agent': 'Quicktime'}}, single = True) trailer_file = fireEvent('file.download', url = trailer, dest = destination, urlopen_kwargs = {'headers': {'User-Agent': 'Quicktime'}}, single = True)
if os.path.getsize(trailer_file) < (1024 * 1024): # Don't trust small trailers (1MB), try next one
os.unlink(trailer_file)
continue
else: else:
log.debug('Trailer already exists: %s', destination) log.debug('Trailer already exists: %s', destination)