dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into nosql

Browse Source
This commit is contained in:
Ruud
2014-03-04 20:34:32 +01:00
parent c1596f098c a5fa0681ed
commit 642b665418
9 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CouchPotato.py
View File

@@ -136,6 +136,7 @@ if __name__ == '__main__':
except socket.error as e:
# log when socket receives SIGINT, but continue.
# previous code would have skipped over other types of IO errors too.
nr, msg = e
if nr != 4:
try:
l.log.critical(traceback.format_exc())

2
couchpotato/core/downloaders/rtorrent/main.py
View File

@@ -88,7 +88,7 @@ class rTorrent(Downloader):
return False
def _update_provider_group(self, name, data):
def updateProviderGroup(self, name, data):
if data.get('seed_time'):
log.info('seeding time ignored, not supported')

2
couchpotato/core/media/movie/suggestion/static/suggest.js
View File

@@ -101,7 +101,7 @@ var SuggestList = new Class({
// Add rating
m.info_container.adopt(
m.rating = m.info.rating && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', {
m.rating = m.info.rating && m.info.rating.imdb && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', {
'text': parseFloat(m.info.rating.imdb[0]),
'title': parseInt(m.info.rating.imdb[1]) + ' votes'
}) : null,

2
couchpotato/core/plugins/quality/main.py
View File

@@ -302,6 +302,8 @@ class QualityPlugin(Plugin):
'Movie.Name.1999.DVD-Rip-Group': 'dvdrip',
'Movie.Name.1999.DVD-R-Group': 'dvdr',
'Movie.Name.Camelie.1999.720p.BluRay.x264-Group': '720p',
'Movie.Name.2008.German.DL.AC3.1080p.BluRay.x264-Group': '1080p',
'Movie.Name.2004.GERMAN.AC3D.DL.1080p.BluRay.x264-Group': '1080p',
}
correct = 0

2
couchpotato/core/providers/automation/goodfilms/main.py
View File

@@ -7,7 +7,7 @@ log = CPLog(__name__)
class Goodfilms(Automation):
url = 'http://goodfil.ms/%s/queue?page=%d&without_layout=1'
url = 'https://goodfil.ms/%s/queue?page=%d&without_layout=1'
interval = 1800

2
couchpotato/core/providers/automation/itunes/main.py
View File

@@ -22,7 +22,7 @@ class ITunes(Automation, RSS):
urls = splitString(self.conf('automation_urls'))
namespace = 'http://www.w3.org/2005/Atom'
namespace_im = 'http://itunes.apple.com/rss'
namespace_im = 'https://rss.itunes.apple.com'
index = -1
for url in urls:

2
couchpotato/core/providers/nzb/nzbclub/main.py
View File

@@ -13,7 +13,7 @@ log = CPLog(__name__)
class NZBClub(NZBProvider, RSS):
urls = {
'search': 'http://www.nzbclub.com/nzbfeeds.aspx?%s',
'search': 'https://www.nzbclub.com/nzbfeeds.aspx?%s',
}
http_time_between_calls = 4 #seconds

2
couchpotato/core/providers/torrent/sceneaccess/main.py
View File

@@ -15,7 +15,7 @@ class SceneAccess(TorrentProvider):
'login': 'https://www.sceneaccess.eu/login',
'login_check': 'https://www.sceneaccess.eu/inbox',
'detail': 'https://www.sceneaccess.eu/details?id=%s',
'search': 'https://www.sceneaccess.eu/browse?method=2&c%d=%d',
'search': 'https://www.sceneaccess.eu/browse?c%d=%d',
'download': 'https://www.sceneaccess.eu/%s',
}

2
couchpotato/core/providers/torrent/thepiratebay/main.py
View File

@@ -37,7 +37,7 @@ class ThePirateBay(TorrentMagnetProvider):
'http://nl.tpb.li',
'http://proxybay.eu',
'https://www.getpirate.com',
'http://pirateproxy.ca',
'http://piratebay.io',
]
def _searchOnTitle(self, title, movie, quality, results):