diff --git a/couchpotato/core/media/_base/providers/base.py b/couchpotato/core/media/_base/providers/base.py index 761aedc..95ab128 100644 --- a/couchpotato/core/media/_base/providers/base.py +++ b/couchpotato/core/media/_base/providers/base.py @@ -14,6 +14,7 @@ import xml.etree.ElementTree as XMLTree log = CPLog(__name__) + class MultiProvider(Plugin): def __init__(self): diff --git a/couchpotato/core/media/movie/_base/__init__.py b/couchpotato/core/media/movie/_base/__init__.py index 2221133..acec594 100644 --- a/couchpotato/core/media/movie/_base/__init__.py +++ b/couchpotato/core/media/movie/_base/__init__.py @@ -1,7 +1,7 @@ from .main import MovieBase -def start(): +def autoload(): return MovieBase() config = [] diff --git a/couchpotato/core/media/movie/providers/automation/bluray/main.py b/couchpotato/core/media/movie/providers/automation/bluray.py similarity index 75% rename from couchpotato/core/media/movie/providers/automation/bluray/main.py rename to couchpotato/core/media/movie/providers/automation/bluray.py index 2e8ebff..b411900 100644 --- a/couchpotato/core/media/movie/providers/automation/bluray/main.py +++ b/couchpotato/core/media/movie/providers/automation/bluray.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'Bluray' + class Bluray(Automation, RSS): @@ -73,3 +75,31 @@ class Bluray(Automation, RSS): movies.append(imdb['imdb']) return movies + + +config = [{ + 'name': 'bluray', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'bluray_automation', + 'label': 'Blu-ray.com', + 'description': 'Imports movies from blu-ray.com.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'backlog', + 'advanced': True, + 'description': 'Parses the history until the minimum movie year is reached. (Will be disabled once it has completed)', + 'default': False, + 'type': 'bool', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/bluray/__init__.py b/couchpotato/core/media/movie/providers/automation/bluray/__init__.py deleted file mode 100644 index 519a711..0000000 --- a/couchpotato/core/media/movie/providers/automation/bluray/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -from .main import Bluray - - -def start(): - return Bluray() - -config = [{ - 'name': 'bluray', - 'groups': [ - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'bluray_automation', - 'label': 'Blu-ray.com', - 'description': 'Imports movies from blu-ray.com.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'backlog', - 'advanced': True, - 'description': 'Parses the history until the minimum movie year is reached. (Will be disabled once it has completed)', - 'default': False, - 'type': 'bool', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/flixster/main.py b/couchpotato/core/media/movie/providers/automation/flixster.py similarity index 58% rename from couchpotato/core/media/movie/providers/automation/flixster/main.py rename to couchpotato/core/media/movie/providers/automation/flixster.py index cebe89d..53a06d7 100644 --- a/couchpotato/core/media/movie/providers/automation/flixster/main.py +++ b/couchpotato/core/media/movie/providers/automation/flixster.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'Flixster' + class Flixster(Automation): @@ -48,3 +50,34 @@ class Flixster(Automation): }) return movies + + +config = [{ + 'name': 'flixster', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'flixster_automation', + 'label': 'Flixster', + 'description': 'Import movies from any public Flixster watchlist', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_ids_use', + 'label': 'Use', + }, + { + 'name': 'automation_ids', + 'label': 'User ID', + 'type': 'combined', + 'combine': ['automation_ids_use', 'automation_ids'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/flixster/__init__.py b/couchpotato/core/media/movie/providers/automation/flixster/__init__.py deleted file mode 100644 index 71bd83c..0000000 --- a/couchpotato/core/media/movie/providers/automation/flixster/__init__.py +++ /dev/null @@ -1,35 +0,0 @@ -from .main import Flixster - - -def start(): - return Flixster() - -config = [{ - 'name': 'flixster', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'flixster_automation', - 'label': 'Flixster', - 'description': 'Import movies from any public Flixster watchlist', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_ids_use', - 'label': 'Use', - }, - { - 'name': 'automation_ids', - 'label': 'User ID', - 'type': 'combined', - 'combine': ['automation_ids_use', 'automation_ids'], - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/goodfilms/main.py b/couchpotato/core/media/movie/providers/automation/goodfilms.py similarity index 66% rename from couchpotato/core/media/movie/providers/automation/goodfilms/main.py rename to couchpotato/core/media/movie/providers/automation/goodfilms.py index 3ab51e0..2524f66 100644 --- a/couchpotato/core/media/movie/providers/automation/goodfilms/main.py +++ b/couchpotato/core/media/movie/providers/automation/goodfilms.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'Goodfilms' + class Goodfilms(Automation): @@ -52,3 +54,28 @@ class Goodfilms(Automation): page += 1 return movies + + +config = [{ + 'name': 'goodfilms', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'goodfilms_automation', + 'label': 'Goodfilms', + 'description': 'import movies from your Goodfilms queue', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_username', + 'label': 'Username', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/goodfilms/__init__.py b/couchpotato/core/media/movie/providers/automation/goodfilms/__init__.py deleted file mode 100644 index e04ccd0..0000000 --- a/couchpotato/core/media/movie/providers/automation/goodfilms/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -from .main import Goodfilms - - -def start(): - return Goodfilms() - -config = [{ - 'name': 'goodfilms', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'goodfilms_automation', - 'label': 'Goodfilms', - 'description': 'import movies from your Goodfilms queue', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_username', - 'label': 'Username', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/imdb/main.py b/couchpotato/core/media/movie/providers/automation/imdb.py similarity index 66% rename from couchpotato/core/media/movie/providers/automation/imdb/main.py rename to couchpotato/core/media/movie/providers/automation/imdb.py index 9b25e18..d5b9225 100644 --- a/couchpotato/core/media/movie/providers/automation/imdb/main.py +++ b/couchpotato/core/media/movie/providers/automation/imdb.py @@ -13,6 +13,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'IMDB' + class IMDB(MultiProvider): @@ -141,3 +143,69 @@ class IMDBAutomation(IMDBBase): log.error('Failed loading IMDB chart results from %s: %s', (url, traceback.format_exc())) return movies + + +config = [{ + 'name': 'imdb', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'imdb_automation_watchlist', + 'label': 'IMDB', + 'description': 'From any public IMDB watchlists.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + }, + { + 'name': 'automation_urls', + 'label': 'url', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + }, + ], + }, + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'imdb_automation_charts', + 'label': 'IMDB', + 'description': 'Import movies from IMDB Charts', + 'options': [ + { + 'name': 'automation_providers_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_charts_theater', + 'type': 'bool', + 'label': 'In Theaters', + 'description': 'New Movies In-Theaters chart', + 'default': True, + }, + { + 'name': 'automation_charts_top250', + 'type': 'bool', + 'label': 'TOP 250', + 'description': 'IMDB TOP 250 chart', + 'default': True, + }, + { + 'name': 'automation_charts_boxoffice', + 'type': 'bool', + 'label': 'Box office TOP 10', + 'description': 'IMDB Box office TOP 10 chart', + 'default': True, + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/imdb/__init__.py b/couchpotato/core/media/movie/providers/automation/imdb/__init__.py deleted file mode 100644 index f9baabf..0000000 --- a/couchpotato/core/media/movie/providers/automation/imdb/__init__.py +++ /dev/null @@ -1,70 +0,0 @@ -from .main import IMDB - - -def start(): - return IMDB() - -config = [{ - 'name': 'imdb', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'imdb_automation_watchlist', - 'label': 'IMDB', - 'description': 'From any public IMDB watchlists.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_urls_use', - 'label': 'Use', - }, - { - 'name': 'automation_urls', - 'label': 'url', - 'type': 'combined', - 'combine': ['automation_urls_use', 'automation_urls'], - }, - ], - }, - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'imdb_automation_charts', - 'label': 'IMDB', - 'description': 'Import movies from IMDB Charts', - 'options': [ - { - 'name': 'automation_providers_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_charts_theater', - 'type': 'bool', - 'label': 'In Theaters', - 'description': 'New Movies In-Theaters chart', - 'default': True, - }, - { - 'name': 'automation_charts_top250', - 'type': 'bool', - 'label': 'TOP 250', - 'description': 'IMDB TOP 250 chart', - 'default': True, - }, - { - 'name': 'automation_charts_boxoffice', - 'type': 'bool', - 'label': 'Box office TOP 10', - 'description': 'IMDB Box office TOP 10 chart', - 'default': True, - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/itunes/main.py b/couchpotato/core/media/movie/providers/automation/itunes.py similarity index 65% rename from couchpotato/core/media/movie/providers/automation/itunes/main.py rename to couchpotato/core/media/movie/providers/automation/itunes.py index 3257a66..1feb96f 100644 --- a/couchpotato/core/media/movie/providers/automation/itunes/main.py +++ b/couchpotato/core/media/movie/providers/automation/itunes.py @@ -9,6 +9,8 @@ import xml.etree.ElementTree as XMLTree log = CPLog(__name__) +autoload = 'ITunes' + class ITunes(Automation, RSS): @@ -58,3 +60,36 @@ class ITunes(Automation, RSS): log.error('Failed loading iTunes rss feed: %s %s', (url, traceback.format_exc())) return movies + + +config = [{ + 'name': 'itunes', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'itunes_automation', + 'label': 'iTunes', + 'description': 'From any iTunes Store feed. Url should be the RSS link.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + 'default': ',', + }, + { + 'name': 'automation_urls', + 'label': 'url', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + 'default': 'https://itunes.apple.com/rss/topmovies/limit=25/xml,', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/itunes/__init__.py b/couchpotato/core/media/movie/providers/automation/itunes/__init__.py deleted file mode 100644 index 13526f4..0000000 --- a/couchpotato/core/media/movie/providers/automation/itunes/__init__.py +++ /dev/null @@ -1,37 +0,0 @@ -from .main import ITunes - - -def start(): - return ITunes() - -config = [{ - 'name': 'itunes', - 'groups': [ - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'itunes_automation', - 'label': 'iTunes', - 'description': 'From any iTunes Store feed. Url should be the RSS link.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_urls_use', - 'label': 'Use', - 'default': ',', - }, - { - 'name': 'automation_urls', - 'label': 'url', - 'type': 'combined', - 'combine': ['automation_urls_use', 'automation_urls'], - 'default': 'https://itunes.apple.com/rss/topmovies/limit=25/xml,', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/kinepolis/main.py b/couchpotato/core/media/movie/providers/automation/kinepolis.py similarity index 57% rename from couchpotato/core/media/movie/providers/automation/kinepolis/main.py rename to couchpotato/core/media/movie/providers/automation/kinepolis.py index a1e099e..9350572 100644 --- a/couchpotato/core/media/movie/providers/automation/kinepolis/main.py +++ b/couchpotato/core/media/movie/providers/automation/kinepolis.py @@ -5,6 +5,8 @@ import datetime log = CPLog(__name__) +autoload = 'Kinepolis' + class Kinepolis(Automation, RSS): @@ -27,3 +29,24 @@ class Kinepolis(Automation, RSS): movies.append(imdb['imdb']) return movies + + +config = [{ + 'name': 'kinepolis', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'kinepolis_automation', + 'label': 'Kinepolis', + 'description': 'Imports movies from the current top 10 of kinepolis.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/kinepolis/__init__.py b/couchpotato/core/media/movie/providers/automation/kinepolis/__init__.py deleted file mode 100644 index cc4c570..0000000 --- a/couchpotato/core/media/movie/providers/automation/kinepolis/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -from .main import Kinepolis - - -def start(): - return Kinepolis() - -config = [{ - 'name': 'kinepolis', - 'groups': [ - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'kinepolis_automation', - 'label': 'Kinepolis', - 'description': 'Imports movies from the current top 10 of kinepolis.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/letterboxd/main.py b/couchpotato/core/media/movie/providers/automation/letterboxd.py similarity index 59% rename from couchpotato/core/media/movie/providers/automation/letterboxd/main.py rename to couchpotato/core/media/movie/providers/automation/letterboxd.py index 70e574f..55a9549 100644 --- a/couchpotato/core/media/movie/providers/automation/letterboxd/main.py +++ b/couchpotato/core/media/movie/providers/automation/letterboxd.py @@ -6,6 +6,8 @@ import re log = CPLog(__name__) +autoload = 'Letterboxd' + class Letterboxd(Automation): @@ -49,3 +51,34 @@ class Letterboxd(Automation): movies.append({'title': match[0], 'year': match[1] }) return movies + + +config = [{ + 'name': 'letterboxd', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'letterboxd_automation', + 'label': 'Letterboxd', + 'description': 'Import movies from any public Letterboxd watchlist', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + }, + { + 'name': 'automation_urls', + 'label': 'Username', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/letterboxd/__init__.py b/couchpotato/core/media/movie/providers/automation/letterboxd/__init__.py deleted file mode 100644 index 88bfe6a..0000000 --- a/couchpotato/core/media/movie/providers/automation/letterboxd/__init__.py +++ /dev/null @@ -1,35 +0,0 @@ -from .main import Letterboxd - - -def start(): - return Letterboxd() - -config = [{ - 'name': 'letterboxd', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'letterboxd_automation', - 'label': 'Letterboxd', - 'description': 'Import movies from any public Letterboxd watchlist', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_urls_use', - 'label': 'Use', - }, - { - 'name': 'automation_urls', - 'label': 'Username', - 'type': 'combined', - 'combine': ['automation_urls_use', 'automation_urls'], - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/moviemeter/main.py b/couchpotato/core/media/movie/providers/automation/moviemeter.py similarity index 58% rename from couchpotato/core/media/movie/providers/automation/moviemeter/main.py rename to couchpotato/core/media/movie/providers/automation/moviemeter.py index 890c8bc..883fcfa 100644 --- a/couchpotato/core/media/movie/providers/automation/moviemeter/main.py +++ b/couchpotato/core/media/movie/providers/automation/moviemeter.py @@ -5,6 +5,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'Moviemeter' + class Moviemeter(Automation, RSS): @@ -26,3 +28,24 @@ class Moviemeter(Automation, RSS): movies.append(imdb['imdb']) return movies + + +config = [{ + 'name': 'moviemeter', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'moviemeter_automation', + 'label': 'Moviemeter', + 'description': 'Imports movies from the current top 10 of moviemeter.nl.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/moviemeter/__init__.py b/couchpotato/core/media/movie/providers/automation/moviemeter/__init__.py deleted file mode 100644 index 0e9a4ed..0000000 --- a/couchpotato/core/media/movie/providers/automation/moviemeter/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -from .main import Moviemeter - - -def start(): - return Moviemeter() - -config = [{ - 'name': 'moviemeter', - 'groups': [ - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'moviemeter_automation', - 'label': 'Moviemeter', - 'description': 'Imports movies from the current top 10 of moviemeter.nl.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/movies_io/main.py b/couchpotato/core/media/movie/providers/automation/movies_io.py similarity index 54% rename from couchpotato/core/media/movie/providers/automation/movies_io/main.py rename to couchpotato/core/media/movie/providers/automation/movies_io.py index 890cbde..3b0b54f 100644 --- a/couchpotato/core/media/movie/providers/automation/movies_io/main.py +++ b/couchpotato/core/media/movie/providers/automation/movies_io.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.automation.base import Automation log = CPLog(__name__) +autoload = 'MoviesIO' + class MoviesIO(Automation, RSS): @@ -37,3 +39,34 @@ class MoviesIO(Automation, RSS): movies.append(imdb) return movies + + +config = [{ + 'name': 'moviesio', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'moviesio', + 'label': 'Movies.IO', + 'description': 'Imports movies from Movies.io RSS watchlists', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + }, + { + 'name': 'automation_urls', + 'label': 'url', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/movies_io/__init__.py b/couchpotato/core/media/movie/providers/automation/movies_io/__init__.py deleted file mode 100644 index 0361223..0000000 --- a/couchpotato/core/media/movie/providers/automation/movies_io/__init__.py +++ /dev/null @@ -1,35 +0,0 @@ -from .main import MoviesIO - - -def start(): - return MoviesIO() - -config = [{ - 'name': 'moviesio', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'moviesio', - 'label': 'Movies.IO', - 'description': 'Imports movies from Movies.io RSS watchlists', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_urls_use', - 'label': 'Use', - }, - { - 'name': 'automation_urls', - 'label': 'url', - 'type': 'combined', - 'combine': ['automation_urls_use', 'automation_urls'], - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/rottentomatoes/main.py b/couchpotato/core/media/movie/providers/automation/rottentomatoes.py similarity index 57% rename from couchpotato/core/media/movie/providers/automation/rottentomatoes/main.py rename to couchpotato/core/media/movie/providers/automation/rottentomatoes.py index 56e0e7c..279b4f8 100644 --- a/couchpotato/core/media/movie/providers/automation/rottentomatoes/main.py +++ b/couchpotato/core/media/movie/providers/automation/rottentomatoes.py @@ -8,6 +8,8 @@ import re log = CPLog(__name__) +autoload = 'Rottentomatoes' + class Rottentomatoes(Automation, RSS): @@ -51,3 +53,42 @@ class Rottentomatoes(Automation, RSS): movies.append(imdb['imdb']) return movies + + +config = [{ + 'name': 'rottentomatoes', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'rottentomatoes_automation', + 'label': 'Rottentomatoes', + 'description': 'Imports movies from rottentomatoes rss feeds specified below.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + 'default': '1', + }, + { + 'name': 'automation_urls', + 'label': 'url', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + 'default': 'http://www.rottentomatoes.com/syndication/rss/in_theaters.xml', + }, + { + 'name': 'tomatometer_percent', + 'default': '80', + 'label': 'Tomatometer', + 'description': 'Use as extra scoring requirement', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/rottentomatoes/__init__.py b/couchpotato/core/media/movie/providers/automation/rottentomatoes/__init__.py deleted file mode 100644 index 1d3026d..0000000 --- a/couchpotato/core/media/movie/providers/automation/rottentomatoes/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -from .main import Rottentomatoes - - -def start(): - return Rottentomatoes() - -config = [{ - 'name': 'rottentomatoes', - 'groups': [ - { - 'tab': 'automation', - 'list': 'automation_providers', - 'name': 'rottentomatoes_automation', - 'label': 'Rottentomatoes', - 'description': 'Imports movies from rottentomatoes rss feeds specified below.', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_urls_use', - 'label': 'Use', - 'default': '1', - }, - { - 'name': 'automation_urls', - 'label': 'url', - 'type': 'combined', - 'combine': ['automation_urls_use', 'automation_urls'], - 'default': 'http://www.rottentomatoes.com/syndication/rss/in_theaters.xml', - }, - { - 'name': 'tomatometer_percent', - 'default': '80', - 'label': 'Tomatometer', - 'description': 'Use as extra scoring requirement', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/automation/trakt/main.py b/couchpotato/core/media/movie/providers/automation/trakt.py similarity index 55% rename from couchpotato/core/media/movie/providers/automation/trakt/main.py rename to couchpotato/core/media/movie/providers/automation/trakt.py index 881b14a..0c94552 100644 --- a/couchpotato/core/media/movie/providers/automation/trakt/main.py +++ b/couchpotato/core/media/movie/providers/automation/trakt.py @@ -6,6 +6,8 @@ import base64 log = CPLog(__name__) +autoload = 'Trakt' + class Trakt(Automation): @@ -42,3 +44,38 @@ class Trakt(Automation): data = self.getJsonData(self.urls['base'] + method_url, headers = headers) return data if data else [] + + +config = [{ + 'name': 'trakt', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'trakt_automation', + 'label': 'Trakt', + 'description': 'import movies from your own watchlist', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_api_key', + 'label': 'Apikey', + }, + { + 'name': 'automation_username', + 'label': 'Username', + }, + { + 'name': 'automation_password', + 'label': 'Password', + 'type': 'password', + 'description': 'When you have "Protect my data" checked on trakt.', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/trakt/__init__.py b/couchpotato/core/media/movie/providers/automation/trakt/__init__.py deleted file mode 100644 index 6ae2806..0000000 --- a/couchpotato/core/media/movie/providers/automation/trakt/__init__.py +++ /dev/null @@ -1,39 +0,0 @@ -from .main import Trakt - - -def start(): - return Trakt() - -config = [{ - 'name': 'trakt', - 'groups': [ - { - 'tab': 'automation', - 'list': 'watchlist_providers', - 'name': 'trakt_automation', - 'label': 'Trakt', - 'description': 'import movies from your own watchlist', - 'options': [ - { - 'name': 'automation_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'automation_api_key', - 'label': 'Apikey', - }, - { - 'name': 'automation_username', - 'label': 'Username', - }, - { - 'name': 'automation_password', - 'label': 'Password', - 'type': 'password', - 'description': 'When you have "Protect my data" checked on trakt.', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/info/_modifier/main.py b/couchpotato/core/media/movie/providers/info/_modifier.py similarity index 98% rename from couchpotato/core/media/movie/providers/info/_modifier/main.py rename to couchpotato/core/media/movie/providers/info/_modifier.py index 010f1f5..9e82223 100644 --- a/couchpotato/core/media/movie/providers/info/_modifier/main.py +++ b/couchpotato/core/media/movie/providers/info/_modifier.py @@ -9,6 +9,8 @@ import traceback log = CPLog(__name__) +autoload = 'MovieResultModifier' + class MovieResultModifier(Plugin): diff --git a/couchpotato/core/media/movie/providers/info/_modifier/__init__.py b/couchpotato/core/media/movie/providers/info/_modifier/__init__.py deleted file mode 100644 index 3bdf5e0..0000000 --- a/couchpotato/core/media/movie/providers/info/_modifier/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import MovieResultModifier - -def start(): - - return MovieResultModifier() - -config = [] diff --git a/couchpotato/core/media/movie/providers/info/couchpotatoapi/main.py b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py similarity index 99% rename from couchpotato/core/media/movie/providers/info/couchpotatoapi/main.py rename to couchpotato/core/media/movie/providers/info/couchpotatoapi.py index 469866c..272fab9 100644 --- a/couchpotato/core/media/movie/providers/info/couchpotatoapi/main.py +++ b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py @@ -10,6 +10,8 @@ from couchpotato.environment import Env log = CPLog(__name__) +autoload = 'CouchPotatoApi' + class CouchPotatoApi(MovieProvider): diff --git a/couchpotato/core/media/movie/providers/info/couchpotatoapi/__init__.py b/couchpotato/core/media/movie/providers/info/couchpotatoapi/__init__.py deleted file mode 100644 index 196dde6..0000000 --- a/couchpotato/core/media/movie/providers/info/couchpotatoapi/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import CouchPotatoApi - - -def start(): - return CouchPotatoApi() - -config = [] diff --git a/couchpotato/core/media/movie/providers/info/omdbapi/main.py b/couchpotato/core/media/movie/providers/info/omdbapi.py similarity index 99% rename from couchpotato/core/media/movie/providers/info/omdbapi/main.py rename to couchpotato/core/media/movie/providers/info/omdbapi.py index 34e7d56..342df3c 100644 --- a/couchpotato/core/media/movie/providers/info/omdbapi/main.py +++ b/couchpotato/core/media/movie/providers/info/omdbapi.py @@ -11,6 +11,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'OMDBAPI' + class OMDBAPI(MovieProvider): diff --git a/couchpotato/core/media/movie/providers/info/omdbapi/__init__.py b/couchpotato/core/media/movie/providers/info/omdbapi/__init__.py deleted file mode 100644 index b7ea393..0000000 --- a/couchpotato/core/media/movie/providers/info/omdbapi/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import OMDBAPI - - -def start(): - return OMDBAPI() - -config = [] diff --git a/couchpotato/core/media/movie/providers/info/themoviedb/main.py b/couchpotato/core/media/movie/providers/info/themoviedb.py similarity index 92% rename from couchpotato/core/media/movie/providers/info/themoviedb/main.py rename to couchpotato/core/media/movie/providers/info/themoviedb.py index 36f3a48..9f5c5e8 100644 --- a/couchpotato/core/media/movie/providers/info/themoviedb/main.py +++ b/couchpotato/core/media/movie/providers/info/themoviedb.py @@ -7,9 +7,10 @@ from couchpotato.core.logger import CPLog from couchpotato.core.media.movie.providers.base import MovieProvider import tmdb3 - log = CPLog(__name__) +autoload = 'TheMovieDb' + class TheMovieDb(MovieProvider): @@ -175,3 +176,24 @@ class TheMovieDb(MovieProvider): log.error('No API key provided.') return True return False + + +config = [{ + 'name': 'themoviedb', + 'groups': [ + { + 'tab': 'providers', + 'name': 'tmdb', + 'label': 'TheMovieDB', + 'hidden': True, + 'description': 'Used for all calls to TheMovieDB.', + 'options': [ + { + 'name': 'api_key', + 'default': '9b939aee0aaafc12a65bf448e4af9543', + 'label': 'Api Key', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/info/themoviedb/__init__.py b/couchpotato/core/media/movie/providers/info/themoviedb/__init__.py deleted file mode 100644 index b981950..0000000 --- a/couchpotato/core/media/movie/providers/info/themoviedb/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -from .main import TheMovieDb - - -def start(): - return TheMovieDb() - -config = [{ - 'name': 'themoviedb', - 'groups': [ - { - 'tab': 'providers', - 'name': 'tmdb', - 'label': 'TheMovieDB', - 'hidden': True, - 'description': 'Used for all calls to TheMovieDB.', - 'options': [ - { - 'name': 'api_key', - 'default': '9b939aee0aaafc12a65bf448e4af9543', - 'label': 'Api Key', - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/metadata/wmc/__init__.py b/couchpotato/core/media/movie/providers/metadata/wmc.py similarity index 66% rename from couchpotato/core/media/movie/providers/metadata/wmc/__init__.py rename to couchpotato/core/media/movie/providers/metadata/wmc.py index 167a24d..50db02d 100644 --- a/couchpotato/core/media/movie/providers/metadata/wmc/__init__.py +++ b/couchpotato/core/media/movie/providers/metadata/wmc.py @@ -1,8 +1,14 @@ -from .main import WindowsMediaCenter +from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData +import os +autoload = 'WindowsMediaCenter' + + +class WindowsMediaCenter(MovieMetaData): + + def getThumbnailName(self, name, root): + return os.path.join(root, 'folder.jpg') -def start(): - return WindowsMediaCenter() config = [{ 'name': 'windowsmediacenter', diff --git a/couchpotato/core/media/movie/providers/metadata/wmc/main.py b/couchpotato/core/media/movie/providers/metadata/wmc/main.py deleted file mode 100644 index bdb96a4..0000000 --- a/couchpotato/core/media/movie/providers/metadata/wmc/main.py +++ /dev/null @@ -1,8 +0,0 @@ -from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData -import os - - -class WindowsMediaCenter(MovieMetaData): - - def getThumbnailName(self, name, root): - return os.path.join(root, 'folder.jpg') diff --git a/couchpotato/core/media/movie/providers/metadata/xbmc/main.py b/couchpotato/core/media/movie/providers/metadata/xbmc.py similarity index 74% rename from couchpotato/core/media/movie/providers/metadata/xbmc/main.py rename to couchpotato/core/media/movie/providers/metadata/xbmc.py index 61f3647..e9904cf 100644 --- a/couchpotato/core/media/movie/providers/metadata/xbmc/main.py +++ b/couchpotato/core/media/movie/providers/metadata/xbmc.py @@ -10,6 +10,9 @@ import xml.dom.minidom log = CPLog(__name__) +autoload = 'XBMC' + + class XBMC(MovieMetaData): def getFanartName(self, name, root): @@ -172,3 +175,69 @@ class XBMC(MovieMetaData): xml_string = text_re.sub('>\g<1>%s is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"' + }, + { + 'name': 'meta_url_only', + 'label': 'Only IMDB URL', + 'default': False, + 'advanced': True, + 'description': 'Create a nfo with only the IMDB url inside', + 'type': 'bool', + }, + { + 'name': 'meta_fanart', + 'label': 'Fanart', + 'default': True, + 'type': 'bool', + }, + { + 'name': 'meta_fanart_name', + 'label': 'Fanart filename', + 'default': '%s-fanart.jpg', + 'advanced': True, + }, + { + 'name': 'meta_thumbnail', + 'label': 'Thumbnail', + 'default': True, + 'type': 'bool', + }, + { + 'name': 'meta_thumbnail_name', + 'label': 'Thumbnail filename', + 'default': '%s.tbn', + 'advanced': True, + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/metadata/xbmc/__init__.py b/couchpotato/core/media/movie/providers/metadata/xbmc/__init__.py deleted file mode 100644 index deb5c90..0000000 --- a/couchpotato/core/media/movie/providers/metadata/xbmc/__init__.py +++ /dev/null @@ -1,70 +0,0 @@ -from .main import XBMC - - -def start(): - return XBMC() - -config = [{ - 'name': 'xbmc', - 'groups': [ - { - 'tab': 'renamer', - 'subtab': 'metadata', - 'name': 'xbmc_metadata', - 'label': 'XBMC', - 'description': 'Enable metadata XBMC can understand', - 'options': [ - { - 'name': 'meta_enabled', - 'default': False, - 'type': 'enabler', - }, - { - 'name': 'meta_nfo', - 'label': 'NFO', - 'default': True, - 'type': 'bool', - }, - { - 'name': 'meta_nfo_name', - 'label': 'NFO filename', - 'default': '%s.nfo', - 'advanced': True, - 'description': '%s is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"' - }, - { - 'name': 'meta_url_only', - 'label': 'Only IMDB URL', - 'default': False, - 'advanced': True, - 'description': 'Create a nfo with only the IMDB url inside', - 'type': 'bool', - }, - { - 'name': 'meta_fanart', - 'label': 'Fanart', - 'default': True, - 'type': 'bool', - }, - { - 'name': 'meta_fanart_name', - 'label': 'Fanart filename', - 'default': '%s-fanart.jpg', - 'advanced': True, - }, - { - 'name': 'meta_thumbnail', - 'label': 'Thumbnail', - 'default': True, - 'type': 'bool', - }, - { - 'name': 'meta_thumbnail_name', - 'label': 'Thumbnail filename', - 'default': '%s.tbn', - 'advanced': True, - }, - ], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/nzb/__init__.py b/couchpotato/core/media/movie/providers/nzb/__init__.py index 88d9865..e69de29 100644 --- a/couchpotato/core/media/movie/providers/nzb/__init__.py +++ b/couchpotato/core/media/movie/providers/nzb/__init__.py @@ -1,14 +0,0 @@ -config = [{ - 'name': 'nzb_providers', - 'groups': [ - { - 'label': 'Usenet Providers', - 'description': 'Providers searching usenet for new releases', - 'wizard': True, - 'type': 'list', - 'name': 'nzb_providers', - 'tab': 'searcher', - 'options': [], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/nzb/binsearch/main.py b/couchpotato/core/media/movie/providers/nzb/binsearch.py similarity index 100% rename from couchpotato/core/media/movie/providers/nzb/binsearch/main.py rename to couchpotato/core/media/movie/providers/nzb/binsearch.py diff --git a/couchpotato/core/media/movie/providers/nzb/binsearch/__init__.py b/couchpotato/core/media/movie/providers/nzb/binsearch/__init__.py deleted file mode 100644 index 13a4bfb..0000000 --- a/couchpotato/core/media/movie/providers/nzb/binsearch/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import BinSearch - - -def start(): - return BinSearch() - -config = [] diff --git a/couchpotato/core/media/movie/providers/nzb/newznab/main.py b/couchpotato/core/media/movie/providers/nzb/newznab.py similarity index 100% rename from couchpotato/core/media/movie/providers/nzb/newznab/main.py rename to couchpotato/core/media/movie/providers/nzb/newznab.py diff --git a/couchpotato/core/media/movie/providers/nzb/newznab/__init__.py b/couchpotato/core/media/movie/providers/nzb/newznab/__init__.py deleted file mode 100644 index 2b25ce2..0000000 --- a/couchpotato/core/media/movie/providers/nzb/newznab/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import Newznab - - -def start(): - return Newznab() - -config = [] diff --git a/couchpotato/core/media/movie/providers/nzb/nzbclub/main.py b/couchpotato/core/media/movie/providers/nzb/nzbclub.py similarity index 100% rename from couchpotato/core/media/movie/providers/nzb/nzbclub/main.py rename to couchpotato/core/media/movie/providers/nzb/nzbclub.py diff --git a/couchpotato/core/media/movie/providers/nzb/nzbclub/__init__.py b/couchpotato/core/media/movie/providers/nzb/nzbclub/__init__.py deleted file mode 100644 index 31df965..0000000 --- a/couchpotato/core/media/movie/providers/nzb/nzbclub/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import NZBClub - - -def start(): - return NZBClub() - -config = [] diff --git a/couchpotato/core/media/movie/providers/nzb/nzbindex/main.py b/couchpotato/core/media/movie/providers/nzb/nzbindex.py similarity index 100% rename from couchpotato/core/media/movie/providers/nzb/nzbindex/main.py rename to couchpotato/core/media/movie/providers/nzb/nzbindex.py diff --git a/couchpotato/core/media/movie/providers/nzb/nzbindex/__init__.py b/couchpotato/core/media/movie/providers/nzb/nzbindex/__init__.py deleted file mode 100644 index acf9e91..0000000 --- a/couchpotato/core/media/movie/providers/nzb/nzbindex/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import NzbIndex - - -def start(): - return NzbIndex() - -config = [] diff --git a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs/main.py b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py similarity index 100% rename from couchpotato/core/media/movie/providers/nzb/omgwtfnzbs/main.py rename to couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py diff --git a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs/__init__.py deleted file mode 100644 index 086db2c..0000000 --- a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import OMGWTFNZBs - - -def start(): - return OMGWTFNZBs() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/__init__.py b/couchpotato/core/media/movie/providers/torrent/__init__.py index 12dda70..e69de29 100644 --- a/couchpotato/core/media/movie/providers/torrent/__init__.py +++ b/couchpotato/core/media/movie/providers/torrent/__init__.py @@ -1,14 +0,0 @@ -config = [{ - 'name': 'torrent_providers', - 'groups': [ - { - 'label': 'Torrent Providers', - 'description': 'Providers searching torrent sites for new releases', - 'wizard': True, - 'type': 'list', - 'name': 'torrent_providers', - 'tab': 'searcher', - 'options': [], - }, - ], -}] diff --git a/couchpotato/core/media/movie/providers/torrent/awesomehd/main.py b/couchpotato/core/media/movie/providers/torrent/awesomehd.py similarity index 91% rename from couchpotato/core/media/movie/providers/torrent/awesomehd/main.py rename to couchpotato/core/media/movie/providers/torrent/awesomehd.py index 55f23d9..d96b59a 100644 --- a/couchpotato/core/media/movie/providers/torrent/awesomehd/main.py +++ b/couchpotato/core/media/movie/providers/torrent/awesomehd.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'AwesomeHD' + class AwesomeHD(MovieProvider, Base): pass diff --git a/couchpotato/core/media/movie/providers/torrent/awesomehd/__init__.py b/couchpotato/core/media/movie/providers/torrent/awesomehd/__init__.py deleted file mode 100644 index 7cc37a2..0000000 --- a/couchpotato/core/media/movie/providers/torrent/awesomehd/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from .main import AwesomeHD - - -def start(): - return AwesomeHD() - -config = [] - diff --git a/couchpotato/core/media/movie/providers/torrent/bithdtv/main.py b/couchpotato/core/media/movie/providers/torrent/bithdtv.py similarity index 96% rename from couchpotato/core/media/movie/providers/torrent/bithdtv/main.py rename to couchpotato/core/media/movie/providers/torrent/bithdtv.py index 03be850..f1f9cff 100644 --- a/couchpotato/core/media/movie/providers/torrent/bithdtv/main.py +++ b/couchpotato/core/media/movie/providers/torrent/bithdtv.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'BiTHDTV' + class BiTHDTV(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/bithdtv/__init__.py b/couchpotato/core/media/movie/providers/torrent/bithdtv/__init__.py deleted file mode 100644 index 0145dcd..0000000 --- a/couchpotato/core/media/movie/providers/torrent/bithdtv/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import BiTHDTV - - -def start(): - return BiTHDTV() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/bitsoup/main.py b/couchpotato/core/media/movie/providers/torrent/bitsoup.py similarity index 97% rename from couchpotato/core/media/movie/providers/torrent/bitsoup/main.py rename to couchpotato/core/media/movie/providers/torrent/bitsoup.py index b67ae22..7170ebd 100644 --- a/couchpotato/core/media/movie/providers/torrent/bitsoup/main.py +++ b/couchpotato/core/media/movie/providers/torrent/bitsoup.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'Bitsoup' + class Bitsoup(MovieProvider, Base): cat_ids = [ diff --git a/couchpotato/core/media/movie/providers/torrent/bitsoup/__init__.py b/couchpotato/core/media/movie/providers/torrent/bitsoup/__init__.py deleted file mode 100644 index 8be80c8..0000000 --- a/couchpotato/core/media/movie/providers/torrent/bitsoup/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import Bitsoup - - -def start(): - return Bitsoup() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/hdbits/main.py b/couchpotato/core/media/movie/providers/torrent/hdbits.py similarity index 92% rename from couchpotato/core/media/movie/providers/torrent/hdbits/main.py rename to couchpotato/core/media/movie/providers/torrent/hdbits.py index 2a1e23f..e44e3b3 100644 --- a/couchpotato/core/media/movie/providers/torrent/hdbits/main.py +++ b/couchpotato/core/media/movie/providers/torrent/hdbits.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'HDBits' + class HDBits(MovieProvider, Base): pass diff --git a/couchpotato/core/media/movie/providers/torrent/hdbits/__init__.py b/couchpotato/core/media/movie/providers/torrent/hdbits/__init__.py deleted file mode 100644 index 1c7b435..0000000 --- a/couchpotato/core/media/movie/providers/torrent/hdbits/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import HDBits - - -def start(): - return HDBits() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/ilovetorrents/main.py b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py similarity index 90% rename from couchpotato/core/media/movie/providers/torrent/ilovetorrents/main.py rename to couchpotato/core/media/movie/providers/torrent/ilovetorrents.py index 5e90e73..ad0bac3 100644 --- a/couchpotato/core/media/movie/providers/torrent/ilovetorrents/main.py +++ b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'ILoveTorrents' + class ILoveTorrents(MovieProvider, Base): pass diff --git a/couchpotato/core/media/movie/providers/torrent/ilovetorrents/__init__.py b/couchpotato/core/media/movie/providers/torrent/ilovetorrents/__init__.py deleted file mode 100644 index f20367d..0000000 --- a/couchpotato/core/media/movie/providers/torrent/ilovetorrents/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import ILoveTorrents - - -def start(): - return ILoveTorrents() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/iptorrents/main.py b/couchpotato/core/media/movie/providers/torrent/iptorrents.py similarity index 100% rename from couchpotato/core/media/movie/providers/torrent/iptorrents/main.py rename to couchpotato/core/media/movie/providers/torrent/iptorrents.py diff --git a/couchpotato/core/media/movie/providers/torrent/iptorrents/__init__.py b/couchpotato/core/media/movie/providers/torrent/iptorrents/__init__.py deleted file mode 100644 index 8741a13..0000000 --- a/couchpotato/core/media/movie/providers/torrent/iptorrents/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import IPTorrents - - -def start(): - return IPTorrents() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/kickasstorrents/main.py b/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py similarity index 100% rename from couchpotato/core/media/movie/providers/torrent/kickasstorrents/main.py rename to couchpotato/core/media/movie/providers/torrent/kickasstorrents.py diff --git a/couchpotato/core/media/movie/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/media/movie/providers/torrent/kickasstorrents/__init__.py deleted file mode 100644 index cb29387..0000000 --- a/couchpotato/core/media/movie/providers/torrent/kickasstorrents/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import KickAssTorrents - - -def start(): - return KickAssTorrents() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/passthepopcorn/main.py b/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py similarity index 100% rename from couchpotato/core/media/movie/providers/torrent/passthepopcorn/main.py rename to couchpotato/core/media/movie/providers/torrent/passthepopcorn.py diff --git a/couchpotato/core/media/movie/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/media/movie/providers/torrent/passthepopcorn/__init__.py deleted file mode 100644 index c437737..0000000 --- a/couchpotato/core/media/movie/providers/torrent/passthepopcorn/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import PassThePopcorn - - -def start(): - return PassThePopcorn() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/publichd/main.py b/couchpotato/core/media/movie/providers/torrent/publichd.py similarity index 94% rename from couchpotato/core/media/movie/providers/torrent/publichd/main.py rename to couchpotato/core/media/movie/providers/torrent/publichd.py index 5c3cd94..4dd7efb 100644 --- a/couchpotato/core/media/movie/providers/torrent/publichd/main.py +++ b/couchpotato/core/media/movie/providers/torrent/publichd.py @@ -5,6 +5,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'PublicHD' + class PublicHD(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/publichd/__init__.py b/couchpotato/core/media/movie/providers/torrent/publichd/__init__.py deleted file mode 100644 index c58d2b5..0000000 --- a/couchpotato/core/media/movie/providers/torrent/publichd/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import PublicHD - - -def start(): - return PublicHD() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/sceneaccess/main.py b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py similarity index 97% rename from couchpotato/core/media/movie/providers/torrent/sceneaccess/main.py rename to couchpotato/core/media/movie/providers/torrent/sceneaccess.py index 7ed756e..ead32e2 100644 --- a/couchpotato/core/media/movie/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'SceneAccess' + class SceneAccess(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/media/movie/providers/torrent/sceneaccess/__init__.py deleted file mode 100644 index 1493222..0000000 --- a/couchpotato/core/media/movie/providers/torrent/sceneaccess/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import SceneAccess - - -def start(): - return SceneAccess() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/thepiratebay/main.py b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py similarity index 96% rename from couchpotato/core/media/movie/providers/torrent/thepiratebay/main.py rename to couchpotato/core/media/movie/providers/torrent/thepiratebay.py index 138f311..4f6f3bb 100644 --- a/couchpotato/core/media/movie/providers/torrent/thepiratebay/main.py +++ b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'ThePirateBay' + class ThePirateBay(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/media/movie/providers/torrent/thepiratebay/__init__.py deleted file mode 100644 index 3bd44a4..0000000 --- a/couchpotato/core/media/movie/providers/torrent/thepiratebay/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import ThePirateBay - - -def start(): - return ThePirateBay() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/torrentbytes/main.py b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py similarity index 90% rename from couchpotato/core/media/movie/providers/torrent/torrentbytes/main.py rename to couchpotato/core/media/movie/providers/torrent/torrentbytes.py index d013187..cef5255 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentbytes/main.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'TorrentBytes' + class TorrentBytes(MovieProvider, Base): pass diff --git a/couchpotato/core/media/movie/providers/torrent/torrentbytes/__init__.py b/couchpotato/core/media/movie/providers/torrent/torrentbytes/__init__.py deleted file mode 100644 index 39bef36..0000000 --- a/couchpotato/core/media/movie/providers/torrent/torrentbytes/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import TorrentBytes - - -def start(): - return TorrentBytes() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/torrentday/main.py b/couchpotato/core/media/movie/providers/torrent/torrentday.py similarity index 95% rename from couchpotato/core/media/movie/providers/torrent/torrentday/main.py rename to couchpotato/core/media/movie/providers/torrent/torrentday.py index 566b038..fa90306 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentday/main.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentday.py @@ -5,6 +5,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'TorrentDay' + class TorrentDay(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/torrentday/__init__.py b/couchpotato/core/media/movie/providers/torrent/torrentday/__init__.py deleted file mode 100644 index 0ebf09e..0000000 --- a/couchpotato/core/media/movie/providers/torrent/torrentday/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import TorrentDay - - -def start(): - return TorrentDay() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/torrentleech/main.py b/couchpotato/core/media/movie/providers/torrent/torrentleech.py similarity index 96% rename from couchpotato/core/media/movie/providers/torrent/torrentleech/main.py rename to couchpotato/core/media/movie/providers/torrent/torrentleech.py index 3b6b858..5483adc 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentleech/main.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentleech.py @@ -5,6 +5,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'TorrentLeech' + class TorrentLeech(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/torrentleech/__init__.py b/couchpotato/core/media/movie/providers/torrent/torrentleech/__init__.py deleted file mode 100644 index afb8f1e..0000000 --- a/couchpotato/core/media/movie/providers/torrent/torrentleech/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import TorrentLeech - - -def start(): - return TorrentLeech() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/torrentpotato/main.py b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py similarity index 95% rename from couchpotato/core/media/movie/providers/torrent/torrentpotato/main.py rename to couchpotato/core/media/movie/providers/torrent/torrentpotato.py index a2ddae8..1e5903a 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentpotato/main.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py @@ -5,6 +5,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'TorrentPotato' + class TorrentPotato(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/torrentpotato/__init__.py b/couchpotato/core/media/movie/providers/torrent/torrentpotato/__init__.py deleted file mode 100644 index 58b9d7b..0000000 --- a/couchpotato/core/media/movie/providers/torrent/torrentpotato/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import TorrentPotato - - -def start(): - return TorrentPotato() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack/main.py b/couchpotato/core/media/movie/providers/torrent/torrentshack.py similarity index 97% rename from couchpotato/core/media/movie/providers/torrent/torrentshack/main.py rename to couchpotato/core/media/movie/providers/torrent/torrentshack.py index 9e01475..8bf7fb9 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentshack/main.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentshack.py @@ -6,6 +6,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'TorrentShack' + class TorrentShack(MovieProvider, Base): diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack/__init__.py b/couchpotato/core/media/movie/providers/torrent/torrentshack/__init__.py deleted file mode 100644 index 7448a47..0000000 --- a/couchpotato/core/media/movie/providers/torrent/torrentshack/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import TorrentShack - - -def start(): - return TorrentShack() - -config = [] diff --git a/couchpotato/core/media/movie/providers/torrent/yify/main.py b/couchpotato/core/media/movie/providers/torrent/yify.py similarity index 93% rename from couchpotato/core/media/movie/providers/torrent/yify/main.py rename to couchpotato/core/media/movie/providers/torrent/yify.py index 24ee8ea..16c7694 100644 --- a/couchpotato/core/media/movie/providers/torrent/yify/main.py +++ b/couchpotato/core/media/movie/providers/torrent/yify.py @@ -4,6 +4,8 @@ from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) +autoload = 'Yify' + class Yify(MovieProvider, Base): pass diff --git a/couchpotato/core/media/movie/providers/torrent/yify/__init__.py b/couchpotato/core/media/movie/providers/torrent/yify/__init__.py deleted file mode 100644 index ac9baa2..0000000 --- a/couchpotato/core/media/movie/providers/torrent/yify/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import Yify - - -def start(): - return Yify() - -config = [] diff --git a/couchpotato/core/media/movie/providers/trailer/hdtrailers/main.py b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py similarity index 99% rename from couchpotato/core/media/movie/providers/trailer/hdtrailers/main.py rename to couchpotato/core/media/movie/providers/trailer/hdtrailers.py index ea2fe95..1f5b4f6 100644 --- a/couchpotato/core/media/movie/providers/trailer/hdtrailers/main.py +++ b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py @@ -9,6 +9,8 @@ from couchpotato.core.media.movie.providers.trailer.base import TrailerProvider log = CPLog(__name__) +autoload = 'HDTrailers' + class HDTrailers(TrailerProvider): diff --git a/couchpotato/core/media/movie/providers/trailer/hdtrailers/__init__.py b/couchpotato/core/media/movie/providers/trailer/hdtrailers/__init__.py deleted file mode 100644 index 83b9300..0000000 --- a/couchpotato/core/media/movie/providers/trailer/hdtrailers/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from .main import HDTrailers - - -def start(): - return HDTrailers() - -config = [] diff --git a/couchpotato/core/media/movie/providers/userscript/allocine/main.py b/couchpotato/core/media/movie/providers/userscript/allocine.py similarity index 97% rename from couchpotato/core/media/movie/providers/userscript/allocine/main.py rename to couchpotato/core/media/movie/providers/userscript/allocine.py index c3400ee..2eaef42 100644 --- a/couchpotato/core/media/movie/providers/userscript/allocine/main.py +++ b/couchpotato/core/media/movie/providers/userscript/allocine.py @@ -4,6 +4,8 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBas log = CPLog(__name__) +autoload = 'AlloCine' + class AlloCine(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/allocine/__init__.py b/couchpotato/core/media/movie/providers/userscript/allocine/__init__.py deleted file mode 100644 index d272a7f..0000000 --- a/couchpotato/core/media/movie/providers/userscript/allocine/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import AlloCine - - -def start(): - return AlloCine() diff --git a/couchpotato/core/media/movie/providers/userscript/appletrailers/main.py b/couchpotato/core/media/movie/providers/userscript/appletrailers.py similarity index 95% rename from couchpotato/core/media/movie/providers/userscript/appletrailers/main.py rename to couchpotato/core/media/movie/providers/userscript/appletrailers.py index 41b72c4..af201ed 100644 --- a/couchpotato/core/media/movie/providers/userscript/appletrailers/main.py +++ b/couchpotato/core/media/movie/providers/userscript/appletrailers.py @@ -1,6 +1,8 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase import re +autoload = 'AppleTrailers' + class AppleTrailers(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/appletrailers/__init__.py b/couchpotato/core/media/movie/providers/userscript/appletrailers/__init__.py deleted file mode 100644 index 28eedbb..0000000 --- a/couchpotato/core/media/movie/providers/userscript/appletrailers/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import AppleTrailers - - -def start(): - return AppleTrailers() diff --git a/couchpotato/core/media/movie/providers/userscript/criticker/main.py b/couchpotato/core/media/movie/providers/userscript/criticker.py similarity index 87% rename from couchpotato/core/media/movie/providers/userscript/criticker/main.py rename to couchpotato/core/media/movie/providers/userscript/criticker.py index 7ab63c9..cc0bee8 100644 --- a/couchpotato/core/media/movie/providers/userscript/criticker/main.py +++ b/couchpotato/core/media/movie/providers/userscript/criticker.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'Criticker' + class Criticker(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/criticker/__init__.py b/couchpotato/core/media/movie/providers/userscript/criticker/__init__.py deleted file mode 100644 index 550855e..0000000 --- a/couchpotato/core/media/movie/providers/userscript/criticker/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Criticker - - -def start(): - return Criticker() diff --git a/couchpotato/core/media/movie/providers/userscript/filmweb/main.py b/couchpotato/core/media/movie/providers/userscript/filmweb.py similarity index 97% rename from couchpotato/core/media/movie/providers/userscript/filmweb/main.py rename to couchpotato/core/media/movie/providers/userscript/filmweb.py index 18e5d30..f4e3652 100644 --- a/couchpotato/core/media/movie/providers/userscript/filmweb/main.py +++ b/couchpotato/core/media/movie/providers/userscript/filmweb.py @@ -1,6 +1,8 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase import re +autoload = 'Filmweb' + class Filmweb(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/filmweb/__init__.py b/couchpotato/core/media/movie/providers/userscript/filmweb/__init__.py deleted file mode 100644 index 38354b4..0000000 --- a/couchpotato/core/media/movie/providers/userscript/filmweb/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Filmweb - - -def start(): - return Filmweb() diff --git a/couchpotato/core/media/movie/providers/userscript/flickchart/main.py b/couchpotato/core/media/movie/providers/userscript/flickchart.py similarity index 97% rename from couchpotato/core/media/movie/providers/userscript/flickchart/main.py rename to couchpotato/core/media/movie/providers/userscript/flickchart.py index 6c2837b..2df0acf 100644 --- a/couchpotato/core/media/movie/providers/userscript/flickchart/main.py +++ b/couchpotato/core/media/movie/providers/userscript/flickchart.py @@ -5,6 +5,8 @@ import traceback log = CPLog(__name__) +autoload = 'Flickchart' + class Flickchart(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/flickchart/__init__.py b/couchpotato/core/media/movie/providers/userscript/flickchart/__init__.py deleted file mode 100644 index 5ff48e5..0000000 --- a/couchpotato/core/media/movie/providers/userscript/flickchart/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Flickchart - - -def start(): - return Flickchart() diff --git a/couchpotato/core/media/movie/providers/userscript/imdb/main.py b/couchpotato/core/media/movie/providers/userscript/imdb.py similarity index 87% rename from couchpotato/core/media/movie/providers/userscript/imdb/main.py rename to couchpotato/core/media/movie/providers/userscript/imdb.py index 1436393..dccc483 100644 --- a/couchpotato/core/media/movie/providers/userscript/imdb/main.py +++ b/couchpotato/core/media/movie/providers/userscript/imdb.py @@ -1,7 +1,8 @@ -from couchpotato.core.event import fireEvent from couchpotato.core.helpers.variable import getImdb from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'IMDB' + class IMDB(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/imdb/__init__.py b/couchpotato/core/media/movie/providers/userscript/imdb/__init__.py deleted file mode 100644 index e310cc3..0000000 --- a/couchpotato/core/media/movie/providers/userscript/imdb/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import IMDB - - -def start(): - return IMDB() diff --git a/couchpotato/core/media/movie/providers/userscript/letterboxd/main.py b/couchpotato/core/media/movie/providers/userscript/letterboxd.py similarity index 86% rename from couchpotato/core/media/movie/providers/userscript/letterboxd/main.py rename to couchpotato/core/media/movie/providers/userscript/letterboxd.py index 852c1b7..43b5d30 100644 --- a/couchpotato/core/media/movie/providers/userscript/letterboxd/main.py +++ b/couchpotato/core/media/movie/providers/userscript/letterboxd.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'Letterboxd' + class Letterboxd(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/letterboxd/__init__.py b/couchpotato/core/media/movie/providers/userscript/letterboxd/__init__.py deleted file mode 100644 index 78ef77b..0000000 --- a/couchpotato/core/media/movie/providers/userscript/letterboxd/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Letterboxd - - -def start(): - return Letterboxd() diff --git a/couchpotato/core/media/movie/providers/userscript/moviemeter/main.py b/couchpotato/core/media/movie/providers/userscript/moviemeter.py similarity index 88% rename from couchpotato/core/media/movie/providers/userscript/moviemeter/main.py rename to couchpotato/core/media/movie/providers/userscript/moviemeter.py index f1b254f..4c9bb22 100644 --- a/couchpotato/core/media/movie/providers/userscript/moviemeter/main.py +++ b/couchpotato/core/media/movie/providers/userscript/moviemeter.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'MovieMeter' + class MovieMeter(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/moviemeter/__init__.py b/couchpotato/core/media/movie/providers/userscript/moviemeter/__init__.py deleted file mode 100644 index aae8ca7..0000000 --- a/couchpotato/core/media/movie/providers/userscript/moviemeter/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import MovieMeter - - -def start(): - return MovieMeter() diff --git a/couchpotato/core/media/movie/providers/userscript/moviesio/main.py b/couchpotato/core/media/movie/providers/userscript/moviesio.py similarity index 87% rename from couchpotato/core/media/movie/providers/userscript/moviesio/main.py rename to couchpotato/core/media/movie/providers/userscript/moviesio.py index a466baf..0381d64 100644 --- a/couchpotato/core/media/movie/providers/userscript/moviesio/main.py +++ b/couchpotato/core/media/movie/providers/userscript/moviesio.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'MoviesIO' + class MoviesIO(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/moviesio/__init__.py b/couchpotato/core/media/movie/providers/userscript/moviesio/__init__.py deleted file mode 100644 index 3f0497f..0000000 --- a/couchpotato/core/media/movie/providers/userscript/moviesio/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import MoviesIO - - -def start(): - return MoviesIO() diff --git a/couchpotato/core/media/movie/providers/userscript/reddit/main.py b/couchpotato/core/media/movie/providers/userscript/reddit.py similarity index 96% rename from couchpotato/core/media/movie/providers/userscript/reddit/main.py rename to couchpotato/core/media/movie/providers/userscript/reddit.py index ec59e69..3ab1d08 100644 --- a/couchpotato/core/media/movie/providers/userscript/reddit/main.py +++ b/couchpotato/core/media/movie/providers/userscript/reddit.py @@ -2,6 +2,8 @@ from couchpotato import fireEvent from couchpotato.core.helpers.variable import splitString from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'Reddit' + class Reddit(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/reddit/__init__.py b/couchpotato/core/media/movie/providers/userscript/reddit/__init__.py deleted file mode 100644 index d803bb5..0000000 --- a/couchpotato/core/media/movie/providers/userscript/reddit/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Reddit - - -def start(): - return Reddit() diff --git a/couchpotato/core/media/movie/providers/userscript/rottentomatoes/main.py b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py similarity index 97% rename from couchpotato/core/media/movie/providers/userscript/rottentomatoes/main.py rename to couchpotato/core/media/movie/providers/userscript/rottentomatoes.py index 0b3145e..cb66146 100644 --- a/couchpotato/core/media/movie/providers/userscript/rottentomatoes/main.py +++ b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py @@ -5,6 +5,8 @@ import traceback log = CPLog(__name__) +autoload = 'RottenTomatoes' + class RottenTomatoes(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/rottentomatoes/__init__.py b/couchpotato/core/media/movie/providers/userscript/rottentomatoes/__init__.py deleted file mode 100644 index b041d5a..0000000 --- a/couchpotato/core/media/movie/providers/userscript/rottentomatoes/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import RottenTomatoes - - -def start(): - return RottenTomatoes() diff --git a/couchpotato/core/media/movie/providers/userscript/sharethe/main.py b/couchpotato/core/media/movie/providers/userscript/sharethe.py similarity index 89% rename from couchpotato/core/media/movie/providers/userscript/sharethe/main.py rename to couchpotato/core/media/movie/providers/userscript/sharethe.py index ce11229..ef2f537 100644 --- a/couchpotato/core/media/movie/providers/userscript/sharethe/main.py +++ b/couchpotato/core/media/movie/providers/userscript/sharethe.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'ShareThe' + class ShareThe(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/sharethe/__init__.py b/couchpotato/core/media/movie/providers/userscript/sharethe/__init__.py deleted file mode 100644 index cf553da..0000000 --- a/couchpotato/core/media/movie/providers/userscript/sharethe/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import ShareThe - - -def start(): - return ShareThe() diff --git a/couchpotato/core/media/movie/providers/userscript/tmdb/main.py b/couchpotato/core/media/movie/providers/userscript/tmdb.py similarity index 96% rename from couchpotato/core/media/movie/providers/userscript/tmdb/main.py rename to couchpotato/core/media/movie/providers/userscript/tmdb.py index 9638bea..71ab0d7 100644 --- a/couchpotato/core/media/movie/providers/userscript/tmdb/main.py +++ b/couchpotato/core/media/movie/providers/userscript/tmdb.py @@ -2,6 +2,8 @@ from couchpotato.core.event import fireEvent from couchpotato.core.media._base.providers.userscript.base import UserscriptBase import re +autoload = 'TMDB' + class TMDB(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/tmdb/__init__.py b/couchpotato/core/media/movie/providers/userscript/tmdb/__init__.py deleted file mode 100644 index 609f364..0000000 --- a/couchpotato/core/media/movie/providers/userscript/tmdb/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import TMDB - - -def start(): - return TMDB() diff --git a/couchpotato/core/media/movie/providers/userscript/trakt/main.py b/couchpotato/core/media/movie/providers/userscript/trakt.py similarity index 92% rename from couchpotato/core/media/movie/providers/userscript/trakt/main.py rename to couchpotato/core/media/movie/providers/userscript/trakt.py index 17cfddd..cd40c69 100644 --- a/couchpotato/core/media/movie/providers/userscript/trakt/main.py +++ b/couchpotato/core/media/movie/providers/userscript/trakt.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'Trakt' + class Trakt(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/trakt/__init__.py b/couchpotato/core/media/movie/providers/userscript/trakt/__init__.py deleted file mode 100644 index ddba440..0000000 --- a/couchpotato/core/media/movie/providers/userscript/trakt/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import Trakt - - -def start(): - return Trakt() diff --git a/couchpotato/core/media/movie/providers/userscript/whiwa/main.py b/couchpotato/core/media/movie/providers/userscript/whiwa.py similarity index 89% rename from couchpotato/core/media/movie/providers/userscript/whiwa/main.py rename to couchpotato/core/media/movie/providers/userscript/whiwa.py index e0a0120..bd602d2 100644 --- a/couchpotato/core/media/movie/providers/userscript/whiwa/main.py +++ b/couchpotato/core/media/movie/providers/userscript/whiwa.py @@ -1,5 +1,7 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase +autoload = 'WHiWA' + class WHiWA(UserscriptBase): diff --git a/couchpotato/core/media/movie/providers/userscript/whiwa/__init__.py b/couchpotato/core/media/movie/providers/userscript/whiwa/__init__.py deleted file mode 100644 index 3b14f47..0000000 --- a/couchpotato/core/media/movie/providers/userscript/whiwa/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import WHiWA - - -def start(): - return WHiWA() diff --git a/couchpotato/core/media/movie/providers/userscript/youteather/main.py b/couchpotato/core/media/movie/providers/userscript/youteather.py similarity index 95% rename from couchpotato/core/media/movie/providers/userscript/youteather/main.py rename to couchpotato/core/media/movie/providers/userscript/youteather.py index 34c9768..3a35df3 100644 --- a/couchpotato/core/media/movie/providers/userscript/youteather/main.py +++ b/couchpotato/core/media/movie/providers/userscript/youteather.py @@ -1,6 +1,9 @@ from couchpotato.core.media._base.providers.userscript.base import UserscriptBase import re +autoload = 'YouTheater' + + class YouTheater(UserscriptBase): id_re = re.compile("view\.php\?id=(\d+)") includes = ['http://www.youtheater.com/view.php?id=*', 'http://youtheater.com/view.php?id=*', diff --git a/couchpotato/core/media/movie/providers/userscript/youteather/__init__.py b/couchpotato/core/media/movie/providers/userscript/youteather/__init__.py deleted file mode 100644 index 8eb44c7..0000000 --- a/couchpotato/core/media/movie/providers/userscript/youteather/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from .main import YouTheater - - -def start(): - return YouTheater() diff --git a/couchpotato/core/media/movie/searcher/main.py b/couchpotato/core/media/movie/searcher.py similarity index 82% rename from couchpotato/core/media/movie/searcher/main.py rename to couchpotato/core/media/movie/searcher.py index dfc2ee2..192040f 100644 --- a/couchpotato/core/media/movie/searcher/main.py +++ b/couchpotato/core/media/movie/searcher.py @@ -347,3 +347,72 @@ class MovieSearcher(SearcherBase, MovieTypeBase): class SearchSetupError(Exception): pass + + +config = [{ + 'name': 'moviesearcher', + 'order': 20, + 'groups': [ + { + 'tab': 'searcher', + 'name': 'movie_searcher', + 'label': 'Movie search', + 'description': 'Search options for movies', + 'advanced': True, + 'options': [ + { + 'name': 'always_search', + 'default': False, + 'migrate_from': 'searcher', + 'type': 'bool', + 'label': 'Always search', + 'description': 'Search for movies even before there is a ETA. Enabling this will probably get you a lot of fakes.', + }, + { + 'name': 'run_on_launch', + 'migrate_from': 'searcher', + 'label': 'Run on launch', + 'advanced': True, + 'default': 0, + 'type': 'bool', + 'description': 'Force run the searcher after (re)start.', + }, + { + 'name': 'search_on_add', + 'label': 'Search after add', + 'advanced': True, + 'default': 1, + 'type': 'bool', + 'description': 'Disable this to only search for movies on cron.', + }, + { + 'name': 'cron_day', + 'migrate_from': 'searcher', + 'label': 'Day', + 'advanced': True, + 'default': '*', + 'type': 'string', + 'description': '*: Every day, */2: Every 2 days, 1: Every first of the month. See APScheduler for details.', + }, + { + 'name': 'cron_hour', + 'migrate_from': 'searcher', + 'label': 'Hour', + 'advanced': True, + 'default': random.randint(0, 23), + 'type': 'string', + 'description': '*: Every hour, */8: Every 8 hours, 3: At 3, midnight.', + }, + { + 'name': 'cron_minute', + 'migrate_from': 'searcher', + 'label': 'Minute', + 'advanced': True, + 'default': random.randint(0, 59), + 'type': 'string', + 'description': "Just keep it random, so the providers don't get DDOSed by every CP user on a 'full' hour." + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/searcher/__init__.py b/couchpotato/core/media/movie/searcher/__init__.py deleted file mode 100644 index 4ae1ed3..0000000 --- a/couchpotato/core/media/movie/searcher/__init__.py +++ /dev/null @@ -1,74 +0,0 @@ -from .main import MovieSearcher -import random - - -def start(): - return MovieSearcher() - -config = [{ - 'name': 'moviesearcher', - 'order': 20, - 'groups': [ - { - 'tab': 'searcher', - 'name': 'movie_searcher', - 'label': 'Movie search', - 'description': 'Search options for movies', - 'advanced': True, - 'options': [ - { - 'name': 'always_search', - 'default': False, - 'migrate_from': 'searcher', - 'type': 'bool', - 'label': 'Always search', - 'description': 'Search for movies even before there is a ETA. Enabling this will probably get you a lot of fakes.', - }, - { - 'name': 'run_on_launch', - 'migrate_from': 'searcher', - 'label': 'Run on launch', - 'advanced': True, - 'default': 0, - 'type': 'bool', - 'description': 'Force run the searcher after (re)start.', - }, - { - 'name': 'search_on_add', - 'label': 'Search after add', - 'advanced': True, - 'default': 1, - 'type': 'bool', - 'description': 'Disable this to only search for movies on cron.', - }, - { - 'name': 'cron_day', - 'migrate_from': 'searcher', - 'label': 'Day', - 'advanced': True, - 'default': '*', - 'type': 'string', - 'description': '*: Every day, */2: Every 2 days, 1: Every first of the month. See APScheduler for details.', - }, - { - 'name': 'cron_hour', - 'migrate_from': 'searcher', - 'label': 'Hour', - 'advanced': True, - 'default': random.randint(0, 23), - 'type': 'string', - 'description': '*: Every hour, */8: Every 8 hours, 3: At 3, midnight.', - }, - { - 'name': 'cron_minute', - 'migrate_from': 'searcher', - 'label': 'Minute', - 'advanced': True, - 'default': random.randint(0, 59), - 'type': 'string', - 'description': "Just keep it random, so the providers don't get DDOSed by every CP user on a 'full' hour." - }, - ], - }, - ], -}]