From a3b46aeda7263722b5541edd6175155c4e3dafe6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 14 Jun 2015 10:05:24 +0200
Subject: [PastebinCom] Update

---
 module/plugins/crypter/PastebinCom.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'module/plugins')

diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py
index 751b47cc9..af039a6ab 100644
--- a/module/plugins/crypter/PastebinCom.py
+++ b/module/plugins/crypter/PastebinCom.py
@@ -6,9 +6,9 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class PastebinCom(SimpleCrypter):
     __name__    = "PastebinCom"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
+    __pattern__ = r'https://(?:www\.)?pastebin\.com/(.+i=)?(?P<ID>\w{8})'
     __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
                    ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
@@ -18,8 +18,10 @@ class PastebinCom(SimpleCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
-    NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)">'
+    URL_REPLACEMENTS = [(__pattern__ + '.*', r'http://www.pastebin.com/\g<ID>')]
+
+    NAME_PATTERN = r'<div class="paste_box_line1" title="(?P<N>.+?)"'
+    LINK_PATTERN = r'<div class="de\d+">(.+?)<'
 
 
 getInfo = create_getInfo(PastebinCom)
-- 
cgit v1.2.3