From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Nov 2014 22:47:07 +0100 Subject: Update all other plugins --- module/plugins/hoster/BayfilesCom.py | 2 +- module/plugins/hoster/BezvadataCz.py | 4 ++-- module/plugins/hoster/BillionuploadsCom.py | 12 ++++++------ module/plugins/hoster/BitshareCom.py | 8 ++++---- module/plugins/hoster/CatShareNet.py | 2 +- module/plugins/hoster/CramitIn.py | 10 +++++----- module/plugins/hoster/CrockoCom.py | 6 +++--- module/plugins/hoster/CzshareCom.py | 8 ++++---- module/plugins/hoster/DataHu.py | 2 +- module/plugins/hoster/DataportCz.py | 6 +++--- module/plugins/hoster/DateiTo.py | 4 ++-- module/plugins/hoster/DepositfilesCom.py | 8 ++++---- module/plugins/hoster/DevhostSt.py | 4 ++-- module/plugins/hoster/DlFreeFr.py | 6 +++--- module/plugins/hoster/DropboxCom.py | 4 ++-- module/plugins/hoster/EasybytezCom.py | 10 +++++----- module/plugins/hoster/EdiskCz.py | 2 +- module/plugins/hoster/EuroshareEu.py | 4 ++-- module/plugins/hoster/ExtabitCom.py | 4 ++-- module/plugins/hoster/FastshareCz.py | 4 ++-- module/plugins/hoster/FileParadoxIn.py | 10 +++++----- module/plugins/hoster/FileSharkPl.py | 4 ++-- module/plugins/hoster/FileStoreTo.py | 2 +- module/plugins/hoster/FilecloudIo.py | 4 ++-- module/plugins/hoster/FilefactoryCom.py | 2 +- module/plugins/hoster/FileomCom.py | 14 +++++++------- module/plugins/hoster/FilepostCom.py | 2 +- module/plugins/hoster/FilepupNet.py | 4 ++-- module/plugins/hoster/FilerNet.py | 2 +- module/plugins/hoster/FilerioCom.py | 10 +++++----- module/plugins/hoster/FlyFilesNet.py | 4 ++-- module/plugins/hoster/FourSharedCom.py | 8 ++++---- module/plugins/hoster/FshareVn.py | 4 ++-- module/plugins/hoster/GigapetaCom.py | 4 ++-- module/plugins/hoster/GooIm.py | 2 +- module/plugins/hoster/HellshareCz.py | 4 ++-- module/plugins/hoster/HugefilesNet.py | 10 +++++----- module/plugins/hoster/HundredEightyUploadCom.py | 12 ++++++------ module/plugins/hoster/IfileIt.py | 2 +- module/plugins/hoster/IfolderRu.py | 6 +++--- module/plugins/hoster/JumbofilesCom.py | 2 +- module/plugins/hoster/JunocloudMe.py | 14 +++++++------- module/plugins/hoster/Keep2shareCC.py | 4 ++-- module/plugins/hoster/KingfilesNet.py | 4 ++-- module/plugins/hoster/LoadTo.py | 6 +++--- module/plugins/hoster/LomafileCom.py | 12 ++++++------ module/plugins/hoster/LuckyShareNet.py | 2 +- module/plugins/hoster/MediafireCom.py | 4 ++-- module/plugins/hoster/MegaRapidCz.py | 4 ++-- module/plugins/hoster/MegasharesCom.py | 4 ++-- module/plugins/hoster/MovReelCom.py | 12 ++++++------ module/plugins/hoster/MultishareCz.py | 4 ++-- module/plugins/hoster/NarodRu.py | 8 ++++---- module/plugins/hoster/NosuploadCom.py | 10 +++++----- module/plugins/hoster/NovafileCom.py | 10 +++++----- module/plugins/hoster/NowDownloadEu.py | 4 ++-- module/plugins/hoster/NowVideoAt.py | 4 ++-- module/plugins/hoster/OneFichierCom.py | 6 +++--- module/plugins/hoster/PromptfileCom.py | 2 +- module/plugins/hoster/QuickshareCz.py | 4 ++-- module/plugins/hoster/RapidfileshareNet.py | 12 ++++++------ module/plugins/hoster/RapidgatorNet.py | 4 ++-- module/plugins/hoster/RarefileNet.py | 12 ++++++------ module/plugins/hoster/RemixshareCom.py | 2 +- module/plugins/hoster/RgHostNet.py | 2 +- module/plugins/hoster/RyushareCom.py | 10 +++++----- module/plugins/hoster/SecureUploadEu.py | 10 +++++----- module/plugins/hoster/SendmywayCom.py | 12 ++++++------ module/plugins/hoster/SendspaceCom.py | 4 ++-- module/plugins/hoster/SpeedyshareCom.py | 6 +++--- module/plugins/hoster/StreamCz.py | 6 +++--- module/plugins/hoster/StreamcloudEu.py | 10 +++++----- module/plugins/hoster/TurbobitNet.py | 6 +++--- module/plugins/hoster/TusfilesNet.py | 10 +++++----- module/plugins/hoster/TwoSharedCom.py | 4 ++-- module/plugins/hoster/UlozTo.py | 10 +++++----- module/plugins/hoster/UloziskoSk.py | 4 ++-- module/plugins/hoster/UpleaCom.py | 10 +++++----- module/plugins/hoster/UploadedTo.py | 4 ++-- module/plugins/hoster/UploadheroCom.py | 4 ++-- module/plugins/hoster/UploadingCom.py | 4 ++-- module/plugins/hoster/UpstoreNet.py | 2 +- module/plugins/hoster/UptoboxCom.py | 10 +++++----- module/plugins/hoster/VeohCom.py | 4 ++-- module/plugins/hoster/VidPlayNet.py | 10 +++++----- module/plugins/hoster/VimeoCom.py | 4 ++-- module/plugins/hoster/WrzucTo.py | 4 ++-- module/plugins/hoster/YibaishiwuCom.py | 4 ++-- module/plugins/hoster/YoutubeCom.py | 4 ++-- module/plugins/hoster/ZippyshareCom.py | 4 ++-- 90 files changed, 266 insertions(+), 266 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py index 02334736c..06a2c4fc6 100644 --- a/module/plugins/hoster/BayfilesCom.py +++ b/module/plugins/hoster/BayfilesCom.py @@ -21,7 +21,7 @@ class BayfilesCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - FILE_INFO_PATTERN = r'

