From cd1dc39ef23d41cb018899c30f681b7f0dbbad22 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 27 Jul 2014 21:14:31 +0200 Subject: [PATCH 01/10] Add bd50 torrentleech --- couchpotato/core/media/movie/providers/torrent/torrentleech.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentleech.py b/couchpotato/core/media/movie/providers/torrent/torrentleech.py index 191ceba8..d72f4257 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentleech.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentleech.py @@ -11,7 +11,7 @@ autoload = 'TorrentLeech' class TorrentLeech(MovieProvider, Base): cat_ids = [ - ([13], ['720p', '1080p']), + ([13], ['720p', '1080p', 'bd50']), ([8], ['cam']), ([9], ['ts', 'tc']), ([10], ['r5', 'scr']), From 7b6fa4f0e54cd0be7d818338b926e9329d0bf1d4 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 27 Jul 2014 21:28:06 +0200 Subject: [PATCH 02/10] Transmission failed to download --- couchpotato/core/downloaders/transmission.py | 1 + 1 file changed, 1 insertion(+) diff --git a/couchpotato/core/downloaders/transmission.py b/couchpotato/core/downloaders/transmission.py index 53ca9b8d..409efaa0 100644 --- a/couchpotato/core/downloaders/transmission.py +++ b/couchpotato/core/downloaders/transmission.py @@ -31,6 +31,7 @@ class Transmission(DownloaderBase): 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')) + return self.trpc def download(self, data = None, media = None, filedata = None): if not media: media = {} From 456563eab01447f31271db81b4951f767315ff25 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 28 Jul 2014 16:01:16 +0200 Subject: [PATCH 03/10] Update log post text --- couchpotato/core/plugins/log/static/log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index 11acb5ca..fcb7ed59 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -241,7 +241,7 @@ Running on: ...\n\ 'href': 'https://github.com/RuudBurger/CouchPotatoServer/blob/develop/contributing.md' }), new Element('span', { - 'text': ' before posting, then copy the text below' + 'text': ' before posting (I\'ll close if you don\'t), then copy the text below.' }) ), textarea = new Element('textarea', { From 69e3e36fae5071de3e88a3c53ef5123f90865273 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 28 Jul 2014 16:01:27 +0200 Subject: [PATCH 04/10] Update contribute --- contributing.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contributing.md b/contributing.md index 821212c8..e95337d9 100644 --- a/contributing.md +++ b/contributing.md @@ -13,6 +13,8 @@ Lastly, for anything related to CouchPotato, feel free to stop by the [forum](ht ## Issues Issues are intended for reporting bugs and weird behaviour or suggesting improvements to CouchPotatoServer. Before you submit an issue, please go through the following checklist: + * FILL IN ALL THE FIELDS ASKED FOR, if you don't tell why you didn't or isn't relevant + * POST MORE THAN A SINGLE LINE, if you do, you'd better have a easy reproducable bug * Search through existing issues (*including closed issues!*) first: you might be able to get your answer there. * Double check your issue manually, because it could be an external issue. * Post logs with your issue: Without seeing what is going on, the developers can't reproduce the error. @@ -25,12 +27,14 @@ Before you submit an issue, please go through the following checklist: * What hardware / OS are you using and what are its limitations? For example: NAS can be slow and maybe have a different version of python installed than when you use CP on OS X or Windows. * Your issue might be marked with the "can't reproduce" tag. Don't ask why your issue was closed if it says so in the tag. * If you're running on a NAS (QNAP, Austor, Synology etc.) with pre-made packages, make sure these are set up to use our source repository (RuudBurger/CouchPotatoServer) and nothing else! + * Do not "bump" issues with "Any updates on this" or whatever. Yes I've seen it, you don't have to remind me of it. There will be an update when the code is done or I need information. If you feel the need to do so, you'd better have more info on the issue. The more relevant information you provide, the more likely that your issue will be resolved. +If you don't follow any of the checks above, I'll close the issue. If you are wondering why (and ask) I'll block you from posting new issues and the repo. ## Pull Requests Pull requests are intended for contributing code or documentation to the project. Before you submit a pull request, consider the following: * Make sure your pull request is made for the *develop* branch (or relevant feature branch). * Have you tested your PR? If not, why? - * Does your PR have any limitations we should know of? + * Does your PR have any limitations I should know of? * Is your PR up-to-date with the branch you're trying to push into? From bed94586041aac7c2fb0094e86f6341c96ae272d Mon Sep 17 00:00:00 2001 From: Ruud Burger Date: Mon, 28 Jul 2014 16:06:38 +0200 Subject: [PATCH 05/10] Update contributing.md --- contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing.md b/contributing.md index e95337d9..3bd42c00 100644 --- a/contributing.md +++ b/contributing.md @@ -13,8 +13,8 @@ Lastly, for anything related to CouchPotato, feel free to stop by the [forum](ht ## Issues Issues are intended for reporting bugs and weird behaviour or suggesting improvements to CouchPotatoServer. Before you submit an issue, please go through the following checklist: - * FILL IN ALL THE FIELDS ASKED FOR, if you don't tell why you didn't or isn't relevant - * POST MORE THAN A SINGLE LINE, if you do, you'd better have a easy reproducable bug + * **FILL IN ALL THE FIELDS ASKED FOR** + * **POST MORE THAN A SINGLE LINE LOG**, if you do, you'd better have a easy reproducable bug * Search through existing issues (*including closed issues!*) first: you might be able to get your answer there. * Double check your issue manually, because it could be an external issue. * Post logs with your issue: Without seeing what is going on, the developers can't reproduce the error. From e749d132cda342533c69a02ea648788cece5e752 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 28 Jul 2014 16:12:54 +0200 Subject: [PATCH 06/10] Better message --- couchpotato/core/plugins/log/static/log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index fcb7ed59..6cb683bc 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -241,7 +241,7 @@ Running on: ...\n\ 'href': 'https://github.com/RuudBurger/CouchPotatoServer/blob/develop/contributing.md' }), new Element('span', { - 'text': ' before posting (I\'ll close if you don\'t), then copy the text below.' + 'text': ' before posting (kittens die if you don\'t), then copy the text below.' }) ), textarea = new Element('textarea', { From 9fb348f3a4f9e360c5addbe958b6c9d7e5d0dea4 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 1 Aug 2014 13:21:15 +0200 Subject: [PATCH 07/10] Don't try to ignore None release --- couchpotato/core/plugins/release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 7b47aa96..9def40d4 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -234,8 +234,9 @@ class Release(Plugin): db = get_db() try: - rel = db.get('id', id, with_doc = True) - self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored') + if id: + rel = db.get('id', id, with_doc = True) + self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored') return { 'success': True From 9f12fe263616319e1bd946e082d969f552cd9eee Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 1 Aug 2014 13:23:00 +0200 Subject: [PATCH 08/10] Add edge meta for IE fix #3727 --- couchpotato/templates/index.html | 2 +- couchpotato/templates/login.html | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/couchpotato/templates/index.html b/couchpotato/templates/index.html index 0d8acbc1..729f1e3d 100644 --- a/couchpotato/templates/index.html +++ b/couchpotato/templates/index.html @@ -5,7 +5,7 @@ - + {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %} {% end %} diff --git a/couchpotato/templates/login.html b/couchpotato/templates/login.html index 35626221..e33db2d7 100644 --- a/couchpotato/templates/login.html +++ b/couchpotato/templates/login.html @@ -4,22 +4,24 @@ + + {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %} {% end %} - + {% for url in fireEvent('clientscript.get_scripts', as_html = True, location = 'front', single = True) %} {% end %} - + CouchPotato @@ -35,4 +37,4 @@ - \ No newline at end of file + From 4126007cac7ab518e22adfefb1f908b35ab1f1f3 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 1 Aug 2014 13:29:39 +0200 Subject: [PATCH 09/10] Don't download 0 seed torrents fix #3728 --- couchpotato/core/plugins/release/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 9def40d4..b1ecafd8 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -365,7 +365,7 @@ class Release(Plugin): let_through = False filtered_results = [] - # If a single release comes through the "wait for", let through all + # Filter out ignored and other releases we don't want for rel in results: if rel['status'] in ['ignored', 'failed']: @@ -380,6 +380,11 @@ class Release(Plugin): log.info('Ignored, size "%sMB" to low: %s', (rel['size'], rel['name'])) continue + if 'seeders' in rel and rel.get('seeders') <= 0: + log.info('Ignored, no seeders: %s', (rel['name'])) + continue + + # If a single release comes through the "wait for", let through all rel['wait_for'] = False if quality_custom.get('index') != 0 and quality_custom.get('wait_for', 0) > 0 and rel.get('age') <= quality_custom.get('wait_for', 0): rel['wait_for'] = True From accf19bb26e4ab8758727232a1547df07bf5cfb3 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 1 Aug 2014 13:33:59 +0200 Subject: [PATCH 10/10] Different log level --- couchpotato/core/plugins/base.py | 2 +- couchpotato/core/plugins/renamer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py index bc66123f..2c7f9e13 100644 --- a/couchpotato/core/plugins/base.py +++ b/couchpotato/core/plugins/base.py @@ -157,7 +157,7 @@ class Plugin(object): os.rmdir(full_path) except: if show_error: - log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc())) + log.info2('Couldn\'t remove directory %s: %s', (full_path, traceback.format_exc())) try: os.rmdir(folder) diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py index 9f6792ab..ad72086e 100644 --- a/couchpotato/core/plugins/renamer.py +++ b/couchpotato/core/plugins/renamer.py @@ -807,7 +807,7 @@ Remove it if you want it to be renamed (again, or at least let it try again) if os.name == 'nt' and self.conf('ntfs_permission'): os.popen('icacls "' + dest + '"* /reset /T') except: - log.error('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1))) + log.debug('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1))) except: log.error('Couldn\'t move file "%s" to "%s": %s', (old, dest, traceback.format_exc())) raise