Merge pull request #1 from pyload/stable

Merge

1 files changed, 16 insertions, 11 deletions

diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py
index 529ec6918..133e5a005 100644
--- a/module/plugins/crypter/ChipDe.py
+++ b/module/plugins/crypter/ChipDe.py
@@ -5,20 +5,25 @@ from module.plugins.Crypter import Crypter
 
 
 class ChipDe(Crypter):
-    __name__ = "ChipDe"
-    __type__ = "crypter"
-    __pattern__ = r'http://(?:www\.)?chip.de/video/.*\.html'
-    __version__ = "0.1"
+    __name__    = "ChipDe"
+    __type__    = "crypter"
+    __version__ = "0.10"
+
+    __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
+                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+
     __description__ = """Chip.de decrypter plugin"""
-    __author_name__ = "4Christopher"
-    __author_mail__ = "4Christopher@gmx.de"
+    __license__     = "GPLv3"
+    __authors__     = [("4Christopher", "4Christopher@gmx.de")]
+
 
     def decrypt(self, pyfile):
         self.html = self.load(pyfile.url)
         try:
-            url = re.search(r'"(http://video.chip.de/\d+?/.*)"', self.html).group(1)
-            self.logDebug('The file URL is %s' % url)
+            f = re.search(r'"(http://video\.chip\.de/.+)"', self.html)
         except:
-            self.fail('Failed to find the URL')
-
-        self.packages.append((pyfile.package().name, [url], pyfile.package().folder))
+            self.fail(_("Failed to find the URL"))
+        else:
+            self.urls = [f.group(1)]
+            self.logDebug("The file URL is %s" % self.urls[0])