Provider structure

couchpotato/core/providers/base.py

@@ -47,10 +47,6 @@ class Provider(Plugin):
         return self.is_available[host]
 
 
-class MovieProvider(Provider):
-    type = 'movie'
-
-
 class YarrProvider(Provider):
 
     cat_ids = []
@@ -103,39 +99,3 @@ class YarrProvider(Provider):
 
     def found(self, new):
         log.info('Found: score(%(score)s): %(name)s' % new)
-
-
-class NZBProvider(YarrProvider):
-    type = 'nzb'
-
-    def __init__(self):
-        super(NZBProvider, self).__init__()
-
-        addEvent('provider.nzb.search', self.search)
-        addEvent('provider.yarr.search', self.search)
-
-        addEvent('provider.nzb.feed', self.feed)
-
-    def download(self, url = '', nzb_id = ''):
-        return self.urlopen(url)
-
-    def feed(self):
-        return []
-
-    def search(self, movie, quality):
-        return []
-
-    def calculateAge(self, unix):
-        return int(time.time() - unix) / 24 / 60 / 60
-
-
-class TorrentProvider(YarrProvider):
-    type = 'torrent'
-
-
-class SubtitleProvider(Provider):
-    type = 'subtitle'
-
-
-class TrailerProvider(Provider):
-    type = 'trailer'

couchpotato/core/providers/movie/base.py

@@ -0,0 +1,5 @@
+from couchpotato.core.providers.base import Provider
+
+
+class MovieProvider(Provider):
+    type = 'movie'

couchpotato/core/providers/movie/couchpotatoapi/main.py

@@ -3,7 +3,7 @@ from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.request import jsonified, getParams
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import MovieProvider
+from couchpotato.core.providers.movie.base import MovieProvider
 from couchpotato.core.settings.model import Movie
 from flask.helpers import json
 

couchpotato/core/providers/movie/imdb/main.py

@@ -1,6 +1,6 @@
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import MovieProvider
+from couchpotato.core.providers.movie.base import MovieProvider
 from imdb import IMDb
 
 log = CPLog(__name__)

couchpotato/core/providers/movie/themoviedb/main.py

@@ -2,7 +2,7 @@ from __future__ import with_statement
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import simplifyString, toUnicode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import MovieProvider
+from couchpotato.core.providers.movie.base import MovieProvider
 from libs.themoviedb import tmdb
 
 log = CPLog(__name__)

couchpotato/core/providers/nzb/base.py

@@ -0,0 +1,27 @@
+from couchpotato.core.event import addEvent
+from couchpotato.core.providers.base import YarrProvider
+import time
+
+
+class NZBProvider(YarrProvider):
+    type = 'nzb'
+
+    def __init__(self):
+        super(NZBProvider, self).__init__()
+
+        addEvent('nzb.search', self.search)
+        addEvent('yarr.search', self.search)
+
+        addEvent('nzb.feed', self.feed)
+
+    def download(self, url = '', nzb_id = ''):
+        return self.urlopen(url)
+
+    def feed(self):
+        return []
+
+    def search(self, movie, quality):
+        return []
+
+    def calculateAge(self, unix):
+        return int(time.time() - unix) / 24 / 60 / 60

couchpotato/core/providers/nzb/newzbin/main.py

@@ -1,7 +1,7 @@
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import NZBProvider
+from couchpotato.core.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
 from urllib import urlencode
 import time

couchpotato/core/providers/nzb/newznab/main.py

@@ -2,10 +2,9 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import NZBProvider
+from couchpotato.core.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
 from urllib import urlencode
-from urlparse import urlparse
 import time
 import xml.etree.ElementTree as XMLTree
 

couchpotato/core/providers/nzb/nzbindex/main.py

@@ -2,7 +2,7 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import NZBProvider
+from couchpotato.core.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
 from urllib import urlencode
 import time

couchpotato/core/providers/nzb/nzbmatrix/main.py

@@ -1,7 +1,7 @@
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import NZBProvider
+from couchpotato.core.providers.nzb.base import NZBProvider
 from couchpotato.environment import Env
 from dateutil.parser import parse
 from urllib import urlencode

couchpotato/core/providers/nzb/nzbs/main.py

@@ -2,7 +2,7 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import NZBProvider
+from couchpotato.core.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
 from urllib import urlencode
 import time

couchpotato/core/providers/subtitle/base.py

@@ -0,0 +1,5 @@
+from couchpotato.core.providers.base import Provider
+
+
+class SubtitleProvider(Provider):
+    type = 'subtitle'

couchpotato/core/providers/torrent/base.py

@@ -0,0 +1,5 @@
+from couchpotato.core.providers.base import YarrProvider
+
+
+class TorrentProvider(YarrProvider):
+    type = 'torrent'

couchpotato/core/providers/torrent/thepiratebay/main.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import TorrentProvider
+from couchpotato.core.providers.torrent.base import TorrentProvider
 
 log = CPLog(__name__)
 

couchpotato/core/providers/trailer/base.py

@@ -0,0 +1,5 @@
+from couchpotato.core.providers.base import Provider
+
+
+class TrailerProvider(Provider):
+    type = 'trailer'