summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/crypter
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugin/crypter')
-rw-r--r--pyload/plugin/crypter/CloudzillaTo.py3
-rw-r--r--pyload/plugin/crypter/DailymotionComFolder.py5
-rw-r--r--pyload/plugin/crypter/DevhostSt.py5
-rw-r--r--pyload/plugin/crypter/FilecryptCc.py4
-rw-r--r--pyload/plugin/crypter/Go4UpCom.py11
-rw-r--r--pyload/plugin/crypter/MultiUpOrg.py4
-rw-r--r--pyload/plugin/crypter/TusfilesNet.py4
-rw-r--r--pyload/plugin/crypter/UploadedTo.py5
-rw-r--r--pyload/plugin/crypter/YoutubeComFolder.py5
9 files changed, 20 insertions, 26 deletions
diff --git a/pyload/plugin/crypter/CloudzillaTo.py b/pyload/plugin/crypter/CloudzillaTo.py
index 0990a1efd..7042f7750 100644
--- a/pyload/plugin/crypter/CloudzillaTo.py
+++ b/pyload/plugin/crypter/CloudzillaTo.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
diff --git a/pyload/plugin/crypter/DailymotionComFolder.py b/pyload/plugin/crypter/DailymotionComFolder.py
index fe173fe82..06834f9a5 100644
--- a/pyload/plugin/crypter/DailymotionComFolder.py
+++ b/pyload/plugin/crypter/DailymotionComFolder.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.utils import json_loads
from pyload.plugin.Crypter import Crypter
@@ -24,7 +23,7 @@ class DailymotionComFolder(Crypter):
def api_response(self, ref, req=None):
- url = urljoin("https://api.dailymotion.com/", ref)
+ url = urlparse.urljoin("https://api.dailymotion.com/", ref)
html = self.load(url, get=req)
return json_loads(html)
diff --git a/pyload/plugin/crypter/DevhostSt.py b/pyload/plugin/crypter/DevhostSt.py
index 46d33885f..7ede22106 100644
--- a/pyload/plugin/crypter/DevhostSt.py
+++ b/pyload/plugin/crypter/DevhostSt.py
@@ -4,8 +4,7 @@
# http://d-h.st/users/shine/?fld_id=37263#files
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
@@ -42,7 +41,7 @@ class DevhostSt(SimpleCrypter):
p = r'href="(.+?)">Back to \w+<'
m = re.search(p, self.html)
- html = self.load(urljoin("http://d-h.st", m.group(1)),
+ html = self.load(urlparse.urljoin("http://d-h.st", m.group(1)),
cookies=False)
p = '\?fld_id=%s.*?">(.+?)<' % self.info['pattern']['ID']
diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py
index 33862164a..db939357a 100644
--- a/pyload/plugin/crypter/FilecryptCc.py
+++ b/pyload/plugin/crypter/FilecryptCc.py
@@ -5,9 +5,9 @@
import binascii
import re
+import urlparse
from Crypto.Cipher import AES
-from urlparse import urljoin
from pyload.plugin.Crypter import Crypter
from pyload.plugin.captcha.ReCaptcha import ReCaptcha
@@ -91,7 +91,7 @@ class FilecryptCc(Crypter):
if m: #: normal captcha
self.logDebug("Captcha-URL: %s" % m.group(1))
- captcha_code = self.decryptCaptcha(urljoin(self.base_url, m.group(1)),
+ captcha_code = self.decryptCaptcha(urlparse.urljoin(self.base_url, m.group(1)),
forceUser=True,
imgtype="gif")
diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py
index d20233b99..eef9efddc 100644
--- a/pyload/plugin/crypter/Go4UpCom.py
+++ b/pyload/plugin/crypter/Go4UpCom.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
@@ -10,7 +9,7 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
class Go4UpCom(SimpleCrypter):
__name = "Go4UpCom"
__type = "crypter"
- __version = "0.11"
+ __version = "0.12"
__pattern = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
__config = [("use_premium" , "bool", "Use premium account if available" , True),
@@ -30,12 +29,12 @@ class Go4UpCom(SimpleCrypter):
OFFLINE_PATTERN = r'>\s*(404 Page Not Found|File not Found|Mirror does not exist)'
- def getLinks(self
+ def getLinks(self):
links = []
- m = re.search(r'(/download/gethosts/.+?)"')
+ m = re.search(r'(/download/gethosts/.+?)"', self.html)
if m:
- self.html = self.load(urljoin("http://go4up.com/", m.group(1)))
+ self.html = self.load(urlparse.urljoin("http://go4up.com/", m.group(1)))
pages = [self.load(url) for url in re.findall(self.LINK_PATTERN, self.html)]
else:
pages = [self.html]
diff --git a/pyload/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py
index 6d11c95d0..54d9a979d 100644
--- a/pyload/plugin/crypter/MultiUpOrg.py
+++ b/pyload/plugin/crypter/MultiUpOrg.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import re
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
@@ -33,7 +33,7 @@ class MultiUpOrg(SimpleCrypter):
pattern = r'style="width:97%;text-align:left".*\n.*href="(.*)"'
if m_type == "download":
dl_pattern = r'href="(.*)">.*\n.*<h5>DOWNLOAD</h5>'
- miror_page = urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1))
+ miror_page = urlparse.urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1))
self.html = self.load(miror_page)
return re.findall(pattern, self.html)
diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py
index 8bf7cbe21..23d305003 100644
--- a/pyload/plugin/crypter/TusfilesNet.py
+++ b/pyload/plugin/crypter/TusfilesNet.py
@@ -2,7 +2,7 @@
import math
import re
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.XFSCrypter import XFSCrypter
@@ -28,7 +28,7 @@ class TusfilesNet(XFSCrypter):
def loadPage(self, page_n):
- return self.load(urljoin(self.pyfile.url, str(page_n)), decode=True)
+ return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)), decode=True)
def handlePages(self, pyfile):
diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py
index 682bfde8a..895579a26 100644
--- a/pyload/plugin/crypter/UploadedTo.py
+++ b/pyload/plugin/crypter/UploadedTo.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
@@ -31,5 +30,5 @@ class UploadedTo(SimpleCrypter):
if m is None:
self.error(_("PLAIN_PATTERN not found"))
- plain_link = urljoin("http://uploaded.net/", m.group(1))
+ plain_link = urlparse.urljoin("http://uploaded.net/", m.group(1))
return self.load(plain_link).split('\n')[:-1]
diff --git a/pyload/plugin/crypter/YoutubeComFolder.py b/pyload/plugin/crypter/YoutubeComFolder.py
index 220c1dfbb..6873c9148 100644
--- a/pyload/plugin/crypter/YoutubeComFolder.py
+++ b/pyload/plugin/crypter/YoutubeComFolder.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import re
-
-from urlparse import urljoin
+import urlparse
from pyload.utils import json_loads
from pyload.plugin.Crypter import Crypter
@@ -31,7 +30,7 @@ class YoutubeComFolder(Crypter):
def api_response(self, ref, req):
req.update({"key": self.API_KEY})
- url = urljoin("https://www.googleapis.com/youtube/v3/", ref)
+ url = urlparse.urljoin("https://www.googleapis.com/youtube/v3/", ref)
html = self.load(url, get=req)
return json_loads(html)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 22:46:59 +0100