From c2919a5896318c8874383aef40de9008f49d3d97 Mon Sep 17 00:00:00 2001 From: Vuolter Date: Wed, 15 May 2013 16:18:38 +0200 Subject: Added plugin SkipRev --- module/plugins/hooks/SkipRev.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 module/plugins/hooks/SkipRev.py (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py new file mode 100644 index 000000000..39cf8e548 --- /dev/null +++ b/module/plugins/hooks/SkipRev.py @@ -0,0 +1,41 @@ + # -*- coding: utf-8 -*- + +""" + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . + + @author: Walter Purcaro +""" + +from module.plugins.Hook import Hook + + +class SkipRev(Hook): + __name__ = "SkipRev" + __version__ = "0.01" + __description__ = "Skip download when filename has rev extension" + __config__ = [ + ("activated", "bool", "Activated", "False"), + ("number", "int", "Do not skip until rev part", "1") + ] + __author_name__ = ("Walter Purcaro") + __author_mail__ = ("vuolter@gmail.com") + + def downloadPreparing(self, pyfile): + name = basename(pyfile.name) + number = self.getConfig("number") + if name.find(".rev") != -1: + for i in range(1, number): + if name.find(i + ".rev") != -1: + return + pyfile.setStatus("skipped") -- cgit v1.2.3 From 35f0f402b60f18e2c32580151667cfc59bd8663f Mon Sep 17 00:00:00 2001 From: Vuolter Date: Wed, 15 May 2013 16:46:30 +0200 Subject: Version 0.02: log actions --- module/plugins/hooks/SkipRev.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index 39cf8e548..0ac8de412 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -22,7 +22,7 @@ from module.plugins.Hook import Hook class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.01" + __version__ = "0.02" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -32,10 +32,12 @@ class SkipRev(Hook): __author_mail__ = ("vuolter@gmail.com") def downloadPreparing(self, pyfile): + # self.logDebug("self.downloadPreparing") name = basename(pyfile.name) number = self.getConfig("number") if name.find(".rev") != -1: for i in range(1, number): if name.find(i + ".rev") != -1: return + self.logInfo("Skipping " + name) pyfile.setStatus("skipped") -- cgit v1.2.3 From d30434b88b3d13aef1ba8cf0f29385229c82c9ed Mon Sep 17 00:00:00 2001 From: Vuolter Date: Wed, 15 May 2013 20:57:04 +0200 Subject: Version 0.3: use endswith instead of find (thx stickell) --- module/plugins/hooks/SkipRev.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index 0ac8de412..ce57fe4b5 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -22,7 +22,7 @@ from module.plugins.Hook import Hook class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.02" + __version__ = "0.03" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -34,10 +34,10 @@ class SkipRev(Hook): def downloadPreparing(self, pyfile): # self.logDebug("self.downloadPreparing") name = basename(pyfile.name) - number = self.getConfig("number") - if name.find(".rev") != -1: - for i in range(1, number): - if name.find(i + ".rev") != -1: + max = self.getConfig("number") + if name.endswith(".rev"): + for n in range(1, max): + if name.endswith(n + ".rev"): return self.logInfo("Skipping " + name) pyfile.setStatus("skipped") -- cgit v1.2.3 From 4df433cfb18df8428a497e7e6a3f6a5ca8b1fb06 Mon Sep 17 00:00:00 2001 From: Vuolter Date: Fri, 17 May 2013 17:52:43 +0200 Subject: Version 0.04: forgot to import basename --- module/plugins/hooks/SkipRev.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index ce57fe4b5..4e839dc7a 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -18,11 +18,11 @@ """ from module.plugins.Hook import Hook - +from os.path import basename class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.03" + __version__ = "0.04" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), -- cgit v1.2.3 From f7e6bb7bc4fcb680aa61d68760ab5f5620552185 Mon Sep 17 00:00:00 2001 From: Vuolter Date: Fri, 17 May 2013 21:38:50 +0200 Subject: Version 0.05: several fixed according stickell advices --- module/plugins/hooks/SkipRev.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index 4e839dc7a..9e9f1af64 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -19,10 +19,12 @@ from module.plugins.Hook import Hook from os.path import basename +from re import group, search + class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.04" + __version__ = "0.05" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -34,10 +36,10 @@ class SkipRev(Hook): def downloadPreparing(self, pyfile): # self.logDebug("self.downloadPreparing") name = basename(pyfile.name) - max = self.getConfig("number") if name.endswith(".rev"): - for n in range(1, max): - if name.endswith(n + ".rev"): - return + number = self.getConfig("number") + part = search('(\.part(.+?)\.rev)*$', name).group(2) + if int(part) <= number: + return self.logInfo("Skipping " + name) pyfile.setStatus("skipped") -- cgit v1.2.3 From 2c8d1c3b562e43f02064c1c70ca763751ad38e64 Mon Sep 17 00:00:00 2001 From: Vuolter Date: Mon, 20 May 2013 23:57:14 +0200 Subject: Version 0.06: improved filename recognition (big thanks to stickell) --- module/plugins/hooks/SkipRev.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index 9e9f1af64..dccb153d8 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -19,12 +19,12 @@ from module.plugins.Hook import Hook from os.path import basename -from re import group, search +from re import search class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.05" + __version__ = "0.06" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -38,8 +38,8 @@ class SkipRev(Hook): name = basename(pyfile.name) if name.endswith(".rev"): number = self.getConfig("number") - part = search('(\.part(.+?)\.rev)*$', name).group(2) - if int(part) <= number: + part = search(r'\.part(\d+)\.rev$', name) + if not part or int(part.group(1)) <= number: return self.logInfo("Skipping " + name) pyfile.setStatus("skipped") -- cgit v1.2.3 From 001d008744577ae916f05194a48663a0931a1955 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 27 May 2013 16:14:40 +0200 Subject: Version 0.07: code cosmetics --- module/plugins/hooks/SkipRev.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'module/plugins/hooks/SkipRev.py') diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py index dccb153d8..561329122 100644 --- a/module/plugins/hooks/SkipRev.py +++ b/module/plugins/hooks/SkipRev.py @@ -24,7 +24,7 @@ from re import search class SkipRev(Hook): __name__ = "SkipRev" - __version__ = "0.06" + __version__ = "0.07" __description__ = "Skip download when filename has rev extension" __config__ = [ ("activated", "bool", "Activated", "False"), @@ -36,10 +36,11 @@ class SkipRev(Hook): def downloadPreparing(self, pyfile): # self.logDebug("self.downloadPreparing") name = basename(pyfile.name) - if name.endswith(".rev"): - number = self.getConfig("number") - part = search(r'\.part(\d+)\.rev$', name) - if not part or int(part.group(1)) <= number: - return - self.logInfo("Skipping " + name) - pyfile.setStatus("skipped") + if not name.endswith(".rev"): + return + number = self.getConfig("number") + part = search(r'\.part(\d+)\.rev$', name) + if not part or int(part.group(1)) <= number: + return + self.logInfo("Skipping " + name) + pyfile.setStatus("skipped") -- cgit v1.2.3