Code cleanup

2 files changed, 8 insertions, 14 deletions

diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py
index 6b8fbd8f0..211f990ab 100644
--- a/module/plugins/hoster/EgoFilesCom.py
+++ b/module/plugins/hoster/EgoFilesCom.py
@@ -4,16 +4,12 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.plugins.ReCaptcha import ReCaptcha

 import re

 

-def to_seconds(m):

-    minutes = int(m['m']) if m['m'] else 0

-    seconds = int(m['s']) if m['s'] else 0

-    return minutes * 60 + seconds

 

 class EgoFilesCom(SimpleHoster):

     __name__ = "EgoFilesCom"

     __type__ = "hoster"

     __pattern__ = r"https?://(www\.)?egofiles.com/(\w+)"

-    __version__ = "0.08"

+    __version__ = "0.09"

     __description__ = """Egofiles.com Download Hoster"""

     __author_name__ = ("stickell")

     __author_mail__ = ("l.stickell@yahoo.it")

@@ -40,8 +36,9 @@ class EgoFilesCom(SimpleHoster):
 

         # Wait time between free downloads

         if 'For next free download you have to wait' in self.html:

-            m = re.search(self.WAIT_TIME_PATTERN, self.html)

-            self.setWait(to_seconds(m.groupdict()), True)

+            m = re.search(self.WAIT_TIME_PATTERN, self.html).groupdict('0')

+            waittime = int(m['m']) * 60 + int(m['s'])

+            self.setWait(waittime, True)

             self.wait()

 

         downloadURL = ''

diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py
index 59953274f..51ec9e385 100644
--- a/module/plugins/hoster/RyushareCom.py
+++ b/module/plugins/hoster/RyushareCom.py
@@ -2,16 +2,12 @@
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 import re
 
-def to_seconds(m):
-    minutes = int(m['min']) if m['min'] else 0
-    seconds = int(m['sec']) if m['sec'] else 0
-    return minutes * 60 + seconds
 
 class RyushareCom(XFileSharingPro):
     __name__ = "RyushareCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*?ryushare.com/\w{11,}"
-    __version__ = "0.08"
+    __version__ = "0.09"
     __description__ = """ryushare.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
@@ -42,8 +38,9 @@ class RyushareCom(XFileSharingPro):
             if 'You have reached the download-limit!!!' in self.html:
                 self.setWait(3600, True)
             else:
-                m = re.search(self.WAIT_PATTERN, self.html)
-                self.setWait(to_seconds(m.groupdict()))
+                m = re.search(self.WAIT_PATTERN, self.html).groupdict('0')
+                waittime = int(m['m']) * 60 + int(m['s'])
+                self.setWait(waittime)
             self.wait()
 
             self.html = self.load(self.pyfile.url, post = inputs)