diff options
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/TurbobitNet.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/XDCC.py | 10 | ||||
| -rw-r--r-- | module/plugins/hoster/YoutubeCom.py | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py index 724ac0916..081b5579b 100644 --- a/module/plugins/hoster/TurbobitNet.py +++ b/module/plugins/hoster/TurbobitNet.py @@ -17,7 +17,7 @@ from module.plugins.internal.misc import timestamp class TurbobitNet(SimpleHoster): __name__ = "TurbobitNet" __type__ = "hoster" - __version__ = "0.26" + __version__ = "0.27" __status__ = "broken" __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' @@ -103,7 +103,7 @@ class TurbobitNet(SimpleHoster): if rtUpdate: return rtUpdate - if self.db.retrieve("version") is not self.__version__ or \ + if self.db.retrieve("version") != self.__version__ or \ int(self.db.retrieve("timestamp", 0)) + 86400000 < timestamp(): #: that's right, we are even using jdownloader updates rtUpdate = self.load("http://update0.jdownloader.org/pluginstuff/tbupdate.js") diff --git a/module/plugins/hoster/XDCC.py b/module/plugins/hoster/XDCC.py index 405673fa4..172ba2fbd 100644 --- a/module/plugins/hoster/XDCC.py +++ b/module/plugins/hoster/XDCC.py @@ -14,7 +14,7 @@ from module.plugins.internal.misc import fsjoin class XDCC(Hoster): __name__ = "XDCC" __type__ = "hoster" - __version__ = "0.39" + __version__ = "0.40" __status__ = "testing" __config__ = [("nick", "str", "Nickname", "pyload"), @@ -149,7 +149,7 @@ class XDCC(Hoster): 'text': msg[3][1:] } - if nick is msg['target'][0:len(nick)] and "PRIVMSG" is msg['action']: + if nick == msg['target'][0:len(nick)] and "PRIVMSG" == msg['action']: if msg['text'] == "\x01VERSION\x01": self.log_debug("Sending CTCP VERSION") sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface")) @@ -159,8 +159,8 @@ class XDCC(Hoster): elif msg['text'] == "\x01LAG\x01": pass #: don't know how to answer - if not (bot is msg['origin'][0:len(bot)] - and nick is msg['target'][0:len(nick)] + if not (bot == msg['origin'][0:len(bot)] + and nick == msg['target'][0:len(nick)] and msg['action'] in ("PRIVMSG", "NOTICE")): continue @@ -194,7 +194,7 @@ class XDCC(Hoster): self.pyfile.setStatus("downloading") newname = self.req.download(ip, port, filename, sock, self.pyfile.setProgress) - if newname and newname is not filename: + if newname and newname != filename: self.log_info(_("%(name)s saved as %(newname)s") % {'name': self.pyfile.name, 'newname': newname}) filename = newname diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 3f625492f..6c423b84a 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -12,7 +12,7 @@ from module.plugins.internal.misc import html_unescape, replace_patterns, which class YoutubeCom(Hoster): __name__ = "YoutubeCom" __type__ = "hoster" - __version__ = "0.49" + __version__ = "0.50" __status__ = "testing" __pattern__ = r'https?://(?:[^/]*\.)?(youtu\.be/|youtube\.com/watch\?(?:.*&)?v=)\w+' @@ -111,7 +111,7 @@ class YoutubeCom(Hoster): if not streams: self.fail(_("No available stream meets your preferences")) - fmt_dict = dict([x for x in streams if self.formats[x[0]][4] is use3d] or streams) + fmt_dict = dict([x for x in streams if self.formats[x[0]][4] == use3d] or streams) self.log_debug("DESIRED STREAM: ITAG:%d (%s) %sfound, %sallowed" % (desired_fmt, "%s %dx%d Q:%d 3D:%s" % self.formats[desired_fmt], |