diff --git a/couchpotato/core/media/_base/media/__init__.py b/couchpotato/core/media/_base/media/__init__.py index e5f5a0ec..b1cde097 100644 --- a/couchpotato/core/media/_base/media/__init__.py +++ b/couchpotato/core/media/_base/media/__init__.py @@ -1,7 +1,5 @@ from .main import MediaPlugin -def start(): +def autoload(): return MediaPlugin() - -config = [] diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py index 76622230..08082338 100644 --- a/couchpotato/core/media/_base/media/main.py +++ b/couchpotato/core/media/_base/media/main.py @@ -11,6 +11,8 @@ from string import ascii_lowercase log = CPLog(__name__) +autoload = 'MediaPlugin' + class MediaPlugin(MediaBase): diff --git a/couchpotato/core/media/_base/providers/automation/base.py b/couchpotato/core/media/_base/providers/automation/base.py index 20ce2e16..21d205ae 100644 --- a/couchpotato/core/media/_base/providers/automation/base.py +++ b/couchpotato/core/media/_base/providers/automation/base.py @@ -4,5 +4,5 @@ from couchpotato.core.media._base.providers.base import Provider log = CPLog(__name__) -class BaseAutomation(Provider): +class AutomationBase(Provider): pass diff --git a/couchpotato/core/media/_base/providers/nzb/binsearch/main.py b/couchpotato/core/media/_base/providers/nzb/binsearch.py similarity index 79% rename from couchpotato/core/media/_base/providers/nzb/binsearch/main.py rename to couchpotato/core/media/_base/providers/nzb/binsearch.py index fb72a848..0334bb49 100644 --- a/couchpotato/core/media/_base/providers/nzb/binsearch/main.py +++ b/couchpotato/core/media/_base/providers/nzb/binsearch.py @@ -87,3 +87,31 @@ class Base(NZBProvider): log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc())) return 'try_next' + + +config = [{ + 'name': 'binsearch', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'nzb_providers', + 'name': 'binsearch', + 'description': 'Free provider, less accurate. See BinSearch', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/nzb/binsearch/__init__.py b/couchpotato/core/media/_base/providers/nzb/binsearch/__init__.py deleted file mode 100644 index 48e71cdb..00000000 --- a/couchpotato/core/media/_base/providers/nzb/binsearch/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ - -config = [{ - 'name': 'binsearch', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'nzb_providers', - 'name': 'binsearch', - 'description': 'Free provider, less accurate. See BinSearch', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/nzb/newznab/main.py b/couchpotato/core/media/_base/providers/nzb/newznab.py similarity index 72% rename from couchpotato/core/media/_base/providers/nzb/newznab/main.py rename to couchpotato/core/media/_base/providers/nzb/newznab.py index acc4a7d3..bbc77a3b 100644 --- a/couchpotato/core/media/_base/providers/nzb/newznab/main.py +++ b/couchpotato/core/media/_base/providers/nzb/newznab.py @@ -187,3 +187,59 @@ class Base(NZBProvider, RSS): log.error('Failed download from %s: %s', (host, traceback.format_exc())) return 'try_next' + + +config = [{ + 'name': 'newznab', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'nzb_providers', + 'name': 'newznab', + 'order': 10, + 'description': 'Enable NewzNab such as NZB.su, \ + NZBs.org, DOGnzb.cr, \ + Spotweb, NZBGeek, \ + SmackDown, NZBFinder', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': True, + }, + { + 'name': 'use', + 'default': '0,0,0,0,0,0' + }, + { + 'name': 'host', + 'default': 'api.nzb.su,dognzb.cr,nzbs.org,https://index.nzbgeek.info, https://smackdownonyou.com, https://www.nzbfinder.ws', + 'description': 'The hostname of your newznab provider', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'default': '0,0,0,0,0,0', + 'description': 'Starting score for each release found via this provider.', + }, + { + 'name': 'custom_tag', + 'advanced': True, + 'label': 'Custom tag', + 'default': ',,,,,', + 'description': 'Add custom tags, for example add rls=1 to get only scene releases from nzbs.org', + }, + { + 'name': 'api_key', + 'default': ',,,,,', + 'label': 'Api Key', + 'description': 'Can be found on your profile page', + 'type': 'combined', + 'combine': ['use', 'host', 'api_key', 'extra_score', 'custom_tag'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/nzb/newznab/__init__.py b/couchpotato/core/media/_base/providers/nzb/newznab/__init__.py deleted file mode 100644 index 8426e3ed..00000000 --- a/couchpotato/core/media/_base/providers/nzb/newznab/__init__.py +++ /dev/null @@ -1,55 +0,0 @@ - -config = [{ - 'name': 'newznab', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'nzb_providers', - 'name': 'newznab', - 'order': 10, - 'description': 'Enable NewzNab such as NZB.su, \ - NZBs.org, DOGnzb.cr, \ - Spotweb, NZBGeek, \ - SmackDown, NZBFinder', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': True, - }, - { - 'name': 'use', - 'default': '0,0,0,0,0,0' - }, - { - 'name': 'host', - 'default': 'api.nzb.su,dognzb.cr,nzbs.org,https://index.nzbgeek.info, https://smackdownonyou.com, https://www.nzbfinder.ws', - 'description': 'The hostname of your newznab provider', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'default': '0,0,0,0,0,0', - 'description': 'Starting score for each release found via this provider.', - }, - { - 'name': 'custom_tag', - 'advanced': True, - 'label': 'Custom tag', - 'default': ',,,,,', - 'description': 'Add custom tags, for example add rls=1 to get only scene releases from nzbs.org', - }, - { - 'name': 'api_key', - 'default': ',,,,,', - 'label': 'Api Key', - 'description': 'Can be found on your profile page', - 'type': 'combined', - 'combine': ['use', 'host', 'api_key', 'extra_score', 'custom_tag'], - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/nzb/nzbclub/main.py b/couchpotato/core/media/_base/providers/nzb/nzbclub.py similarity index 76% rename from couchpotato/core/media/_base/providers/nzb/nzbclub/main.py rename to couchpotato/core/media/_base/providers/nzb/nzbclub.py index 322f8198..562de5ca 100644 --- a/couchpotato/core/media/_base/providers/nzb/nzbclub/main.py +++ b/couchpotato/core/media/_base/providers/nzb/nzbclub.py @@ -67,3 +67,31 @@ class Base(NZBProvider, RSS): return False return True + + +config = [{ + 'name': 'nzbclub', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'nzb_providers', + 'name': 'NZBClub', + 'description': 'Free provider, less accurate. See NZBClub', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/nzb/nzbclub/__init__.py b/couchpotato/core/media/_base/providers/nzb/nzbclub/__init__.py deleted file mode 100644 index 60c9bc4e..00000000 --- a/couchpotato/core/media/_base/providers/nzb/nzbclub/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ - -config = [{ - 'name': 'nzbclub', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'nzb_providers', - 'name': 'NZBClub', - 'description': 'Free provider, less accurate. See NZBClub', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/nzb/nzbindex/main.py b/couchpotato/core/media/_base/providers/nzb/nzbindex.py similarity index 80% rename from couchpotato/core/media/_base/providers/nzb/nzbindex/main.py rename to couchpotato/core/media/_base/providers/nzb/nzbindex.py index d21dc0b2..c81165e1 100644 --- a/couchpotato/core/media/_base/providers/nzb/nzbindex/main.py +++ b/couchpotato/core/media/_base/providers/nzb/nzbindex.py @@ -92,3 +92,32 @@ class Base(NZBProvider, RSS): item['description'] = toUnicode(html.find('pre', attrs = {'id':'nfo0'}).text) except: pass + + +config = [{ + 'name': 'nzbindex', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'nzb_providers', + 'name': 'nzbindex', + 'description': 'Free provider, less accurate. See NZBIndex', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': True, + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/nzb/nzbindex/__init__.py b/couchpotato/core/media/_base/providers/nzb/nzbindex/__init__.py deleted file mode 100644 index 4ce51050..00000000 --- a/couchpotato/core/media/_base/providers/nzb/nzbindex/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ - -config = [{ - 'name': 'nzbindex', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'nzb_providers', - 'name': 'nzbindex', - 'description': 'Free provider, less accurate. See NZBIndex', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': True, - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/main.py b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py similarity index 67% rename from couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/main.py rename to couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py index 6ecefe37..29434262 100644 --- a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/main.py +++ b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py @@ -61,3 +61,40 @@ class Base(NZBProvider, RSS): 'detail_url': self.urls['detail_url'] % nzb_id, 'description': self.getTextElement(nzb, 'description') }) + + +config = [{ + 'name': 'omgwtfnzbs', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'nzb_providers', + 'name': 'OMGWTFNZBs', + 'description': 'See OMGWTFNZBs', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'api_key', + 'label': 'Api Key', + 'default': '', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'default': 20, + 'type': 'int', + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/__init__.py deleted file mode 100644 index 841c04e7..00000000 --- a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs/__init__.py +++ /dev/null @@ -1,36 +0,0 @@ - -config = [{ - 'name': 'omgwtfnzbs', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'nzb_providers', - 'name': 'OMGWTFNZBs', - 'description': 'See OMGWTFNZBs', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'api_key', - 'label': 'Api Key', - 'default': '', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'default': 20, - 'type': 'int', - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd/main.py b/couchpotato/core/media/_base/providers/torrent/awesomehd.py similarity index 55% rename from couchpotato/core/media/_base/providers/torrent/awesomehd/main.py rename to couchpotato/core/media/_base/providers/torrent/awesomehd.py index 3a370435..f8098626 100644 --- a/couchpotato/core/media/_base/providers/torrent/awesomehd/main.py +++ b/couchpotato/core/media/_base/providers/torrent/awesomehd.py @@ -67,3 +67,72 @@ class Base(TorrentProvider): except: log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc())) + + +config = [{ + 'name': 'awesomehd', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'Awesome-HD', + 'description': 'See AHD', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'passkey', + 'default': '', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'only_internal', + 'advanced': True, + 'type': 'bool', + 'default': 1, + 'description': 'Only search for internal releases.' + }, + { + 'name': 'prefer_internal', + 'advanced': True, + 'type': 'bool', + 'default': 1, + 'description': 'Favors internal releases over non-internal releases.' + }, + { + 'name': 'favor', + 'advanced': True, + 'default': 'both', + 'type': 'dropdown', + 'values': [('Encodes & Remuxes', 'both'), ('Encodes', 'encode'), ('Remuxes', 'remux'), ('None', 'none')], + 'description': 'Give extra scoring to encodes or remuxes.' + }, + { + 'name': 'extra_score', + 'advanced': True, + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + }, + ], + }, + ], +}] + diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd/__init__.py b/couchpotato/core/media/_base/providers/torrent/awesomehd/__init__.py deleted file mode 100644 index 1ab625d8..00000000 --- a/couchpotato/core/media/_base/providers/torrent/awesomehd/__init__.py +++ /dev/null @@ -1,68 +0,0 @@ - -config = [{ - 'name': 'awesomehd', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'Awesome-HD', - 'description': 'See AHD', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'passkey', - 'default': '', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'only_internal', - 'advanced': True, - 'type': 'bool', - 'default': 1, - 'description': 'Only search for internal releases.' - }, - { - 'name': 'prefer_internal', - 'advanced': True, - 'type': 'bool', - 'default': 1, - 'description': 'Favors internal releases over non-internal releases.' - }, - { - 'name': 'favor', - 'advanced': True, - 'default': 'both', - 'type': 'dropdown', - 'values': [('Encodes & Remuxes', 'both'), ('Encodes', 'encode'), ('Remuxes', 'remux'), ('None', 'none')], - 'description': 'Give extra scoring to encodes or remuxes.' - }, - { - 'name': 'extra_score', - 'advanced': True, - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - }, - ], - }, - ], -}] - diff --git a/couchpotato/core/media/_base/providers/torrent/bithdtv/main.py b/couchpotato/core/media/_base/providers/torrent/bithdtv.py similarity index 64% rename from couchpotato/core/media/_base/providers/torrent/bithdtv/main.py rename to couchpotato/core/media/_base/providers/torrent/bithdtv.py index ce2ea71a..619ae91a 100644 --- a/couchpotato/core/media/_base/providers/torrent/bithdtv/main.py +++ b/couchpotato/core/media/_base/providers/torrent/bithdtv.py @@ -82,3 +82,55 @@ class Base(TorrentProvider): return 'logout.php' in output.lower() loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'bithdtv', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'BiT-HDTV', + 'description': 'See BiT-HDTV', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/bithdtv/__init__.py b/couchpotato/core/media/_base/providers/torrent/bithdtv/__init__.py deleted file mode 100644 index d2b73913..00000000 --- a/couchpotato/core/media/_base/providers/torrent/bithdtv/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'bithdtv', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'BiT-HDTV', - 'description': 'See BiT-HDTV', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/bitsoup/main.py b/couchpotato/core/media/_base/providers/torrent/bitsoup.py similarity index 64% rename from couchpotato/core/media/_base/providers/torrent/bitsoup/main.py rename to couchpotato/core/media/_base/providers/torrent/bitsoup.py index 9a8c143f..fd2f4dbe 100644 --- a/couchpotato/core/media/_base/providers/torrent/bitsoup/main.py +++ b/couchpotato/core/media/_base/providers/torrent/bitsoup.py @@ -85,3 +85,55 @@ class Base(TorrentProvider): return 'logout.php' in output.lower() loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'bitsoup', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'Bitsoup', + 'description': 'See Bitsoup', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/bitsoup/__init__.py b/couchpotato/core/media/_base/providers/torrent/bitsoup/__init__.py deleted file mode 100644 index efa34a77..00000000 --- a/couchpotato/core/media/_base/providers/torrent/bitsoup/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'bitsoup', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'Bitsoup', - 'description': 'See Bitsoup', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/hdbits/main.py b/couchpotato/core/media/_base/providers/torrent/hdbits.py similarity index 55% rename from couchpotato/core/media/_base/providers/torrent/hdbits/main.py rename to couchpotato/core/media/_base/providers/torrent/hdbits.py index a1ceb573..4d31bb3e 100644 --- a/couchpotato/core/media/_base/providers/torrent/hdbits/main.py +++ b/couchpotato/core/media/_base/providers/torrent/hdbits.py @@ -61,3 +61,53 @@ class Base(TorrentProvider): }) except: log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc())) + + +config = [{ + 'name': 'hdbits', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'HDBits', + 'description': 'See HDBits', + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'passkey', + 'default': '', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py b/couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py deleted file mode 100644 index c9e75fe5..00000000 --- a/couchpotato/core/media/_base/providers/torrent/hdbits/__init__.py +++ /dev/null @@ -1,49 +0,0 @@ - -config = [{ - 'name': 'hdbits', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'HDBits', - 'description': 'See HDBits', - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'passkey', - 'default': '', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/ilovetorrents/main.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py similarity index 72% rename from couchpotato/core/media/_base/providers/torrent/ilovetorrents/main.py rename to couchpotato/core/media/_base/providers/torrent/ilovetorrents.py index 516cf07e..1f74db48 100644 --- a/couchpotato/core/media/_base/providers/torrent/ilovetorrents/main.py +++ b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py @@ -126,3 +126,60 @@ class Base(TorrentProvider): return 'logout.php' in output.lower() loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'ilovetorrents', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'ILoveTorrents', + 'description': 'Where the Love of Torrents is Born', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False + }, + { + 'name': 'username', + 'label': 'Username', + 'type': 'string', + 'default': '', + 'description': 'The user name for your ILT account', + }, + { + 'name': 'password', + 'label': 'Password', + 'type': 'password', + 'default': '', + 'description': 'The password for your ILT account.', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + } + ] +}] diff --git a/couchpotato/core/media/_base/providers/torrent/ilovetorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents/__init__.py deleted file mode 100644 index 2a9f403d..00000000 --- a/couchpotato/core/media/_base/providers/torrent/ilovetorrents/__init__.py +++ /dev/null @@ -1,56 +0,0 @@ - -config = [{ - 'name': 'ilovetorrents', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'ILoveTorrents', - 'description': 'Where the Love of Torrents is Born', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False - }, - { - 'name': 'username', - 'label': 'Username', - 'type': 'string', - 'default': '', - 'description': 'The user name for your ILT account', - }, - { - 'name': 'password', - 'label': 'Password', - 'type': 'password', - 'default': '', - 'description': 'The password for your ILT account.', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - } - ] -}] diff --git a/couchpotato/core/media/_base/providers/torrent/iptorrents/main.py b/couchpotato/core/media/_base/providers/torrent/iptorrents.py similarity index 69% rename from couchpotato/core/media/_base/providers/torrent/iptorrents/main.py rename to couchpotato/core/media/_base/providers/torrent/iptorrents.py index cfd568e2..71302f9e 100644 --- a/couchpotato/core/media/_base/providers/torrent/iptorrents/main.py +++ b/couchpotato/core/media/_base/providers/torrent/iptorrents.py @@ -109,3 +109,61 @@ class Base(TorrentProvider): def loginCheckSuccess(self, output): return '/logout.php' in output.lower() + + +config = [{ + 'name': 'iptorrents', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'IPTorrents', + 'description': 'See IPTorrents', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'freeleech', + 'default': 0, + 'type': 'bool', + 'description': 'Only search for [FreeLeech] torrents.', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/iptorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/iptorrents/__init__.py deleted file mode 100644 index 48f8219b..00000000 --- a/couchpotato/core/media/_base/providers/torrent/iptorrents/__init__.py +++ /dev/null @@ -1,57 +0,0 @@ - -config = [{ - 'name': 'iptorrents', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'IPTorrents', - 'description': 'See IPTorrents', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'freeleech', - 'default': 0, - 'type': 'bool', - 'description': 'Only search for [FreeLeech] torrents.', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/kickasstorrents/main.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py similarity index 71% rename from couchpotato/core/media/_base/providers/torrent/kickasstorrents/main.py rename to couchpotato/core/media/_base/providers/torrent/kickasstorrents.py index 8b624652..f99ead0d 100644 --- a/couchpotato/core/media/_base/providers/torrent/kickasstorrents/main.py +++ b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py @@ -112,3 +112,52 @@ class Base(TorrentMagnetProvider): def correctProxy(self, data): return 'search query' in data.lower() + + +config = [{ + 'name': 'kickasstorrents', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'KickAssTorrents', + 'description': 'See KickAssTorrents', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': True, + }, + { + 'name': 'domain', + 'advanced': True, + 'label': 'Proxy server', + 'description': 'Domain for requests, keep empty to let CouchPotato pick.', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents/__init__.py deleted file mode 100644 index 92dcc0fc..00000000 --- a/couchpotato/core/media/_base/providers/torrent/kickasstorrents/__init__.py +++ /dev/null @@ -1,48 +0,0 @@ - -config = [{ - 'name': 'kickasstorrents', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'KickAssTorrents', - 'description': 'See KickAssTorrents', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': True, - }, - { - 'name': 'domain', - 'advanced': True, - 'label': 'Proxy server', - 'description': 'Domain for requests, keep empty to let CouchPotato pick.', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/passthepopcorn/main.py b/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py similarity index 69% rename from couchpotato/core/media/_base/providers/torrent/passthepopcorn/main.py rename to couchpotato/core/media/_base/providers/torrent/passthepopcorn.py index a7975e29..cb845bfb 100644 --- a/couchpotato/core/media/_base/providers/torrent/passthepopcorn/main.py +++ b/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py @@ -176,3 +176,89 @@ class Base(TorrentProvider): return False loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'passthepopcorn', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'PassThePopcorn', + 'description': 'See PassThePopcorn.me', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False + }, + { + 'name': 'domain', + 'advanced': True, + 'label': 'Proxy server', + 'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).', + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'passkey', + 'default': '', + }, + { + 'name': 'prefer_golden', + 'advanced': True, + 'type': 'bool', + 'label': 'Prefer golden', + 'default': 1, + 'description': 'Favors Golden Popcorn-releases over all other releases.' + }, + { + 'name': 'prefer_scene', + 'advanced': True, + 'type': 'bool', + 'label': 'Prefer scene', + 'default': 0, + 'description': 'Favors scene-releases over non-scene releases.' + }, + { + 'name': 'require_approval', + 'advanced': True, + 'type': 'bool', + 'label': 'Require approval', + 'default': 0, + 'description': 'Require staff-approval for releases to be accepted.' + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + } + ] +}] diff --git a/couchpotato/core/media/_base/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/media/_base/providers/torrent/passthepopcorn/__init__.py deleted file mode 100644 index 119c4255..00000000 --- a/couchpotato/core/media/_base/providers/torrent/passthepopcorn/__init__.py +++ /dev/null @@ -1,85 +0,0 @@ - -config = [{ - 'name': 'passthepopcorn', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'PassThePopcorn', - 'description': 'See PassThePopcorn.me', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False - }, - { - 'name': 'domain', - 'advanced': True, - 'label': 'Proxy server', - 'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).', - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'passkey', - 'default': '', - }, - { - 'name': 'prefer_golden', - 'advanced': True, - 'type': 'bool', - 'label': 'Prefer golden', - 'default': 1, - 'description': 'Favors Golden Popcorn-releases over all other releases.' - }, - { - 'name': 'prefer_scene', - 'advanced': True, - 'type': 'bool', - 'label': 'Prefer scene', - 'default': 0, - 'description': 'Favors scene-releases over non-scene releases.' - }, - { - 'name': 'require_approval', - 'advanced': True, - 'type': 'bool', - 'label': 'Require approval', - 'default': 0, - 'description': 'Require staff-approval for releases to be accepted.' - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - } - ] -}] diff --git a/couchpotato/core/media/_base/providers/torrent/publichd/main.py b/couchpotato/core/media/_base/providers/torrent/publichd.py similarity index 68% rename from couchpotato/core/media/_base/providers/torrent/publichd/main.py rename to couchpotato/core/media/_base/providers/torrent/publichd.py index ad2035ed..39e7f60a 100644 --- a/couchpotato/core/media/_base/providers/torrent/publichd/main.py +++ b/couchpotato/core/media/_base/providers/torrent/publichd.py @@ -89,3 +89,46 @@ class Base(TorrentMagnetProvider): item['description'] = description return item + + +config = [{ + 'name': 'publichd', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'PublicHD', + 'description': 'Public Torrent site with only HD content. See PublicHD', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': True, + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/publichd/__init__.py b/couchpotato/core/media/_base/providers/torrent/publichd/__init__.py deleted file mode 100644 index d24cc68e..00000000 --- a/couchpotato/core/media/_base/providers/torrent/publichd/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ - -config = [{ - 'name': 'publichd', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'PublicHD', - 'description': 'Public Torrent site with only HD content. See PublicHD', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': True, - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/sceneaccess/main.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py similarity index 65% rename from couchpotato/core/media/_base/providers/torrent/sceneaccess/main.py rename to couchpotato/core/media/_base/providers/torrent/sceneaccess.py index 29abbb6d..a8ee615e 100644 --- a/couchpotato/core/media/_base/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py @@ -78,3 +78,55 @@ class Base(TorrentProvider): return '/inbox' in output.lower() loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'sceneaccess', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'SceneAccess', + 'description': 'See SceneAccess', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess/__init__.py deleted file mode 100644 index 68592a37..00000000 --- a/couchpotato/core/media/_base/providers/torrent/sceneaccess/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'sceneaccess', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'SceneAccess', - 'description': 'See SceneAccess', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/thepiratebay/main.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py similarity index 71% rename from couchpotato/core/media/_base/providers/torrent/thepiratebay/main.py rename to couchpotato/core/media/_base/providers/torrent/thepiratebay.py index 64995628..f8e631d8 100644 --- a/couchpotato/core/media/_base/providers/torrent/thepiratebay/main.py +++ b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py @@ -111,3 +111,52 @@ class Base(TorrentMagnetProvider): item['description'] = description return item + + +config = [{ + 'name': 'thepiratebay', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'ThePirateBay', + 'description': 'The world\'s largest bittorrent tracker. See ThePirateBay', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False + }, + { + 'name': 'domain', + 'advanced': True, + 'label': 'Proxy server', + 'description': 'Domain for requests, keep empty to let CouchPotato pick.', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + } + ] +}] diff --git a/couchpotato/core/media/_base/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay/__init__.py deleted file mode 100644 index 047562a5..00000000 --- a/couchpotato/core/media/_base/providers/torrent/thepiratebay/__init__.py +++ /dev/null @@ -1,48 +0,0 @@ - -config = [{ - 'name': 'thepiratebay', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'ThePirateBay', - 'description': 'The world\'s largest bittorrent tracker. See ThePirateBay', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False - }, - { - 'name': 'domain', - 'advanced': True, - 'label': 'Proxy server', - 'description': 'Domain for requests, keep empty to let CouchPotato pick.', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - } - ] -}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentbytes/main.py b/couchpotato/core/media/_base/providers/torrent/torrentbytes.py similarity index 63% rename from couchpotato/core/media/_base/providers/torrent/torrentbytes/main.py rename to couchpotato/core/media/_base/providers/torrent/torrentbytes.py index 4b89db1e..603cd6ba 100644 --- a/couchpotato/core/media/_base/providers/torrent/torrentbytes/main.py +++ b/couchpotato/core/media/_base/providers/torrent/torrentbytes.py @@ -80,3 +80,54 @@ class Base(TorrentProvider): loginCheckSuccess = loginSuccess + +config = [{ + 'name': 'torrentbytes', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'TorrentBytes', + 'description': 'See TorrentBytes', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentbytes/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentbytes/__init__.py deleted file mode 100644 index 46eb52eb..00000000 --- a/couchpotato/core/media/_base/providers/torrent/torrentbytes/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'torrentbytes', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'TorrentBytes', - 'description': 'See TorrentBytes', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentday/main.py b/couchpotato/core/media/_base/providers/torrent/torrentday.py similarity index 53% rename from couchpotato/core/media/_base/providers/torrent/torrentday/main.py rename to couchpotato/core/media/_base/providers/torrent/torrentday.py index eebfaed2..dfb605bd 100644 --- a/couchpotato/core/media/_base/providers/torrent/torrentday/main.py +++ b/couchpotato/core/media/_base/providers/torrent/torrentday.py @@ -59,3 +59,55 @@ class Base(TorrentProvider): def loginCheckSuccess(self, output): return 'logout.php' in output.lower() + + +config = [{ + 'name': 'torrentday', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'TorrentDay', + 'description': 'See TorrentDay', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentday/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentday/__init__.py deleted file mode 100644 index 5067590d..00000000 --- a/couchpotato/core/media/_base/providers/torrent/torrentday/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'torrentday', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'TorrentDay', - 'description': 'See TorrentDay', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentleech/main.py b/couchpotato/core/media/_base/providers/torrent/torrentleech.py similarity index 61% rename from couchpotato/core/media/_base/providers/torrent/torrentleech/main.py rename to couchpotato/core/media/_base/providers/torrent/torrentleech.py index 1c907f4e..36bd0f70 100644 --- a/couchpotato/core/media/_base/providers/torrent/torrentleech/main.py +++ b/couchpotato/core/media/_base/providers/torrent/torrentleech.py @@ -69,3 +69,55 @@ class Base(TorrentProvider): return '/user/account/logout' in output.lower() or 'welcome back' in output.lower() loginCheckSuccess = loginSuccess + + +config = [{ + 'name': 'torrentleech', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'TorrentLeech', + 'description': 'See TorrentLeech', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 20, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentleech/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentleech/__init__.py deleted file mode 100644 index 2cdbd57b..00000000 --- a/couchpotato/core/media/_base/providers/torrent/torrentleech/__init__.py +++ /dev/null @@ -1,51 +0,0 @@ - -config = [{ - 'name': 'torrentleech', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'TorrentLeech', - 'description': 'See TorrentLeech', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 20, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentpotato/main.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py similarity index 65% rename from couchpotato/core/media/_base/providers/torrent/torrentpotato/main.py rename to couchpotato/core/media/_base/providers/torrent/torrentpotato.py index b86ca6be..00ed433f 100644 --- a/couchpotato/core/media/_base/providers/torrent/torrentpotato/main.py +++ b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py @@ -119,3 +119,66 @@ class Base(TorrentProvider): return False return TorrentProvider.isEnabled(self) and host['host'] and host['pass_key'] and int(host['use']) + + +config = [{ + 'name': 'torrentpotato', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'TorrentPotato', + 'order': 10, + 'description': 'CouchPotato torrent provider. Checkout the wiki page about this provider for more info.', + 'wizard': True, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'use', + 'default': '' + }, + { + 'name': 'host', + 'default': '', + 'description': 'The url path of your TorrentPotato provider.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'default': '0', + 'description': 'Starting score for each release found via this provider.', + }, + { + 'name': 'name', + 'label': 'Username', + 'default': '', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'default': '1', + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'default': '40', + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'pass_key', + 'default': ',', + 'label': 'Pass Key', + 'description': 'Can be found on your profile page', + 'type': 'combined', + 'combine': ['use', 'host', 'pass_key', 'name', 'seed_ratio', 'seed_time', 'extra_score'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentpotato/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato/__init__.py deleted file mode 100644 index 50e76029..00000000 --- a/couchpotato/core/media/_base/providers/torrent/torrentpotato/__init__.py +++ /dev/null @@ -1,62 +0,0 @@ - -config = [{ - 'name': 'torrentpotato', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'TorrentPotato', - 'order': 10, - 'description': 'CouchPotato torrent provider. Checkout the wiki page about this provider for more info.', - 'wizard': True, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'use', - 'default': '' - }, - { - 'name': 'host', - 'default': '', - 'description': 'The url path of your TorrentPotato provider.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'default': '0', - 'description': 'Starting score for each release found via this provider.', - }, - { - 'name': 'name', - 'label': 'Username', - 'default': '', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'default': '1', - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'default': '40', - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'pass_key', - 'default': ',', - 'label': 'Pass Key', - 'description': 'Can be found on your profile page', - 'type': 'combined', - 'combine': ['use', 'host', 'pass_key', 'name', 'seed_ratio', 'seed_time', 'extra_score'], - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentshack/main.py b/couchpotato/core/media/_base/providers/torrent/torrentshack.py similarity index 58% rename from couchpotato/core/media/_base/providers/torrent/torrentshack/main.py rename to couchpotato/core/media/_base/providers/torrent/torrentshack.py index 21776a27..cc2a599d 100644 --- a/couchpotato/core/media/_base/providers/torrent/torrentshack/main.py +++ b/couchpotato/core/media/_base/providers/torrent/torrentshack.py @@ -69,3 +69,60 @@ class Base(TorrentProvider): def getSceneOnly(self): return '1' if self.conf('scene_only') else '' + + +config = [{ + 'name': 'torrentshack', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'TorrentShack', + 'description': 'See TorrentShack', + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': False, + }, + { + 'name': 'username', + 'default': '', + }, + { + 'name': 'password', + 'default': '', + 'type': 'password', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'scene_only', + 'type': 'bool', + 'default': False, + 'description': 'Only allow scene releases.' + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + }, + ], +}] diff --git a/couchpotato/core/media/_base/providers/torrent/torrentshack/__init__.py b/couchpotato/core/media/_base/providers/torrent/torrentshack/__init__.py deleted file mode 100644 index 50edbf55..00000000 --- a/couchpotato/core/media/_base/providers/torrent/torrentshack/__init__.py +++ /dev/null @@ -1,56 +0,0 @@ - -config = [{ - 'name': 'torrentshack', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'TorrentShack', - 'description': 'See TorrentShack', - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': False, - }, - { - 'name': 'username', - 'default': '', - }, - { - 'name': 'password', - 'default': '', - 'type': 'password', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'scene_only', - 'type': 'bool', - 'default': False, - 'description': 'Only allow scene releases.' - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - }, - ], -}] diff --git a/couchpotato/core/media/_base/providers/torrent/yify/main.py b/couchpotato/core/media/_base/providers/torrent/yify.py similarity index 54% rename from couchpotato/core/media/_base/providers/torrent/yify/main.py rename to couchpotato/core/media/_base/providers/torrent/yify.py index 028554d0..3ba287ac 100644 --- a/couchpotato/core/media/_base/providers/torrent/yify/main.py +++ b/couchpotato/core/media/_base/providers/torrent/yify.py @@ -29,7 +29,7 @@ class Base(TorrentProvider): if not quality.get('hd', False): return [] - return super(Yify, self).search(movie, quality) + return super(Base, self).search(movie, quality) def _search(self, movie, quality, results): @@ -64,3 +64,52 @@ class Base(TorrentProvider): def correctProxy(self, data): data = data.lower() return 'yify' in data and 'yts' in data + + +config = [{ + 'name': 'yify', + 'groups': [ + { + 'tab': 'searcher', + 'list': 'torrent_providers', + 'name': 'Yify', + 'description': 'Free provider, less accurate. Small HD movies, encoded by Yify.', + 'wizard': False, + 'options': [ + { + 'name': 'enabled', + 'type': 'enabler', + 'default': 0 + }, + { + 'name': 'domain', + 'advanced': True, + 'label': 'Proxy server', + 'description': 'Domain for requests, keep empty to let CouchPotato pick.', + }, + { + 'name': 'seed_ratio', + 'label': 'Seed ratio', + 'type': 'float', + 'default': 1, + 'description': 'Will not be (re)moved until this seed ratio is met.', + }, + { + 'name': 'seed_time', + 'label': 'Seed time', + 'type': 'int', + 'default': 40, + 'description': 'Will not be (re)moved until this seed time (in hours) is met.', + }, + { + 'name': 'extra_score', + 'advanced': True, + 'label': 'Extra Score', + 'type': 'int', + 'default': 0, + 'description': 'Starting score for each release found via this provider.', + } + ], + } + ] +}] diff --git a/couchpotato/core/media/_base/providers/torrent/yify/__init__.py b/couchpotato/core/media/_base/providers/torrent/yify/__init__.py deleted file mode 100644 index 9623eb5d..00000000 --- a/couchpotato/core/media/_base/providers/torrent/yify/__init__.py +++ /dev/null @@ -1,48 +0,0 @@ - -config = [{ - 'name': 'yify', - 'groups': [ - { - 'tab': 'searcher', - 'list': 'torrent_providers', - 'name': 'Yify', - 'description': 'Free provider, less accurate. Small HD movies, encoded by Yify.', - 'wizard': False, - 'options': [ - { - 'name': 'enabled', - 'type': 'enabler', - 'default': 0 - }, - { - 'name': 'domain', - 'advanced': True, - 'label': 'Proxy server', - 'description': 'Domain for requests, keep empty to let CouchPotato pick.', - }, - { - 'name': 'seed_ratio', - 'label': 'Seed ratio', - 'type': 'float', - 'default': 1, - 'description': 'Will not be (re)moved until this seed ratio is met.', - }, - { - 'name': 'seed_time', - 'label': 'Seed time', - 'type': 'int', - 'default': 40, - 'description': 'Will not be (re)moved until this seed time (in hours) is met.', - }, - { - 'name': 'extra_score', - 'advanced': True, - 'label': 'Extra Score', - 'type': 'int', - 'default': 0, - 'description': 'Starting score for each release found via this provider.', - } - ], - } - ] -}] diff --git a/couchpotato/core/media/_base/search/__init__.py b/couchpotato/core/media/_base/search/__init__.py index 09bc84ef..c23fdb72 100644 --- a/couchpotato/core/media/_base/search/__init__.py +++ b/couchpotato/core/media/_base/search/__init__.py @@ -1,7 +1,5 @@ from .main import Search -def start(): +def autoload(): return Search() - -config = [] diff --git a/couchpotato/core/media/_base/searcher/__init__.py b/couchpotato/core/media/_base/searcher/__init__.py index 72c7d6ef..bf69b950 100644 --- a/couchpotato/core/media/_base/searcher/__init__.py +++ b/couchpotato/core/media/_base/searcher/__init__.py @@ -1,7 +1,7 @@ from .main import Searcher -def start(): +def autoload(): return Searcher() config = [{ diff --git a/couchpotato/core/media/movie/providers/automation/base.py b/couchpotato/core/media/movie/providers/automation/base.py index 8c98c10c..68c259ac 100644 --- a/couchpotato/core/media/movie/providers/automation/base.py +++ b/couchpotato/core/media/movie/providers/automation/base.py @@ -1,6 +1,6 @@ from couchpotato.core.event import addEvent, fireEvent from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.automation.base import BaseAutomation +from couchpotato.core.media._base.providers.automation.base import AutomationBase from couchpotato.environment import Env from couchpotato.core.helpers.variable import splitString import time @@ -8,7 +8,7 @@ import time log = CPLog(__name__) -class Automation(BaseAutomation): +class Automation(AutomationBase): enabled_option = 'automation_enabled' http_time_between_calls = 2