Import fixes

couchpotato/core/downloaders/base.py

@@ -3,9 +3,9 @@ from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import mergeDicts
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import Provider
 import random
 import re
+from couchpotato.core.media._base.providers.base import Provider
 
 log = CPLog(__name__)
 

couchpotato/core/downloaders/blackhole.py

@@ -1,6 +1,7 @@
 from __future__ import with_statement
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import sp
+from couchpotato.core.helpers.variable import getDownloadDir
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
 import os

couchpotato/core/downloaders/rtorrent.py

@@ -1,5 +1,5 @@
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import cleanHost, splitString
 from couchpotato.core.logger import CPLog

couchpotato/core/media/movie/providers/nzb/binsearch.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.binsearch.main import Base
+from couchpotato.core.media._base.providers.nzb.binsearch import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 from couchpotato.environment import Env
 

couchpotato/core/media/movie/providers/nzb/newznab.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.newznab.main import Base
+from couchpotato.core.media._base.providers.nzb.newznab import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/nzb/nzbclub.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.nzb.nzbclub.main import Base
+from couchpotato.core.media._base.providers.nzb.nzbclub import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/nzb/nzbindex.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.nzb.nzbindex.main import Base
+from couchpotato.core.media._base.providers.nzb.nzbindex import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 from couchpotato.environment import Env
 

couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.omgwtfnzbs.main import Base
+from couchpotato.core.media._base.providers.nzb.omgwtfnzbs import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/awesomehd.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.awesomehd.main import Base
+from couchpotato.core.media._base.providers.torrent.awesomehd import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/bithdtv.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.bithdtv.main import Base
+from couchpotato.core.media._base.providers.torrent.bithdtv import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/bitsoup.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.bitsoup.main import Base
+from couchpotato.core.media._base.providers.torrent.bitsoup import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/hdbits.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.hdbits.main import Base
+from couchpotato.core.media._base.providers.torrent.hdbits import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/ilovetorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.ilovetorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.ilovetorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/iptorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.iptorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.iptorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/kickasstorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.kickasstorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.kickasstorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/passthepopcorn.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.passthepopcorn.main import Base
+from couchpotato.core.media._base.providers.torrent.passthepopcorn import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/publichd.py

@@ -1,6 +1,6 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.publichd.main import Base
+from couchpotato.core.media._base.providers.torrent.publichd import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/sceneaccess.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.sceneaccess.main import Base
+from couchpotato.core.media._base.providers.torrent.sceneaccess import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/thepiratebay.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.thepiratebay.main import Base
+from couchpotato.core.media._base.providers.torrent.thepiratebay import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentbytes.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentbytes.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentbytes import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentday.py

@@ -1,6 +1,6 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.torrentday.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentday import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentleech.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentleech.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentleech import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentpotato.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentpotato.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentpotato import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentshack.py

@@ -1,7 +1,7 @@
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentshack.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentshack import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/yify.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.yify.main import Base
+from couchpotato.core.media._base.providers.torrent.yify import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)