Merge branch 'develop'

couchpotato/core/downloaders/utorrent.py

@@ -176,7 +176,7 @@ class uTorrent(DownloaderBase):
                 status = 'busy'
                 if (torrent[1] & self.status_flags['STARTED'] or torrent[1] & self.status_flags['QUEUED']) and torrent[4] == 1000:
                     status = 'seeding'
-                elif torrent[1] & self.status_flags['ERROR']:
+                elif torrent[1] & self.status_flags['ERROR'] and 'There is not enough space on the disk' not in torrent[21]:
                     status = 'failed'
                 elif torrent[4] == 1000:
                     status = 'completed'

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

@@ -9,12 +9,12 @@ log = CPLog(__name__)
 class Base(TorrentProvider):
 
     urls = {
-        'test': 'https://classic.torrentday.com/',
-        'login': 'https://classic.torrentday.com/torrents/',
-        'login_check': 'https://classic.torrentday.com/userdetails.php',
-        'detail': 'https://classic.torrentday.com/details.php?id=%s',
-        'search': 'https://classic.torrentday.com/V3/API/API.php',
-        'download': 'https://classic.torrentday.com/download.php/%s/%s',
+        'test': 'https://www.torrentday.com/',
+        'login': 'https://www.torrentday.com/torrents/',
+        'login_check': 'https://www.torrentday.com/userdetails.php',
+        'detail': 'https://www.torrentday.com/details.php?id=%s',
+        'search': 'https://www.torrentday.com/V3/API/API.php',
+        'download': 'https://www.torrentday.com/download.php/%s/%s',
     }
 
     http_time_between_calls = 1  # Seconds
@@ -86,7 +86,7 @@ config = [{
             'tab': 'searcher',
             'list': 'torrent_providers',
             'name': 'TorrentDay',
-            'description': '<a href="https://classic.torrentday.com/" target="_blank">TorrentDay</a>',
+            'description': '<a href="https://www.torrentday.com/" target="_blank">TorrentDay</a>',
             'wizard': True,
             'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC5ElEQVQ4y12TXUgUURTH//fO7Di7foeQJH6gEEEIZZllVohfSG/6UA+RSFAQQj74VA8+Bj30lmAlRVSEvZRfhNhaka5ZUG1paKaW39tq5O6Ou+PM3M4o6m6X+XPPzD3zm/+dcy574r515WfIW8CZBM4YAA5Gc/aQC3yd7oXYEONcsISE5dTDh91HS0t7FEWhBUAeN9ynV/d9qJAgE4AECURAcVsGlCCnly26LMA0IQwTa52dje3d3e3hcPi8qqrrMjcVYI3EHCQZlkFOHBwR2QHh2ASAAIJxWGAQEDxjePhs3527XjJwnb37OHBq0T+Tyyjh+9KnEzNJ7nouc1Q/3A3HGsOvnJy+PSUlj81w2Lny9WuJ6+3AmTjD4HOcrdR2dWXLRQePvyaSLfQOPMPC8mC9iHCsOxSyzJCelzdSXlNzD5ujpb25Wbfc/XXJemTXF4+nnCNq+AMLe50uFfEJTiw4GXSFtiHL0SnIq66+p0kSArqO+eH3RdsAv9+f5vW7L7GICq6rmM8XBCAXlBw90rOyxibn5yzfkg/L09M52/jxqdESaIrBXHYZZbB1GX8cEpySxKIB8S5XcOnvqpli1zuwmrTtoLjw5LOK/eeuWsE4JH5IRPaPZKiKigmPp+5pa+u1aEjIMhEgrRkmi9mgxGUhM7LNJSzOzsE3+cOeExovXOjdytE0LV4zqNZUtV0uZzAGoGkhDH/2YHZiErmv4uyWQnZZWc+hoqL3WzlTExN5hhA8IEwkZWZOxwB++30YG/9GkYCPvqAaHAW5uWPROW86OmqCprUR7z1yZDAGQNuCvkoB/baIKUBWMTYymv+gra3eJNvjXu+B562tFyXqTJ6YuHK8rKwvBmC3vR7cOCPQLWFz8LnfXWUrJo9U19BwMyUlJRjTSMJ2ENxUiGxq9KXQfwqYlnWstvbR5aamG9g0uzM8Q4OFt++3NNixQ2NgYmeN03FOTUv7XVpV9aKisvLl1vN/WVhNc/Fi1NEAAAAASUVORK5CYII=',
             'options': [

couchpotato/core/media/movie/providers/automation/kinepolis.py

@@ -1,54 +0,0 @@
-import datetime
-
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.movie.providers.automation.base import Automation
-
-
-log = CPLog(__name__)
-
-autoload = 'Kinepolis'
-
-
-class Kinepolis(Automation, RSS):
-
-    interval = 1800
-    rss_url = 'http://kinepolis.be/nl/top10-box-office/feed'
-
-    def getIMDBids(self):
-
-        movies = []
-
-        rss_movies = self.getRSSData(self.rss_url)
-
-        for movie in rss_movies:
-            name = self.getTextElement(movie, 'title')
-            year = datetime.datetime.now().strftime('%Y')
-
-            imdb = self.search(name, year)
-
-            if imdb and self.isMinimalMovie(imdb):
-                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',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/media/movie/providers/automation/moviemeter.py

@@ -1,48 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.movie.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-autoload = 'Moviemeter'
-
-
-class Moviemeter(Automation, RSS):
-
-    interval = 1800
-    rss_url = 'http://www.moviemeter.nl/rss/cinema'
-
-    def getIMDBids(self):
-
-        movies = []
-
-        rss_movies = self.getRSSData(self.rss_url)
-
-        for movie in rss_movies:
-            imdb = self.search(self.getTextElement(movie, 'title'))
-
-            if imdb and self.isMinimalMovie(imdb):
-                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',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/media/movie/providers/automation/movies_io.py

@@ -1,72 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt, splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.movie.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-autoload = 'MoviesIO'
-
-
-class MoviesIO(Automation, RSS):
-
-    interval = 1800
-
-    def getIMDBids(self):
-
-        movies = []
-
-        enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
-
-        index = -1
-        for rss_url in splitString(self.conf('automation_urls')):
-
-            index += 1
-            if not enablers[index]:
-                continue
-
-            rss_movies = self.getRSSData(rss_url, headers = {'Referer': ''})
-
-            for movie in rss_movies:
-
-                nameyear = fireEvent('scanner.name_year', self.getTextElement(movie, 'title'), single = True)
-                imdb = self.search(nameyear.get('name'), nameyear.get('year'), imdb_only = True)
-
-                if not imdb:
-                    continue
-
-                movies.append(imdb)
-
-        return movies
-
-
-config = [{
-    'name': 'moviesio',
-    'groups': [
-        {
-            'tab': 'automation',
-            'list': 'watchlist_providers',
-            'name': 'moviesio',
-            'label': 'Movies.IO',
-            'description': 'Imports movies from <a href="http://movies.io" target="_blank">Movies.io</a> 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'],
-                },
-            ],
-        },
-    ],
-}]