[^<]*(?P[\d .,]+)(?P[\w^_]+)

' + INFO_PATTERN = r'

[^<]*(?P[\d .,]+)(?P[\w^_]+)

' OFFLINE_PATTERN = r'(

The requested file could not be found.

|404 Not Found)' WAIT_PATTERN = r'>Your IP [\d.]* has recently downloaded a file\. Upgrade to premium or wait (\d+) minutes\.<' diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py index 1aeb7fad4..cefa04e9e 100644 --- a/module/plugins/hoster/BezvadataCz.py +++ b/module/plugins/hoster/BezvadataCz.py @@ -17,8 +17,8 @@ class BezvadataCz(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'

Soubor: (?P[^<]+)

' - FILE_SIZE_PATTERN = r'
  • Velikost: (?P[^<]+)
    • ' + NAME_PATTERN = r'

    Soubor: (?P[^<]+)

    ' + SIZE_PATTERN = r'
  • Velikost: (?P[^<]+)
    • ' OFFLINE_PATTERN = r'BezvaData \| Soubor nenalezen' diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py index f4859efd9..b20ace0f1 100644 --- a/module/plugins/hoster/BillionuploadsCom.py +++ b/module/plugins/hoster/BillionuploadsCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class BillionuploadsCom(XFSPHoster): +class BillionuploadsCom(XFSHoster): __name__ = "BillionuploadsCom" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}' @@ -15,10 +15,10 @@ class BillionuploadsCom(XFSPHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - HOSTER_NAME = "billionuploads.com" + HOSTER_DOMAIN = "billionuploads.com" - FILE_NAME_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'(?P[\d.,]+) (?P[\w^_]+)' getInfo = create_getInfo(BillionuploadsCom) diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py index 81af82a4c..b2fe2c48a 100644 --- a/module/plugins/hoster/BitshareCom.py +++ b/module/plugins/hoster/BitshareCom.py @@ -21,12 +21,12 @@ class BitshareCom(SimpleHoster): ("fragonib", "fragonib[AT]yahoo[DOT]es")] - FILE_INFO_PATTERN = r'Downloading (?P.+) - (?P[\d.,]+) (?P[\w^_]+)' + INFO_PATTERN = r'Downloading (?P.+) - (?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'(>We are sorry, but the requested file was not found in our database|>Error - File not available<|The file was deleted either by the uploader, inactivity or due to copyright claim)' COOKIES = [(".bitshare.com", "language_selection", "EN")] - FILE_AJAXID_PATTERN = r'var ajaxdl = "(.*?)";' + AJAXID_PATTERN = r'var ajaxdl = "(.*?)";' TRAFFIC_USED_UP = r'Your Traffic is used up for today. Upgrade to premium to continue!' @@ -62,12 +62,12 @@ class BitshareCom(SimpleHoster): # File name m = re.match(self.__pattern__, pyfile.url) name1 = m.group('name') if m else None - m = re.search(self.FILE_INFO_PATTERN, self.html) + m = re.search(self.INFO_PATTERN, self.html) name2 = m.group('N') if m else None pyfile.name = max(name1, name2) # Ajax file id - self.ajaxid = re.search(self.FILE_AJAXID_PATTERN, self.html).group(1) + self.ajaxid = re.search(self.AJAXID_PATTERN, self.html).group(1) self.logDebug("File ajax id is [%s]" % self.ajaxid) # This may either download our file or forward us to an error page diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py index 9faa9be81..63ae2c11c 100644 --- a/module/plugins/hoster/CatShareNet.py +++ b/module/plugins/hoster/CatShareNet.py @@ -22,7 +22,7 @@ class CatShareNet(SimpleHoster): TEXT_ENCODING = True - FILE_INFO_PATTERN = r'(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)<' + INFO_PATTERN = r'<title>(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)<' OFFLINE_PATTERN = ur'Podany plik został usunięty\s*</div>' IP_BLOCKED_PATTERN = ur'>Nasz serwis wykrył że Twój adres IP nie pochodzi z Polski.<' diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py index 6af79771d..4f1ad1ff1 100644 --- a/module/plugins/hoster/CramitIn.py +++ b/module/plugins/hoster/CramitIn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class CramitIn(XFSPHoster): +class CramitIn(XFSHoster): __name__ = "CramitIn" __type__ = "hoster" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}' @@ -15,9 +15,9 @@ class CramitIn(XFSPHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - HOSTER_NAME = "cramit.in" + HOSTER_DOMAIN = "cramit.in" - FILE_INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' + INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' LINK_PATTERN = r'href="(http://cramit\.in/file_download/.*?)"' diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py index aedb62026..356a16c6b 100644 --- a/module/plugins/hoster/CrockoCom.py +++ b/module/plugins/hoster/CrockoCom.py @@ -18,8 +18,8 @@ class CrockoCom(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)' - FILE_SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>' + NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)' + SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>' OFFLINE_PATTERN = r'<h1>Sorry,<br />the page you\'re looking for <br />isn\'t here.</h1>|File not found' CAPTCHA_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';") @@ -27,7 +27,7 @@ class CrockoCom(SimpleHoster): FORM_PATTERN = r'<form method="post" action="([^"]+)">(.*?)</form>' FORM_INPUT_PATTERN = r'<input[^>]* name="?([^" ]+)"? value="?([^" ]+)"?[^>]*>' - FILE_NAME_REPLACEMENTS = [(r'<[^>]*>', '')] + NAME_REPLACEMENTS = [(r'<[^>]*>', '')] def handleFree(self): diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index fd02c0f77..76efda3b9 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -21,12 +21,12 @@ class CzshareCom(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>' - FILE_SIZE_PATTERN = r'<div class="tab" id="category">(?:\s*<p>[^\n]*</p>)*\s*Velikost:\s*(?P<S>[\d .,]+)(?P<U>[\w^_]+)\s*</div>' + NAME_PATTERN = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>' + SIZE_PATTERN = r'<div class="tab" id="category">(?:\s*<p>[^\n]*</p>)*\s*Velikost:\s*(?P<S>[\d .,]+)(?P<U>[\w^_]+)\s*</div>' OFFLINE_PATTERN = r'<div class="header clearfix">\s*<h2 class="red">' - FILE_SIZE_REPLACEMENTS = [(' ', '')] - FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://sdilej.cz/\1/x/')] + SIZE_REPLACEMENTS = [(' ', '')] + URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://sdilej.cz/\1/x/')] FORCE_CHECK_TRAFFIC = True diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py index 246870215..fd6a01135 100644 --- a/module/plugins/hoster/DataHu.py +++ b/module/plugins/hoster/DataHu.py @@ -21,7 +21,7 @@ class DataHu(SimpleHoster): ("stickell", "l.stickell@yahoo.it")] - FILE_INFO_PATTERN = ur'<title>(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se' + INFO_PATTERN = ur'(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se' OFFLINE_PATTERN = ur'Az adott f\xe1jl nem l\xe9tezik' LINK_PATTERN = r'
    ' diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py index 6d64606de..d3058847d 100644 --- a/module/plugins/hoster/DataportCz.py +++ b/module/plugins/hoster/DataportCz.py @@ -15,11 +15,11 @@ class DataportCz(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'(?P[^<]+)' - FILE_SIZE_PATTERN = r'Velikost\s*(?P[^<]+)' + NAME_PATTERN = r'(?P[^<]+)' + SIZE_PATTERN = r'Velikost\s*(?P[^<]+)' OFFLINE_PATTERN = r'

    Soubor nebyl nalezen

    ' - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.dataport.cz/file/\1')] + URL_REPLACEMENTS = [(__pattern__, r'http://www.dataport.cz/file/\1')] CAPTCHA_PATTERN = r'
    \s*(\d+)
    ' diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index f004462e8..8c51fbac4 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -18,8 +18,8 @@ class DateiTo(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'Dateiname:\s*(?P.*?)\s*(?P.*?)\s*(?P.*?)\s*(?P.*?)Datei wurde nicht gefunden<|>Bitte wähle deine Datei aus... <' PARALELL_PATTERN = r'>Du lädst bereits eine Datei herunter<' diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index bfdd5a769..2f6c30158 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -22,13 +22,13 @@ class DepositfilesCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - FILE_NAME_PATTERN = r'' diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py index 83e7cc70e..ae53411c3 100644 --- a/module/plugins/hoster/RapidfileshareNet.py +++ b/module/plugins/hoster/RapidfileshareNet.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class RapidfileshareNet(XFSPHoster): +class RapidfileshareNet(XFSHoster): __name__ = "RapidfileshareNet" __type__ = "hoster" - __version__ = "0.01" + __version__ = "0.02" __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' @@ -15,10 +15,10 @@ class RapidfileshareNet(XFSPHoster): __authors__ = [("guidobelix", "guidobelix@hotmail.it")] - HOSTER_NAME = "rapidfileshare.net" + HOSTER_DOMAIN = "rapidfileshare.net" - FILE_NAME_PATTERN = r'' - FILE_SIZE_PATTERN = r'>http://www.rapidfileshare.net/\w+? \((?P[\d.,]+) (?P[\w^_]+)\)' + NAME_PATTERN = r'' + SIZE_PATTERN = r'>http://www.rapidfileshare.net/\w+? \((?P[\d.,]+) (?P[\w^_]+)\)' OFFLINE_PATTERN = r'>No such file with this filename' TEMP_OFFLINE_PATTERN = r'The page may have been renamed, removed or be temporarily unavailable.<' diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index aca3c2a66..b45543435 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -28,8 +28,8 @@ class RapidgatorNet(SimpleHoster): API_URL = "http://rapidgator.net/api/file" - FILE_NAME_PATTERN = r'Download file (?P<N>.*)' - FILE_SIZE_PATTERN = r'File size:\s*(?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'Download file (?P<N>.*)' + SIZE_PATTERN = r'File size:\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>(File not found|Error 404)' JSVARS_PATTERN = r'\s+var\s*(startTimerUrl|getDownloadUrl|captchaUrl|fid|secs)\s*=\s*\'?(.*?)\'?;' diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py index 6ed268735..f6f9143c5 100644 --- a/module/plugins/hoster/RarefileNet.py +++ b/module/plugins/hoster/RarefileNet.py @@ -2,14 +2,14 @@ import re -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo from module.utils import html_unescape -class RarefileNet(XFSPHoster): +class RarefileNet(XFSHoster): __name__ = "RarefileNet" __type__ = "hoster" - __version__ = "0.05" + __version__ = "0.06" __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}' @@ -18,10 +18,10 @@ class RarefileNet(XFSPHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - HOSTER_NAME = "rarefile.net" + HOSTER_DOMAIN = "rarefile.net" - FILE_NAME_PATTERN = r'(?P.*?)' - FILE_SIZE_PATTERN = r'Size : (?P.+?) ' + NAME_PATTERN = r'(?P.*?)' + SIZE_PATTERN = r'Size : (?P.+?) ' LINK_PATTERN = r'    (?P=link)' diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index 08ecdc6c5..ca1e2e342 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -26,7 +26,7 @@ class RemixshareCom(SimpleHoster): ("Walter Purcaro", "vuolter@gmail.com")] - FILE_INFO_PATTERN = r'title=\'.+?\'>(?P.+?) \((?P\d+) (?P[\w^_]+)\)<' + INFO_PATTERN = r'title=\'.+?\'>(?P.+?) \((?P\d+) (?P[\w^_]+)\)<' OFFLINE_PATTERN = r'

    Ooops!<' LINK_PATTERN = r'(http://remixshare\.com/downloadfinal/.+?)"' diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py index 511bfe4db..982e18eda 100644 --- a/module/plugins/hoster/RgHostNet.py +++ b/module/plugins/hoster/RgHostNet.py @@ -17,7 +17,7 @@ class RgHostNet(SimpleHoster): __authors__ = [("z00nx", "z00nx0@gmail.com")] - FILE_INFO_PATTERN = r'

    \s+(]+>)?(?P[^<]+)()?\s+]+>\s+\((?P[^)]+)\)\s+\s+

    ' + INFO_PATTERN = r'

    \s+(]+>)?(?P[^<]+)()?\s+]+>\s+\((?P[^)]+)\)\s+\s+

    ' OFFLINE_PATTERN = r'File is deleted|this page is not found' LINK_PATTERN = r''']+>Download''' diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py index 1469edea5..d2e4489a6 100644 --- a/module/plugins/hoster/RyushareCom.py +++ b/module/plugins/hoster/RyushareCom.py @@ -5,14 +5,14 @@ import re -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo from module.plugins.internal.CaptchaService import SolveMedia -class RyushareCom(XFSPHoster): +class RyushareCom(XFSHoster): __name__ = "RyushareCom" __type__ = "hoster" - __version__ = "0.19" + __version__ = "0.20" __pattern__ = r'http://(?:www\.)?ryushare\.com/\w+' @@ -23,9 +23,9 @@ class RyushareCom(XFSPHoster): ("quareevo", "quareevo@arcor.de")] - HOSTER_NAME = "ryushare.com" + HOSTER_DOMAIN = "ryushare.com" - FILE_SIZE_PATTERN = r'You have requested [^<]+ \((?P[\d.,]+) (?P[\w^_]+)' + SIZE_PATTERN = r'You have requested [^<]+ \((?P[\d.,]+) (?P[\w^_]+)' WAIT_PATTERN = r'You have to wait ((?P\d+) hour[s]?, )?((?P\d+) minute[s], )?(?P\d+) second[s]' LINK_PATTERN = r'Click here to download<' diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py index 0b6b702ef..64e6456a9 100644 --- a/module/plugins/hoster/SecureUploadEu.py +++ b/module/plugins/hoster/SecureUploadEu.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class SecureUploadEu(XFSPHoster): +class SecureUploadEu(XFSHoster): __name__ = "SecureUploadEu" __type__ = "hoster" - __version__ = "0.04" + __version__ = "0.05" __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}' @@ -15,9 +15,9 @@ class SecureUploadEu(XFSPHoster): __authors__ = [("z00nx", "z00nx0@gmail.com")] - HOSTER_NAME = "secureupload.eu" + HOSTER_DOMAIN = "secureupload.eu" - FILE_INFO_PATTERN = r'

    Downloading (?P[^<]+) \((?P[^<]+)\)

    ' + INFO_PATTERN = r'

    Downloading (?P[^<]+) \((?P[^<]+)\)

    ' getInfo = create_getInfo(SecureUploadEu) diff --git a/module/plugins/hoster/SendmywayCom.py b/module/plugins/hoster/SendmywayCom.py index 8fd65f2b2..4254922fc 100644 --- a/module/plugins/hoster/SendmywayCom.py +++ b/module/plugins/hoster/SendmywayCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class SendmywayCom(XFSPHoster): +class SendmywayCom(XFSHoster): __name__ = "SendmywayCom" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'http://(?:www\.)?sendmyway\.com/\w{12}' @@ -15,10 +15,10 @@ class SendmywayCom(XFSPHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - HOSTER_NAME = "sendmyway.com" + HOSTER_DOMAIN = "sendmyway.com" - FILE_NAME_PATTERN = r'

    <.*?>\s*(?P.+)' - FILE_SIZE_PATTERN = r'\((?P\d+) bytes\)' + NAME_PATTERN = r'

    <.*?>\s*(?P.+)' + SIZE_PATTERN = r'\((?P\d+) bytes\)' getInfo = create_getInfo(SendmywayCom) diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py index bdf6c7730..aec572413 100644 --- a/module/plugins/hoster/SendspaceCom.py +++ b/module/plugins/hoster/SendspaceCom.py @@ -17,8 +17,8 @@ class SendspaceCom(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'

    \s*<(?:b|strong)>(?P[^<]+)\s*File Size:\s*(?P[\d.,]+)(?P[\w^_]+)\s*

    ' + NAME_PATTERN = r'

    \s*<(?:b|strong)>(?P[^<]+)\s*File Size:\s*(?P[\d.,]+)(?P[\w^_]+)\s*' OFFLINE_PATTERN = r'
    Sorry, the file you requested is not available.
    ' LINK_PATTERN = r'    (?P.*)' - FILE_SIZE_PATTERN = r'class=sizetagtext>(?P.*) (?P[kKmM]?[iI]?[bB]?)' + NAME_PATTERN = r'class=downloadfilename>(?P.*)' + SIZE_PATTERN = r'class=sizetagtext>(?P.*) (?P[kKmM]?[iI]?[bB]?)' - FILE_OFFLINE_PATTERN = r'class=downloadfilenamenotfound>.*' + OFFLINE_PATTERN = r'class=downloadfilenamenotfound>.*' LINK_PATTERN = r'\'Slow' + NAME_PATTERN = r'' OFFLINE_PATTERN = r'

    Str.nku nebylo mo.n. nal.zt \(404\)

    ' CDN_PATTERN = r'\d+)(?:&cdnLQ=(?P\d*))?(?:&cdnHQ=(?P\d*))?(?:&cdnHD=(?P\d*))?&' @@ -61,9 +61,9 @@ class StreamCz(Hoster): else: self.fail(_("Stream URL not found")) - m = re.search(self.FILE_NAME_PATTERN, self.html) + m = re.search(self.NAME_PATTERN, self.html) if m is None: - self.error(_("FILE_NAME_PATTERN not found")) + self.error(_("NAME_PATTERN not found")) pyfile.name = "%s-%s.%s.mp4" % (m.group(2), m.group(1), cdnkey[-2:]) download_url = "http://cdn-dispatcher.stream.cz/?id=" + cdnid diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 3fd29822f..a6f34a34a 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -5,13 +5,13 @@ import re from time import sleep from module.network.HTTPRequest import HTTPRequest -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class StreamcloudEu(XFSPHoster): +class StreamcloudEu(XFSHoster): __name__ = "StreamcloudEu" __type__ = "hoster" - __version__ = "0.07" + __version__ = "0.08" __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}' @@ -20,7 +20,7 @@ class StreamcloudEu(XFSPHoster): __authors__ = [("seoester", "seoester@googlemail.com")] - HOSTER_NAME = "streamcloud.eu" + HOSTER_DOMAIN = "streamcloud.eu" LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud\.eu:?\d*/.*/video\.(mp4|flv))",' @@ -80,7 +80,7 @@ class StreamcloudEu(XFSPHoster): else: self.error(_("Form not found")) - self.logDebug(self.HOSTER_NAME, inputs) + self.logDebug(inputs) if 'op' in inputs and inputs['op'] in ("download1", "download2", "download3"): if "password" in inputs: diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index be6b00b2e..93e037664 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -27,11 +27,11 @@ class TurbobitNet(SimpleHoster): ("prOq", None)] - FILE_NAME_PATTERN = r'id="file-title">(?P.+?)<' - FILE_SIZE_PATTERN = r'class="file-size">(?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'id="file-title">(?P.+?)<' + SIZE_PATTERN = r'class="file-size">(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'

    File Not Found

    |html\(\'File (?:was )?not found' - FILE_URL_REPLACEMENTS = [(__pattern__, "http://turbobit.net/\g.html")] + URL_REPLACEMENTS = [(__pattern__, "http://turbobit.net/\g.html")] COOKIES = [(".turbobit.net", "user_lang", "en")] diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py index bffd22e48..8c80455b4 100644 --- a/module/plugins/hoster/TusfilesNet.py +++ b/module/plugins/hoster/TusfilesNet.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class TusfilesNet(XFSPHoster): +class TusfilesNet(XFSHoster): __name__ = "TusfilesNet" __type__ = "hoster" - __version__ = "0.06" + __version__ = "0.07" __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}' @@ -16,9 +16,9 @@ class TusfilesNet(XFSPHoster): ("guidobelix", "guidobelix@hotmail.it")] - HOSTER_NAME = "tusfiles.net" + HOSTER_DOMAIN = "tusfiles.net" - FILE_INFO_PATTERN = r'\](?P.+) - (?P[\d.,]+) (?P[\w^_]+)\[' + INFO_PATTERN = r'\](?P.+) - (?P[\d.,]+) (?P[\w^_]+)\[' OFFLINE_PATTERN = r'>File Not Found|TusFiles - Fast Sharing Files!' diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py index 9cf1705fb..5fed652cb 100644 --- a/module/plugins/hoster/TwoSharedCom.py +++ b/module/plugins/hoster/TwoSharedCom.py @@ -17,8 +17,8 @@ class TwoSharedCom(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'<h1>(?P<N>.*)</h1>' - FILE_SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)' + NAME_PATTERN = r'<h1>(?P<N>.*)</h1>' + SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)' OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.' LINK_PATTERN = r'window.location =\'(.+?)\';' diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py index 45ed06ae0..319cc1728 100644 --- a/module/plugins/hoster/UlozTo.py +++ b/module/plugins/hoster/UlozTo.py @@ -24,13 +24,13 @@ class UlozTo(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_INFO_PATTERN = r'<p>File <strong>(?P<N>[^<]+)</strong> is password protected</p>' - FILE_NAME_PATTERN = r'<title>(?P<N>[^<]+) \| Uloz\.to' - FILE_SIZE_PATTERN = r'.*?(?P[\d.,]+\s[kMG]?B)' + INFO_PATTERN = r'

    File (?P[^<]+) is password protected

    ' + NAME_PATTERN = r'(?P<N>[^<]+) \| Uloz\.to' + SIZE_PATTERN = r'.*?(?P[\d.,]+\s[kMG]?B)' OFFLINE_PATTERN = r'404 - Page not found|

    File (has been deleted|was banned)

    ' - FILE_SIZE_REPLACEMENTS = [('([\d.]+)\s([kMG])B', convertDecimalPrefix)] - FILE_URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "www.ulozto.net")] + SIZE_REPLACEMENTS = [('([\d.]+)\s([kMG])B', convertDecimalPrefix)] + URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "www.ulozto.net")] ADULT_PATTERN = r'
    ' PASSWD_PATTERN = r'
    ' diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py index 854f3ef04..b48964771 100644 --- a/module/plugins/hoster/UloziskoSk.py +++ b/module/plugins/hoster/UloziskoSk.py @@ -17,8 +17,8 @@ class UloziskoSk(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'
    (?P[^<]+)
    ' - FILE_SIZE_PATTERN = ur'Veľkosť súboru: (?P[\d.,]+) (?P[\w^_]+)
    ' + NAME_PATTERN = r'
    (?P[^<]+)
    ' + SIZE_PATTERN = ur'Veľkosť súboru: (?P[\d.,]+) (?P[\w^_]+)
    ' OFFLINE_PATTERN = ur'Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:' LINK_PATTERN = r'' diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py index 5ca9f2e40..4b253d2ce 100644 --- a/module/plugins/hoster/UpleaCom.py +++ b/module/plugins/hoster/UpleaCom.py @@ -2,13 +2,13 @@ import re -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class UpleaCom(XFSPHoster): +class UpleaCom(XFSHoster): __name__ = "UpleaCom" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' @@ -17,9 +17,9 @@ class UpleaCom(XFSPHoster): __authors__ = [("Redleon", None)] - HOSTER_NAME = "uplea.com" + HOSTER_DOMAIN = "uplea.com" - FILE_INFO_PATTERN = r'class="l download-filename">\s(?P.+)\s(?P[\d.]+) (?P[\w]).*?' + INFO_PATTERN = r'class="l download-filename">\s(?P.+)\s(?P[\d.]+) (?P[\w]).*?' OFFLINE_PATTERN = r'You followed an invalid or expired link' LINK_PATTERN = r'"(http?://\w+\.uplea\.com/anonym/.*?)"' diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 5f324c31d..40fe768e9 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -64,7 +64,7 @@ def parseFileInfo(self, url='', html=''): # File offline status = 1 else: - m = re.search(self.FILE_INFO_PATTERN, html) + m = re.search(self.INFO_PATTERN, html) if m: name, fileid = html_unescape(m.group('N')), m.group('ID') size = parseFileSize(m.group('S')) @@ -107,7 +107,7 @@ class UploadedTo(Hoster): ("stickell", "l.stickell@yahoo.it")] - FILE_INFO_PATTERN = r'    (?P[^<]+)  \s*]*>(?P[^<]+)' + INFO_PATTERN = r'(?P[^<]+)  \s*]*>(?P[^<]+)' OFFLINE_PATTERN = r'Error: 404' DL_LIMIT_PATTERN = r'You have reached the max. number of possible free downloads for this hour' diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py index 04b7197d0..617573d4c 100644 --- a/module/plugins/hoster/UploadheroCom.py +++ b/module/plugins/hoster/UploadheroCom.py @@ -21,8 +21,8 @@ class UploadheroCom(SimpleHoster): ("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'
    (?P.*?)
    ' - FILE_SIZE_PATTERN = r'Taille du fichier : (?P.*?)' + NAME_PATTERN = r'
    (?P.*?)
    ' + SIZE_PATTERN = r'Taille du fichier : (?P.*?)' OFFLINE_PATTERN = r'

    |

    Le lien du fichier ci-dessus n\'existe plus.' COOKIES = [(".uploadhero.co", "lang", "en")] diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py index cf48f1ec4..12b4af0b7 100644 --- a/module/plugins/hoster/UploadingCom.py +++ b/module/plugins/hoster/UploadingCom.py @@ -22,8 +22,8 @@ class UploadingCom(SimpleHoster): ("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'id="file_title">(?P.+)(?P[\d.,]+) (?P[\w^_]+)<' + NAME_PATTERN = r'id="file_title">(?P.+)(?P[\d.,]+) (?P[\w^_]+)<' OFFLINE_PATTERN = r'(Page|file) not found' COOKIES = [(".uploading.com", "lang", "1"), diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py index f6b725c97..8c93c4d61 100644 --- a/module/plugins/hoster/UpstoreNet.py +++ b/module/plugins/hoster/UpstoreNet.py @@ -18,7 +18,7 @@ class UpstoreNet(SimpleHoster): __authors__ = [("igel", "igelkun@myopera.com")] - FILE_INFO_PATTERN = r'
    .*?
    \s*\n

    (?P.*?)

    \s*\n
    \s*\n\s*(?P[\d.,]+) (?P[\w^_]+)' + INFO_PATTERN = r'
    .*?
    \s*\n

    (?P.*?)

    \s*\n
    \s*\n\s*(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'File not found' WAIT_PATTERN = r'var sec = (\d+)' diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py index 76cfddada..eeddb96b6 100644 --- a/module/plugins/hoster/UptoboxCom.py +++ b/module/plugins/hoster/UptoboxCom.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class UptoboxCom(XFSPHoster): +class UptoboxCom(XFSHoster): __name__ = "UptoboxCom" __type__ = "hoster" - __version__ = "0.14" + __version__ = "0.15" __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w{12}' @@ -15,9 +15,9 @@ class UptoboxCom(XFSPHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - HOSTER_NAME = "uptobox.com" + HOSTER_DOMAIN = "uptobox.com" - FILE_INFO_PATTERN = r'"para_title">(?P.+) \((?P[\d.,]+) (?P[\w^_]+)\)' + INFO_PATTERN = r'"para_title">(?P.+) \((?P[\d.,]+) (?P[\w^_]+)\)' OFFLINE_PATTERN = r'>(File not found|Access Denied|404 Not Found)' LINK_PATTERN = r'"(https?://\w+\.uptobox\.com/d/.*?)"' diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py index 5057e593a..4e91f62bd 100644 --- a/module/plugins/hoster/VeohCom.py +++ b/module/plugins/hoster/VeohCom.py @@ -18,10 +18,10 @@ class VeohCom(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - FILE_NAME_PATTERN = r'Sorry, we couldn\'t find the video you were looking for' - FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.veoh.com/watch/\g')] + URL_REPLACEMENTS = [(__pattern__, r'http://www.veoh.com/watch/\g')] COOKIES = [(".veoh.com", "lassieLocale", "en")] diff --git a/module/plugins/hoster/VidPlayNet.py b/module/plugins/hoster/VidPlayNet.py index c5835639e..76af05edd 100644 --- a/module/plugins/hoster/VidPlayNet.py +++ b/module/plugins/hoster/VidPlayNet.py @@ -3,13 +3,13 @@ # Test links: # BigBuckBunny_320x180.mp4 - 61.7 Mb - http://vidplay.net/38lkev0h3jv0 -from module.plugins.internal.XFSPHoster import XFSPHoster, create_getInfo +from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo -class VidPlayNet(XFSPHoster): +class VidPlayNet(XFSHoster): __name__ = "VidPlayNet" __type__ = "hoster" - __version__ = "0.03" + __version__ = "0.04" __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}' @@ -18,9 +18,9 @@ class VidPlayNet(XFSPHoster): __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] - HOSTER_NAME = "vidplay.net" + HOSTER_DOMAIN = "vidplay.net" - FILE_NAME_PATTERN = r'Password:
    \s*(?P[^<]+)' + NAME_PATTERN = r'Password:
    \s*(?P[^<]+)' getInfo = create_getInfo(VidPlayNet) diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py index 14e0c7a26..1d016961f 100644 --- a/module/plugins/hoster/VimeoCom.py +++ b/module/plugins/hoster/VimeoCom.py @@ -19,11 +19,11 @@ class VimeoCom(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - FILE_NAME_PATTERN = r'(?P<N>.+) on Vimeo<' + NAME_PATTERN = r'<title>(?P<N>.+) on Vimeo<' OFFLINE_PATTERN = r'class="exception_header"' TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<' - FILE_URL_REPLACEMENTS = [(__pattern__, r'https://www.vimeo.com/\g<ID>')] + URL_REPLACEMENTS = [(__pattern__, r'https://www.vimeo.com/\g<ID>')] COOKIES = [(".vimeo.com", "language", "en")] diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py index 4aa3faf44..21ac7263d 100644 --- a/module/plugins/hoster/WrzucTo.py +++ b/module/plugins/hoster/WrzucTo.py @@ -19,8 +19,8 @@ class WrzucTo(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>' - FILE_SIZE_PATTERN = r'class="info">\s*<tr>\s*<td>(?P<S>.*?)</td>' + NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>' + SIZE_PATTERN = r'class="info">\s*<tr>\s*<td>(?P<S>.*?)</td>' COOKIES = [(".wrzuc.to", "language", "en")] diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py index de028afc0..bed1d71ad 100644 --- a/module/plugins/hoster/YibaishiwuCom.py +++ b/module/plugins/hoster/YibaishiwuCom.py @@ -18,8 +18,8 @@ class YibaishiwuCom(SimpleHoster): __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] - FILE_NAME_PATTERN = r'file_name: \'(?P<N>.+?)\'' - FILE_SIZE_PATTERN = r'file_size: \'(?P<S>.+?)\'' + NAME_PATTERN = r'file_name: \'(?P<N>.+?)\'' + SIZE_PATTERN = r'file_size: \'(?P<S>.+?)\'' OFFLINE_PATTERN = ur'<h3><i style="color:red;">哎呀！提取码不存在！不妨搜搜看吧！</i></h3>' LINK_PATTERN = r'(/\?ct=(pickcode|download)[^"\']+)' diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 3dca83d7f..565aa63f0 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -54,7 +54,7 @@ class YoutubeCom(Hoster): ("zoidberg", "zoidberg@mujmail.cz")] - FILE_URL_REPLACEMENTS = [(r'youtu\.be/', 'youtube.com/')] + URL_REPLACEMENTS = [(r'youtu\.be/', 'youtube.com/')] # Invalid characters that must be removed from the file name invalidChars = u'\u2605:?><"|\\' @@ -88,7 +88,7 @@ class YoutubeCom(Hoster): def process(self, pyfile): - pyfile.url = replace_patterns(pyfile.url, self.FILE_URL_REPLACEMENTS) + pyfile.url = replace_patterns(pyfile.url, self.URL_REPLACEMENTS) html = self.load(pyfile.url, decode=True) if re.search(r'<div id="player-unavailable" class="\s*player-width player-height\s*">', html): diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 549df73e0..f34c23c3b 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -20,8 +20,8 @@ class ZippyshareCom(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - FILE_NAME_PATTERN = r'<title>Zippyshare.com - (?P<N>.+)' - FILE_SIZE_PATTERN = r'>Size:.+?">(?P[\d.,]+) (?P[\w^_]+)' + NAME_PATTERN = r'Zippyshare.com - (?P<N>.+)' + SIZE_PATTERN = r'>Size:.+?">(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>File does not exist on this server<' -- cgit v1.2.3