From a6e49098c8fcee78958c18bb3fa9daf4bed37ff2 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 20 Dec 2014 22:15:27 +0100 Subject: [PATCH 1/4] Add robots.txt --- couchpotato/__init__.py | 9 +++++++++ couchpotato/templates/login.html | 1 + 2 files changed, 10 insertions(+) diff --git a/couchpotato/__init__.py b/couchpotato/__init__.py index daa93bc..9df1612 100644 --- a/couchpotato/__init__.py +++ b/couchpotato/__init__.py @@ -40,6 +40,8 @@ class WebHandler(BaseHandler): return try: + if route == 'robots.txt': + self.set_header('Content-Type', 'text/plain') self.write(views[route]()) except: log.error("Failed doing web request '%s': %s", (route, traceback.format_exc())) @@ -60,6 +62,13 @@ def index(): addView('', index) +# Web view +def robots(): + return 'User-agent: * \n' \ + 'Disallow: /' +addView('robots.txt', robots) + + # API docs def apiDocs(): routes = list(api.keys()) diff --git a/couchpotato/templates/login.html b/couchpotato/templates/login.html index e33db2d..c30ab6b 100644 --- a/couchpotato/templates/login.html +++ b/couchpotato/templates/login.html @@ -6,6 +6,7 @@ + {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %} {% end %} From b0d1fe5c33bf098c1fd99546ed41576b29f0a0fb Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 20 Dec 2014 22:17:43 +0100 Subject: [PATCH 2/4] Return false if no media is found on try_next fix #4345 --- couchpotato/core/media/movie/searcher.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py index 11aa975..6d3ee83 100755 --- a/couchpotato/core/media/movie/searcher.py +++ b/couchpotato/core/media/movie/searcher.py @@ -394,8 +394,9 @@ class MovieSearcher(SearcherBase, MovieTypeBase): log.info('Trying next release for: %s', getTitle(media)) self.single(media, manual = manual, force_download = force_download) - return True - + return True + + return False except: log.error('Failed searching for next release: %s', traceback.format_exc()) return False From 4a6b45c65c60c9f1ec5300ec877dd621a9fc80c6 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 20 Dec 2014 22:24:00 +0100 Subject: [PATCH 3/4] SCC not finding seeders --- couchpotato/core/media/_base/providers/torrent/sceneaccess.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/couchpotato/core/media/_base/providers/torrent/sceneaccess.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py index e172f6a..17c9891 100644 --- a/couchpotato/core/media/_base/providers/torrent/sceneaccess.py +++ b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py @@ -42,6 +42,7 @@ class Base(TorrentProvider): link = result.find('td', attrs = {'class': 'ttr_name'}).find('a') url = result.find('td', attrs = {'class': 'td_dl'}).find('a') + seeders = result.find('td', attrs = {'class': 'ttr_seeders'}).find('a') leechers = result.find('td', attrs = {'class': 'ttr_leechers'}).find('a') torrent_id = link['href'].replace('details?id=', '') @@ -51,7 +52,7 @@ class Base(TorrentProvider): 'url': self.urls['download'] % url['href'], 'detail_url': self.urls['detail'] % torrent_id, 'size': self.parseSize(result.find('td', attrs = {'class': 'ttr_size'}).contents[0]), - 'seeders': tryInt(result.find('td', attrs = {'class': 'ttr_seeders'}).find('a').string), + 'seeders': tryInt(seeders.string) if seeders else 0, 'leechers': tryInt(leechers.string) if leechers else 0, 'get_more_info': self.getMoreInfo, }) From 6d5882001a96ede03b4dc66fb53a80258da5565f Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 20 Dec 2014 22:32:18 +0100 Subject: [PATCH 4/4] Notificaton.list not returning anything fix #4348 --- couchpotato/core/notifications/core/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/couchpotato/core/notifications/core/main.py b/couchpotato/core/notifications/core/main.py index fa8e9a7..4055c41 100644 --- a/couchpotato/core/notifications/core/main.py +++ b/couchpotato/core/notifications/core/main.py @@ -110,11 +110,11 @@ class CoreNotifier(Notification): if limit_offset: splt = splitString(limit_offset) - limit = splt[0] - offset = 0 if len(splt) is 1 else splt[1] - results = db.get_many('notification', limit = limit, offset = offset, with_doc = True) + limit = tryInt(splt[0]) + offset = tryInt(0 if len(splt) is 1 else splt[1]) + results = db.all('notification', limit = limit, offset = offset, with_doc = True) else: - results = db.get_many('notification', limit = 200, with_doc = True) + results = db.all('notification', limit = 200, with_doc = True) notifications = [] for n in results: