1 files changed, 22 insertions, 31 deletions

diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py
index ab3097854..0f09731e4 100644
--- a/module/plugins/hoster/IfolderRu.py
+++ b/module/plugins/hoster/IfolderRu.py
@@ -8,9 +8,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class IfolderRu(SimpleHoster):
     __name__    = "IfolderRu"
     __type__    = "hoster"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
-    __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+).*'
+    __pattern__ = r'http://(?:www)?(files\.)?(ifolder\.ru|metalarea\.org|rusfolder\.(com|net|ru))/(files/)?(?P<ID>\d+)'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Ifolder.ru hoster plugin"""
     __license__     = "GPLv3"
@@ -18,49 +19,40 @@ class IfolderRu(SimpleHoster):
 
 
     SIZE_REPLACEMENTS = [(u'Кб', 'KB'), (u'Мб', 'MB'), (u'Гб', 'GB')]
-    NAME_PATTERN = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>'
-    SIZE_PATTERN = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
-    OFFLINE_PATTERN = ur'<p>Файл номер <b>[^<]*</b> (не найден|удален) !!!</p>'
 
-    SESSION_ID_PATTERN = r'<a href=(http://ints\.(?:rusfolder\.com|ifolder\.ru)/ints/sponsor/\?bi=\d*&session=([^&]+)&u=[^>]+)>'
-    INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "([^"]+)";\}'
+    NAME_PATTERN    = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>'
+    SIZE_PATTERN    = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
+    OFFLINE_PATTERN = ur'<p>Файл номер <b>.*?</b> (не найден|удален) !!!</p>'
+
+    SESSION_ID_PATTERN = r'<input type="hidden" name="session" value="(.+?)"'
+    INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "(.+?)";\}'
     HIDDEN_INPUT_PATTERN = r'var v = .*?name=\'(.+?)\' value=\'1\''
-    LINK_PATTERN = r'<a id="download_file_href" href="([^"]+)"'
+
+    LINK_FREE_PATTERN = r'<a href="(.+?)" class="downloadbutton_files"'
+
     WRONG_CAPTCHA_PATTERN = ur'<font color=Red>неверный код,<br>введите еще раз</font><br>'
 
 
     def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
-        self.chunkLimit = 1
+        self.resumeDownload = self.multiDL = bool(self.account)
+        self.chunkLimit     = 1
 
 
-    def process(self, pyfile):
-        file_id = re.match(self.__pattern__, pyfile.url).group('ID')
-        self.html = self.load("http://rusfolder.com/%s" % file_id, cookies=True, decode=True)
+    def handleFree(self, pyfile):
+        url = "http://rusfolder.com/%s" % self.info['pattern']['ID']
+        self.html = self.load("http://rusfolder.com/%s" % self.info['pattern']['ID'], decode=True)
         self.getFileInfo()
 
-        url = re.search(r"location\.href = '(http://ints\..*?=)'", self.html).group(1)
-        self.html = self.load(url, cookies=True, decode=True)
-
-        url, session_id = re.search(self.SESSION_ID_PATTERN, self.html).groups()
-        self.html = self.load(url, cookies=True, decode=True)
-
-        url = "http://ints.rusfolder.com/ints/frame/?session=%s" % session_id
-        self.html = self.load(url, cookies=True)
-
-        self.wait(31, False)
+        session_id = re.search(self.SESSION_ID_PATTERN, self.html).groups()
 
         captcha_url = "http://ints.rusfolder.com/random/images/?session=%s" % session_id
         for _i in xrange(5):
-            self.html = self.load(url, cookies=True)
-            action, inputs = self.parseHtmlForm('ID="Form1"')
-            inputs['ints_session'] = re.search(self.INTS_SESSION_PATTERN, self.html).group(1)
-            inputs[re.search(self.HIDDEN_INPUT_PATTERN, self.html).group(1)] = '1'
+            action, inputs = self.parseHtmlForm('id="download-step-one-form"')
             inputs['confirmed_number'] = self.decryptCaptcha(captcha_url, cookies=True)
             inputs['action'] = '1'
             self.logDebug(inputs)
 
-            self.html = self.load(url, decode=True, cookies=True, post=inputs)
+            self.html = self.load(url, decode=True, post=inputs)
             if self.WRONG_CAPTCHA_PATTERN in self.html:
                 self.invalidCaptcha()
             else:
@@ -68,9 +60,8 @@ class IfolderRu(SimpleHoster):
         else:
             self.fail(_("Invalid captcha"))
 
-        download_url = re.search(self.LINK_PATTERN, self.html).group(1)
-        self.correctCaptcha()
-        self.download(download_url)
+        self.link = re.search(self.LINK_FREE_PATTERN, self.html).group(1)
 
 
 getInfo = create_getInfo(IfolderRu)
+