Browse Source

Merge branch 'refs/heads/develop' into tv

Conflicts:
	couchpotato/core/loader.py
	couchpotato/core/providers/info/_modifier/__init__.py
	couchpotato/core/providers/info/_modifier/main.py
	couchpotato/core/providers/movie/_modifier/main.py
	couchpotato/core/providers/show/_modifier/main.py
pull/2139/merge
Ruud 12 years ago
parent
commit
eced476eaf
  1. 13
      couchpotato/core/downloaders/deluge/__init__.py
  2. 2
      couchpotato/core/plugins/release/main.py
  3. 8
      couchpotato/core/plugins/renamer/main.py
  4. 4
      libs/synchronousdeluge/__init__.py
  5. 6
      libs/synchronousdeluge/client.py

13
couchpotato/core/downloaders/deluge/__init__.py

@ -33,12 +33,6 @@ config = [{
'type': 'password', 'type': 'password',
}, },
{ {
'name': 'paused',
'type': 'bool',
'default': False,
'description': 'Add the torrent paused.',
},
{
'name': 'directory', 'name': 'directory',
'type': 'directory', 'type': 'directory',
'description': 'Download to this directory. Keep empty for default Deluge download directory.', 'description': 'Download to this directory. Keep empty for default Deluge download directory.',
@ -70,6 +64,13 @@ config = [{
'description': 'Also remove the leftover files.', 'description': 'Also remove the leftover files.',
}, },
{ {
'name': 'paused',
'type': 'bool',
'advanced': True,
'default': False,
'description': 'Add the torrent paused.',
},
{
'name': 'manual', 'name': 'manual',
'default': 0, 'default': 0,
'type': 'bool', 'type': 'bool',

2
couchpotato/core/plugins/release/main.py

@ -174,7 +174,7 @@ class Release(Plugin):
# Get matching provider # Get matching provider
provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True) provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True)
if item['type'] != 'torrent_magnet': if item['protocol'] != 'torrent_magnet':
item['download'] = provider.loginDownload if provider.urls.get('login') else provider.download item['download'] = provider.loginDownload if provider.urls.get('login') else provider.download
success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({ success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({

8
couchpotato/core/plugins/renamer/main.py

@ -224,7 +224,7 @@ class Renamer(Plugin):
if file_type is 'nfo' and not self.conf('rename_nfo'): if file_type is 'nfo' and not self.conf('rename_nfo'):
log.debug('Skipping, renaming of %s disabled', file_type) log.debug('Skipping, renaming of %s disabled', file_type)
for current_file in group['files'][file_type]: for current_file in group['files'][file_type]:
if self.conf('cleanup') and (not (self.conf('file_action') != 'move' and self.downloadIsTorrent(download_info)) or self.fileIsAdded(current_file, group)): if self.conf('cleanup') and (not self.downloadIsTorrent(download_info) or self.fileIsAdded(current_file, group)):
remove_files.append(current_file) remove_files.append(current_file)
continue continue
@ -410,7 +410,7 @@ class Renamer(Plugin):
log.debug('Removing leftover files') log.debug('Removing leftover files')
for current_file in group['files']['leftover']: for current_file in group['files']['leftover']:
if self.conf('cleanup') and not self.conf('move_leftover') and \ if self.conf('cleanup') and not self.conf('move_leftover') and \
(not (self.conf('file_action') != 'move' and self.downloadIsTorrent(download_info)) or self.fileIsAdded(current_file, group)): (not self.downloadIsTorrent(download_info) or self.fileIsAdded(current_file, group)):
remove_files.append(current_file) remove_files.append(current_file)
# Remove files # Remove files
@ -827,13 +827,13 @@ Remove it if you want it to be renamed (again, or at least let it try again)
download_info.update({ download_info.update({
'imdb_id': rls.movie.library.identifier, 'imdb_id': rls.movie.library.identifier,
'quality': rls.quality.identifier, 'quality': rls.quality.identifier,
'type': rls_dict.get('info', {}).get('type') 'protocol': rls_dict.get('info', {}).get('protocol') or rls_dict.get('info', {}).get('type'),
}) })
return download_info return download_info
def downloadIsTorrent(self, download_info): def downloadIsTorrent(self, download_info):
return download_info and download_info.get('type') in ['torrent', 'torrent_magnet'] return download_info and download_info.get('protocol') in ['torrent', 'torrent_magnet']
def fileIsAdded(self, src, group): def fileIsAdded(self, src, group):
if not group or not group.get('before_rename'): if not group or not group.get('before_rename'):

4
libs/synchronousdeluge/__init__.py

@ -19,6 +19,6 @@ __title__ = "synchronous-deluge"
__version__ = "0.1" __version__ = "0.1"
__author__ = "Christian Dale" __author__ = "Christian Dale"
from .synchronousdeluge.client import DelugeClient from synchronousdeluge.client import DelugeClient
from .synchronousdeluge.exceptions import DelugeRPCError from synchronousdeluge.exceptions import DelugeRPCError

6
libs/synchronousdeluge/client.py

@ -3,9 +3,9 @@ import os
from collections import defaultdict from collections import defaultdict
from itertools import imap from itertools import imap
from .synchronousdeluge.exceptions import DelugeRPCError from synchronousdeluge.exceptions import DelugeRPCError
from .synchronousdeluge.protocol import DelugeRPCRequest, DelugeRPCResponse from synchronousdeluge.protocol import DelugeRPCRequest, DelugeRPCResponse
from .synchronousdeluge.transfer import DelugeTransfer from synchronousdeluge.transfer import DelugeTransfer
__all__ = ["DelugeClient"] __all__ = ["DelugeClient"]

Loading…
Cancel
Save