From 10ed9dbcee2c996dd348db4ad57d824c9d454005 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 30 May 2015 03:55:01 +0200
Subject: [Dereferer][SimpleDereferer] Update

---
 module/plugins/internal/SimpleDereferer.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal/SimpleDereferer.py')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 1f04ab1c6..2e7e08321 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urllib
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import create_getInfo, set_cookies
@@ -11,7 +10,7 @@ from module.utils import html_unescape
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
     __pattern__ = r'^unmatchable$'
     __config__  = []  #@TODO: Remove in 0.4.10
@@ -37,6 +36,8 @@ class SimpleDereferer(Crypter):
     You can override the getLinks method if you need a more sophisticated way to extract the redirect url.
     """
 
+    URL_REPLACEMENTS = []
+
     LINK_PATTERN = None
 
     TEXT_ENCODING = False
@@ -50,18 +51,15 @@ class SimpleDereferer(Crypter):
 
 
     def decrypt(self, pyfile):
+        self.prepare()
+
         self.handleDirect(pyfile)
 
         if not self.link:
-            try:
-                self.link = urllib.unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
-
-            except AttributeError:
-                self.prepare()
-                self.preload()
-                self.checkStatus()
+            self.preload()
+            self.checkStatus()
 
-                self.link = self.getLink()
+            self.link = self.getLink()
 
         if self.link:
             self.urls = [self.link]
@@ -80,6 +78,8 @@ class SimpleDereferer(Crypter):
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
 
+        self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
+
 
     def preload(self):
         self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
@@ -97,5 +97,11 @@ class SimpleDereferer(Crypter):
 
 
     def getLink(self):
-        link = re.search(self.LINK_PATTERN, self.html).group(1)
-        return html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
+        try:
+            link = re.search(self.LINK_PATTERN, self.html).group(1)
+
+        except Exception, e:
+            self.logWarning(e)
+
+        else:
+            return html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
-- 
cgit v1.2.3


From fcdc1f730118050e390ad2d9fa337ce62809d9a6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 30 May 2015 15:54:38 +0200
Subject: [SimpleCrypter] Merge with SimpleDereferer

---
 module/plugins/internal/SimpleDereferer.py | 107 -----------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 module/plugins/internal/SimpleDereferer.py

(limited to 'module/plugins/internal/SimpleDereferer.py')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
deleted file mode 100644
index 2e7e08321..000000000
--- a/module/plugins/internal/SimpleDereferer.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import create_getInfo, set_cookies
-from module.utils import html_unescape
-
-
-class SimpleDereferer(Crypter):
-    __name__    = "SimpleDereferer"
-    __type__    = "crypter"
-    __version__ = "0.14"
-
-    __pattern__ = r'^unmatchable$'
-    __config__  = []  #@TODO: Remove in 0.4.10
-
-    __description__ = """Simple dereferer plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    """
-    Following patterns should be defined by each crypter:
-
-      LINK_PATTERN: Regex to catch the redirect url in group(1)
-        example: LINK_PATTERN = r'<div class="link"><a href="(.+?)"'
-
-      OFFLINE_PATTERN: (optional) Checks if the page is unreachable
-        example: OFFLINE_PATTERN = r'File (deleted|not found)'
-
-      TEMP_OFFLINE_PATTERN: (optional) Checks if the page is temporarily unreachable
-        example: TEMP_OFFLINE_PATTERN = r'Server maintainance'
-
-
-    You can override the getLinks method if you need a more sophisticated way to extract the redirect url.
-    """
-
-    URL_REPLACEMENTS = []
-
-    LINK_PATTERN = None
-
-    TEXT_ENCODING = False
-    COOKIES       = True
-
-
-    def handleDirect(self, pyfile):
-        header = self.load(pyfile.url, just_header=True, decode=True)
-        if 'location' in header and header['location']:
-            self.link = header['location']
-
-
-    def decrypt(self, pyfile):
-        self.prepare()
-
-        self.handleDirect(pyfile)
-
-        if not self.link:
-            self.preload()
-            self.checkStatus()
-
-            self.link = self.getLink()
-
-        if self.link:
-            self.urls = [self.link]
-
-        elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
-            self.fail(_("No link grabbed"))
-
-
-    def prepare(self):
-        self.info = {}
-        self.html = ""
-        self.link = ""  #@TODO: Move to hoster class in 0.4.10
-
-        self.req.setOption("timeout", 120)
-
-        if isinstance(self.COOKIES, list):
-            set_cookies(self.req.cj, self.COOKIES)
-
-        self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
-
-
-    def preload(self):
-        self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
-
-        if isinstance(self.TEXT_ENCODING, basestring):
-            self.html = unicode(self.html, self.TEXT_ENCODING)
-
-
-    def checkStatus(self):
-        if hasattr(self, "OFFLINE_PATTERN") and re.search(self.OFFLINE_PATTERN, self.html):
-            self.offline()
-
-        elif hasattr(self, "TEMP_OFFLINE_PATTERN") and re.search(self.TEMP_OFFLINE_PATTERN, self.html):
-            self.tempOffline()
-
-
-    def getLink(self):
-        try:
-            link = re.search(self.LINK_PATTERN, self.html).group(1)
-
-        except Exception, e:
-            self.logWarning(e)
-
-        else:
-            return html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
-- 
cgit v1.2.3