Browse Source

Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

pull/3771/head
Ruud 11 years ago
parent
commit
7984ee9fcf
  1. 1
      couchpotato/core/downloaders/transmission.py
  2. 2
      couchpotato/core/media/movie/providers/torrent/torrentleech.py

1
couchpotato/core/downloaders/transmission.py

@ -31,6 +31,7 @@ class Transmission(DownloaderBase):
return False return False
self.trpc = TransmissionRPC(host[0], port = host[1], rpc_url = self.conf('rpc_url').strip('/ '), username = self.conf('username'), password = self.conf('password')) self.trpc = TransmissionRPC(host[0], port = host[1], rpc_url = self.conf('rpc_url').strip('/ '), username = self.conf('username'), password = self.conf('password'))
return self.trpc
def download(self, data = None, media = None, filedata = None): def download(self, data = None, media = None, filedata = None):
if not media: media = {} if not media: media = {}

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

@ -11,7 +11,7 @@ autoload = 'TorrentLeech'
class TorrentLeech(MovieProvider, Base): class TorrentLeech(MovieProvider, Base):
cat_ids = [ cat_ids = [
([13], ['720p', '1080p']), ([13], ['720p', '1080p', 'bd50']),
([8], ['cam']), ([8], ['cam']),
([9], ['ts', 'tc']), ([9], ['ts', 'tc']),
([10], ['r5', 'scr']), ([10], ['r5', 'scr']),

Loading…
Cancel
Save