Using SimpleCrypter to avoid repeating getPackageNameAndFolder.

+ licenses
+ cosmetics

4 files changed, 55 insertions, 31 deletions

diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py
index 07de5e008..bcb1d7494 100644
--- a/module/plugins/crypter/GooGl.py
+++ b/module/plugins/crypter/GooGl.py
@@ -1,5 +1,20 @@
 # -*- coding: utf-8 -*-
 
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
 from module.plugins.Crypter import Crypter
 from module.common.json_layer import json_loads
 
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index 956727d87..c5c602c27 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -2,18 +2,20 @@
 
 import re
 
-from module.plugins.Crypter import Crypter
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 
-class NetfolderIn(Crypter):
+class NetfolderIn(SimpleCrypter):
     __name__ = "NetfolderIn"
     __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))"
-    __version__ = "0.5"
+    __version__ = "0.6"
     __description__ = """NetFolder Crypter Plugin"""
     __author_name__ = ("RaNaN", "fragonib")
     __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es")
 
+    TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>'
+
     def decrypt(self, pyfile):
         # Request package
         self.html = self.load(pyfile.url)
@@ -63,19 +65,6 @@ class NetfolderIn(Crypter):
 
         return html
 
-    def getPackageNameAndFolder(self):
-        title_re = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>'
-        m = re.search(title_re, self.html)
-        if m is not None:
-            name = folder = m.group('title').strip()
-            self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
-            return name, folder
-        else:
-            name = self.pyfile.package().name
-            folder = self.pyfile.package().folder
-            self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
-            return name, folder
-
     def getLinks(self):
         links = re.search(r'name="list" value="(.*?)"', self.html).group(1).split(",")
         self.logDebug("Package has %d links" % len(links))
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py
index 5b350787f..f85ede6f3 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrgFolder.py
@@ -1,5 +1,20 @@
 # -*- coding: utf-8 -*-
 
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
 from module.plugins.internal.SimpleCrypter import SimpleCrypter
 
 class SpeedLoadOrgFolder(SimpleCrypter):
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index d4534297e..7fe4de688 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -1,13 +1,30 @@
 # -*- coding: utf-8 -*-

 

-from module.plugins.Crypter import Crypter

+############################################################################

+# This program is free software: you can redistribute it and/or modify     #

+# it under the terms of the GNU Affero 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 Affero General Public License for more details.                      #

+#                                                                          #

+# You should have received a copy of the GNU Affero General Public License #

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #

+############################################################################

+

 import re

 

-class UploadedToFolder(Crypter):

+from module.plugins.internal.SimpleCrypter import SimpleCrypter

+

+

+class UploadedToFolder(SimpleCrypter):

     __name__ = "UploadedToFolder"

     __type__ = "crypter"

     __pattern__ = r"http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|list)/(?P<id>\w+)"

-    __version__ = "0.1"

+    __version__ = "0.2"

     __description__ = """UploadedTo Crypter Plugin"""

     __author_name__ = ("stickell")

     __author_mail__ = ("l.stickell@yahoo.it")

@@ -31,15 +48,3 @@ class UploadedToFolder(Crypter):
         self.logDebug('Package has %d links' % len(package_links))

 

         self.packages = [(package_name, package_links, folder_name)]

-

-    def getPackageNameAndFolder(self):

-        m = re.search(self.TITLE_PATTERN, self.html)

-        if m:

-            name = folder = m.group('title')

-            self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))

-            return name, folder

-        else:

-            name = self.pyfile.package().name

-            folder = self.pyfile.package().folder

-            self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))

-            return name, folder