diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
| commit | 4aa8241528f997509282bd9c8edbc83d7096d66a (patch) | |
| tree | 45148d014c8129c8cd1f2935adf49f9725280948 /pyload/plugins/addons/IRCInterface.py | |
| parent | added missing init file (diff) | |
| parent | Using the same translatable string (diff) | |
| download | pyload-4aa8241528f997509282bd9c8edbc83d7096d66a.tar.xz | |
Merge plugins from stable
Conflicts:
module/plugins/hoster/UnrestrictLi.py
pyload/plugins/hooks/Captcha9kw.py
pyload/plugins/hoster/AlldebridCom.py
pyload/plugins/hoster/BitshareCom.py
pyload/plugins/hoster/EgoFilesCom.py
pyload/plugins/hoster/FreakshareCom.py
pyload/plugins/hoster/LuckyShareNet.py
pyload/plugins/hoster/Premium4Me.py
pyload/plugins/hoster/PremiumizeMe.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/RealdebridCom.py
pyload/plugins/hoster/ShareplaceCom.py
pyload/plugins/hoster/UploadedTo.py
pyload/plugins/hoster/UploadingCom.py
pyload/plugins/hoster/Xdcc.py
pyload/plugins/hoster/YourfilesTo.py
pyload/plugins/hoster/ZeveraCom.py
Diffstat (limited to 'pyload/plugins/addons/IRCInterface.py')
| -rw-r--r-- | pyload/plugins/addons/IRCInterface.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pyload/plugins/addons/IRCInterface.py b/pyload/plugins/addons/IRCInterface.py index c261fc6f3..821f80b6c 100644 --- a/pyload/plugins/addons/IRCInterface.py +++ b/pyload/plugins/addons/IRCInterface.py @@ -36,7 +36,7 @@ from pycurl import FORM_FILE class IRCInterface(Thread, Addon): __name__ = "IRCInterface" - __version__ = "0.1" + __version__ = "0.11" __description__ = """connect to irc and let owner perform different tasks""" __config__ = [("activated", "bool", "Activated", "False"), ("host", "str", "IRC-Server Address", "Enter your server here!"), @@ -105,8 +105,8 @@ class IRCInterface(Thread, Addon): for t in self.getConfig("owner").split(): if t.strip().startswith("#"): self.sock.send("JOIN %s\r\n" % t.strip()) - self.log.info("pyLoad IRC: Connected to %s!" % host) - self.log.info("pyLoad IRC: Switching to listening mode!") + self.logInfo("pyLoad IRC: Connected to %s!" % host) + self.logInfo("pyLoad IRC: Switching to listening mode!") try: self.main_loop() @@ -167,15 +167,15 @@ class IRCInterface(Thread, Addon): # HANDLE CTCP ANTI FLOOD/BOT PROTECTION if msg["text"] == "\x01VERSION\x01": - self.log.debug("Sending CTCP VERSION.") + self.logDebug("Sending CTCP VERSION.") self.sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface")) return elif msg["text"] == "\x01TIME\x01": - self.log.debug("Sending CTCP TIME.") + self.logDebug("Sending CTCP TIME.") self.sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time())) return elif msg["text"] == "\x01LAG\x01": - self.log.debug("Received CTCP LAG.") # don't know how to answer + self.logDebug("Received CTCP LAG.") # don't know how to answer return trigger = "pass" @@ -195,7 +195,7 @@ class IRCInterface(Thread, Addon): for line in res: self.response(line, msg["origin"]) except Exception, e: - self.log.error("pyLoad IRC: "+ repr(e)) + self.logError("pyLoad IRC: "+ repr(e)) def response(self, msg, origin=""): |