summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/hooks/EasybytezCom.py5
-rw-r--r--module/plugins/hooks/MultishareCz.py5
-rw-r--r--module/plugins/hoster/BasePlugin.py5
-rw-r--r--module/plugins/hoster/CzshareCom.py4
-rw-r--r--module/plugins/hoster/HellshareCz.py4
-rw-r--r--module/plugins/hoster/RyushareCom.py4
-rw-r--r--module/plugins/hoster/UptoboxCom.py1
-rw-r--r--module/plugins/internal/MultiHoster.py14
8 files changed, 17 insertions, 25 deletions
diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezCom.py
index 22b9050b4..6a4ded85b 100644
--- a/module/plugins/hooks/EasybytezCom.py
+++ b/module/plugins/hooks/EasybytezCom.py
@@ -4,11 +4,6 @@ from module.network.RequestFactory import getURL
from module.plugins.internal.MultiHoster import MultiHoster
import re
-def getConfigSet(option):
- s = set(option.lower().replace(',','|').split('|'))
- s.discard(u'')
- return s
-
class EasybytezCom(MultiHoster):
__name__ = "EasybytezCom"
__version__ = "0.03"
diff --git a/module/plugins/hooks/MultishareCz.py b/module/plugins/hooks/MultishareCz.py
index f8fa9290a..7e5a3e007 100644
--- a/module/plugins/hooks/MultishareCz.py
+++ b/module/plugins/hooks/MultishareCz.py
@@ -4,11 +4,6 @@ from module.network.RequestFactory import getURL
from module.plugins.internal.MultiHoster import MultiHoster
import re
-def getConfigSet(option):
- s = set(option.lower().split('|'))
- s.discard(u'')
- return s
-
class MultishareCz(MultiHoster):
__name__ = "MultishareCz"
__version__ = "0.04"
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index 14dfbba62..7d6990c8b 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -55,7 +55,7 @@ class BasePlugin(Hoster):
self.logDebug("Logging on to %s" % server)
self.req.addAuth(self.account.accounts[server]["password"])
else:
- for pwd in pyfile.package().password.splitlines()
+ for pwd in pyfile.package().password.splitlines():
if ":" in pwd:
self.req.addAuth(pwd.strip())
break
@@ -74,7 +74,7 @@ class BasePlugin(Hoster):
url = pyfile.url
for i in range(5):
- header = self.load(pyfile.url, just_header = True)
+ header = self.load(url, just_header = True)
# self.load does not raise a BadHeader on 404 responses, do it here
if header.has_key('code') and header['code'] == 404:
@@ -83,7 +83,6 @@ class BasePlugin(Hoster):
if 'location' in header:
self.logDebug("Location: " + header['location'])
url = unquote(header['location'])
- self.logDebug("URL: %s" % url, html_unescape(unquote(urlparse(url).path.split("/")[-1])))
else:
break
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 538e3ed86..356771ce4 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -17,7 +17,7 @@
"""
import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo, PluginParseError
from module.network.RequestFactory import getURL
def toInfoPage(url):
@@ -45,7 +45,7 @@ class CzshareCom(SimpleHoster):
__name__ = "CzshareCom"
__type__ = "hoster"
__pattern__ = r"http://(\w*\.)*czshare\.(com|cz)/(\d+/|download.php\?).*"
- __version__ = "0.88"
+ __version__ = "0.89"
__description__ = """CZshare.com"""
__author_name__ = ("zoidberg")
diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py
index 9b50f55dc..9130cd797 100644
--- a/module/plugins/hoster/HellshareCz.py
+++ b/module/plugins/hoster/HellshareCz.py
@@ -25,8 +25,8 @@ from module.network.RequestFactory import getURL
class HellshareCz(SimpleHoster):
__name__ = "HellshareCz"
__type__ = "hoster"
- __pattern__ = r"(http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu)/[^?]*/\d+).*"
- __version__ = "0.78"
+ __pattern__ = r"(http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+).*"
+ __version__ = "0.79"
__description__ = """Hellshare.cz"""
__author_name__ = ("zoidberg")
diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py
index b3d7bafc6..9bbbdcb91 100644
--- a/module/plugins/hoster/RyushareCom.py
+++ b/module/plugins/hoster/RyushareCom.py
@@ -4,8 +4,8 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
class RyushareCom(XFileSharingPro):
__name__ = "RyushareCom"
__type__ = "hoster"
- __pattern__ = r"http://(?:\w*\.)*?ryushare.com/\w{12}"
- __version__ = "0.02"
+ __pattern__ = r"http://(?:\w*\.)*?ryushare.com/\w{11,}"
+ __version__ = "0.03"
__description__ = """ryushare.com hoster plugin"""
__author_name__ = ("zoidberg")
__author_mail__ = ("zoidberg@mujmail.cz")
diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py
index ae2f14a14..60a93c1e5 100644
--- a/module/plugins/hoster/UptoboxCom.py
+++ b/module/plugins/hoster/UptoboxCom.py
@@ -11,6 +11,7 @@ class UptoboxCom(XFileSharingPro):
__author_mail__ = ("zoidberg@mujmail.cz")
FILE_INFO_PATTERN = r'<h2>\s*Download File\s*<span[^>]*>(?P<N>[^>]+)</span></h2>\s*[^\(]*\((?P<S>[^\)]+)\)</h2>'
+ FILE_OFFLINE_PATTERN = r'<center>File Not Found</center>'
HOSTER_NAME = "uptobox.com"
def setup(self):
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 0f25eb8d2..044bc3423 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -14,14 +14,16 @@ class MultiHoster(Hook):
__version__ = "0.15"
interval = 0
- hosters = []
replacements = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
("ifile.it", "filecloud.io"), ("easy-share.com","crocko.com"), ("freakshare.net","freakshare.com"),
- ("hellshare.com", "hellshare.cz"), ("share-rapid.cz","sharerapid.com"),
+ ("hellshare.com", "hellshare.cz"), ("share-rapid.cz","sharerapid.com"), ("sharerapid.cz","sharerapid.com"),
("ul.to","uploaded.to"), ("uploaded.net","uploaded.to")]
- supported = []
ignored = []
- new_supported = []
+
+ def setup(self):
+ self.hosters = []
+ self.supported = []
+ self.new_supported = []
def getHosterCached(self):
if not self.hosters:
@@ -74,7 +76,7 @@ class MultiHoster(Hook):
accountList = [ name.lower() for name, data in self.core.accountManager.accounts.items() if data ]
excludedList = []
-
+
for hoster in self.getHosterCached():
name = remove_chars(hoster.lower(), "-.")
@@ -112,7 +114,7 @@ class MultiHoster(Hook):
if not klass.__pattern__:
regexp = r".*(%s).*" % "|".join([x.replace(".", "\\.") for x in new_supported])
else:
- regexp = r"%s|.*(%s).*" % ([klass.__pattern__], "|".join([x.replace(".", "\\.") for x in self.new_supported]))
+ regexp = r"%s|.*(%s).*" % (klass.__pattern__, "|".join([x.replace(".", "\\.") for x in self.new_supported]))
self.logDebug("Regexp: %s" % regexp)
dict = self.core.pluginManager.hosterPlugins[self.__name__]
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 15:40:38 +0100