diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/accounts/SmoozedCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/hooks/RehostTo.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/SmoozedCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/Ftp.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/RapidgatorNet.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/SmoozedCom.py | 4 | 
6 files changed, 11 insertions, 12 deletions
| diff --git a/module/plugins/accounts/SmoozedCom.py b/module/plugins/accounts/SmoozedCom.py index d192f20cf..e6c25752b 100644 --- a/module/plugins/accounts/SmoozedCom.py +++ b/module/plugins/accounts/SmoozedCom.py @@ -12,7 +12,7 @@ from module.plugins.Account import Account  class SmoozedCom(Account):      __name__    = "SmoozedCom"      __type__    = "account" -    __version__ = "0.02" +    __version__ = "0.03"      __description__ = """Smoozed.com account plugin"""      __license__     = "GPLv3" @@ -33,7 +33,7 @@ class SmoozedCom(Account):              # Parse account info              info = {'validuntil' : float(status["data"]["user"]["user_premium"]),                      'trafficleft': max(0, status["data"]["traffic"][1] - status["data"]["traffic"][0]), -                    'session_key': status["data"]["session_key"], +                    'session'    : status["data"]["session_key"],                      'hosters'    : [hoster["name"] for hoster in status["data"]["hoster"]]}              if info['validuntil'] < time(): diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py index 653a0444e..ddb8b3eb0 100644 --- a/module/plugins/hooks/RehostTo.py +++ b/module/plugins/hooks/RehostTo.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHook import MultiHook  class RehostTo(MultiHook):      __name__    = "RehostTo"      __type__    = "hook" -    __version__ = "0.5" +    __version__ = "0.50"      __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ), diff --git a/module/plugins/hooks/SmoozedCom.py b/module/plugins/hooks/SmoozedCom.py index 4e706c959..9ba2daac9 100644 --- a/module/plugins/hooks/SmoozedCom.py +++ b/module/plugins/hooks/SmoozedCom.py @@ -6,7 +6,7 @@ from module.plugins.internal.MultiHook import MultiHook  class SmoozedCom(MultiHook):      __name__    = "SmoozedCom"      __type__    = "hook" -    __version__ = "0.02" +    __version__ = "0.03"      __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ), @@ -23,4 +23,4 @@ class SmoozedCom(MultiHook):      def getHosters(self):          user, data = self.account.selectAccount() -        return self.account.getAccountData(user)["hosters"] +        return self.account.getAccountInfo(user)["hosters"] diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py index 3daf50bc5..8562778c4 100644 --- a/module/plugins/hoster/Ftp.py +++ b/module/plugins/hoster/Ftp.py @@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster  class Ftp(Hoster):      __name__    = "Ftp"      __type__    = "hoster" -    __version__ = "0.45" +    __version__ = "0.46"      __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' @@ -43,7 +43,7 @@ class Ftp(Hoster):              if netloc in servers:                  self.logDebug("Logging on to %s" % netloc) -                self.req.addAuth(self.account.getAccountData(netloc)['password']) +                self.req.addAuth(self.account.getAccountInfo(netloc)['password'])              else:                  pwd = self.getPassword()                  if ':' in pwd: diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index 4d192d602..84c3b20d6 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, s  class RapidgatorNet(SimpleHoster):      __name__    = "RapidgatorNet"      __type__    = "hoster" -    __version__ = "0.28" +    __version__ = "0.29"      __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' @@ -46,7 +46,7 @@ class RapidgatorNet(SimpleHoster):      def setup(self):          if self.account: -            self.sid = self.account.getAccountData(self.user).get('SID', None) +            self.sid = self.account.getAccountInfo(self.user).get('SID', None)          else:              self.sid = None @@ -85,7 +85,6 @@ class RapidgatorNet(SimpleHoster):      def handlePremium(self, pyfile): -        #self.logDebug("ACCOUNT_DATA", self.account.getAccountData(self.user))          self.api_data = self.api_response('info')          self.api_data['md5'] = self.api_data['hash'] diff --git a/module/plugins/hoster/SmoozedCom.py b/module/plugins/hoster/SmoozedCom.py index a5116db16..bd653ff59 100644 --- a/module/plugins/hoster/SmoozedCom.py +++ b/module/plugins/hoster/SmoozedCom.py @@ -7,7 +7,7 @@ from module.plugins.internal.MultiHoster import MultiHoster  class SmoozedCom(MultiHoster):      __name__    = "SmoozedCom"      __type__    = "hoster" -    __version__ = "0.02" +    __version__ = "0.03"      __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady @@ -29,7 +29,7 @@ class SmoozedCom(MultiHoster):              pyfile.name = ".".join(temp)          # Check the link -        get_data = {'session_key': self.account.getAccountData(self.user)['session_key'], +        get_data = {'session_key': self.account.getAccountInfo(self.user)['session'],                      'url'        : pyfile.url}          data = json_loads(self.load("http://www2.smoozed.com/api/check", get=get_data)) | 
