summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2013-07-17 03:20:29 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2013-07-17 03:20:29 +0200
commit5d6b8fdb79eb10b3b96cb265860d0d02d112af60 (patch)
tree4b11a41a91eb36b9f3cf5492392f4871bb733f43 /module/plugins
parentNew crypter plugin requested in #190 (diff)
downloadpyload-5d6b8fdb79eb10b3b96cb265860d0d02d112af60.tar.xz
fixed log api call for several plugins
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/hooks/ClickAndLoad.py6
-rw-r--r--module/plugins/hooks/Ev0InFetcher.py8
-rw-r--r--module/plugins/hooks/ExtractArchive.py4
-rw-r--r--module/plugins/hooks/HotFolder.py4
-rw-r--r--module/plugins/hooks/IRCInterface.py14
-rw-r--r--module/plugins/hooks/MergeFiles.py10
-rw-r--r--module/plugins/hooks/MultiHome.py4
-rw-r--r--module/plugins/hooks/RehostTo.py4
-rw-r--r--module/plugins/hooks/UpdateManager.py18
-rw-r--r--module/plugins/hooks/XMPPInterface.py20
-rw-r--r--module/plugins/hoster/ARD.py4
-rw-r--r--module/plugins/hoster/AlldebridCom.py4
-rw-r--r--module/plugins/hoster/DepositfilesCom.py8
-rw-r--r--module/plugins/hoster/FileApeCom.py4
-rw-r--r--module/plugins/hoster/FilesMailRu.py4
-rw-r--r--module/plugins/hoster/NetloadIn.py36
-rw-r--r--module/plugins/hoster/RapidshareCom.py22
-rw-r--r--module/plugins/hoster/RealdebridCom.py6
-rw-r--r--module/plugins/hoster/RehostTo.py6
-rw-r--r--module/plugins/hoster/ShareplaceCom.py4
-rw-r--r--module/plugins/hoster/UlozTo.py4
-rw-r--r--module/plugins/hoster/UploadedTo.py6
-rw-r--r--module/plugins/hoster/UploadheroCom.py6
-rw-r--r--module/plugins/hoster/UploadingCom.py4
-rw-r--r--module/plugins/hoster/VeehdCom.py4
-rw-r--r--module/plugins/hoster/WuploadCom.py4
-rw-r--r--module/plugins/hoster/Xdcc.py14
-rw-r--r--module/plugins/hoster/YourfilesTo.py4
28 files changed, 118 insertions, 118 deletions
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index 97e5cd57d..230143cef 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -25,7 +25,7 @@ from module.plugins.Hook import Hook
class ClickAndLoad(Hook):
__name__ = "ClickAndLoad"
- __version__ = "0.2"
+ __version__ = "0.21"
__description__ = """Gives abillity to use jd's click and load. depends on webinterface"""
__config__ = [("activated", "bool", "Activated", "True"),
("extern", "bool", "Allow external link adding", "False")]
@@ -43,7 +43,7 @@ class ClickAndLoad(Hook):
thread.start_new_thread(proxy, (self, ip, self.port, 9666))
except:
- self.log.error("ClickAndLoad port already in use.")
+ self.logError("ClickAndLoad port already in use.")
def proxy(self, *settings):
@@ -71,7 +71,7 @@ def server(self, *settings):
errno = e.args[0]
if errno == 98:
- self.core.log.warning(_("Click'N'Load: Port 9666 already in use"))
+ self.logWarning(_("Click'N'Load: Port 9666 already in use"))
return
thread.start_new_thread(server, (self,) + settings)
except:
diff --git a/module/plugins/hooks/Ev0InFetcher.py b/module/plugins/hooks/Ev0InFetcher.py
index 5941cf38c..d29f89c2f 100644
--- a/module/plugins/hooks/Ev0InFetcher.py
+++ b/module/plugins/hooks/Ev0InFetcher.py
@@ -22,7 +22,7 @@ from module.plugins.Hook import Hook
class Ev0InFetcher(Hook):
__name__ = "Ev0InFetcher"
- __version__ = "0.2"
+ __version__ = "0.21"
__description__ = """checks rss feeds for ev0.in"""
__config__ = [("activated", "bool", "Activated", "False"),
("interval", "int", "Check interval in minutes", "10"),
@@ -73,15 +73,15 @@ class Ev0InFetcher(Hook):
if show.lower() in normalizefiletitle(item['title']) and lastfound < int(mktime(item.date_parsed)):
links = self.filterLinks(item['description'].split("<br />"))
packagename = item['title'].encode("utf-8")
- self.core.log.info("Ev0InFetcher: new episode '%s' (matched '%s')" % (packagename, show))
+ self.logInfo("Ev0InFetcher: new episode '%s' (matched '%s')" % (packagename, show))
self.core.api.addPackage(packagename, links, 1 if self.getConfig("queue") else 0)
self.setStorage("show_%s_lastfound" % show, int(mktime(item.date_parsed)))
found = True
if not found:
- #self.core.log.debug("Ev0InFetcher: no new episodes found")
+ #self.logDebug("Ev0InFetcher: no new episodes found")
pass
for show, lastfound in self.getStorage().iteritems():
if int(lastfound) > 0 and int(lastfound) + (3600*24*30) < int(time()):
self.delStorage("show_%s_lastfound" % show)
- self.core.log.debug("Ev0InFetcher: cleaned '%s' record" % show)
+ self.logDebug("Ev0InFetcher: cleaned '%s' record" % show)
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index f55589fec..bc5aa0f49 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -58,7 +58,7 @@ class ExtractArchive(Hook):
Provides: unrarFinished (folder, filename)
"""
__name__ = "ExtractArchive"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = "Extract different kind of archives"
__config__ = [("activated", "bool", "Activated", True),
("fullpath", "bool", "Extract full path", True),
@@ -310,4 +310,4 @@ class ExtractArchive(Hook):
gid = getgrnam(self.config["permission"]["group"])[2]
chown(f, uid, gid)
except Exception, e:
- self.log.warning(_("Setting User and Group failed"), e)
+ self.logWarning(_("Setting User and Group failed"), e)
diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index ee1031ad5..fd889fa22 100644
--- a/module/plugins/hooks/HotFolder.py
+++ b/module/plugins/hooks/HotFolder.py
@@ -30,7 +30,7 @@ from module.plugins.Hook import Hook
class HotFolder(Hook):
__name__ = "HotFolder"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = """observe folder and file for changes and add container and links"""
__config__ = [ ("activated", "bool", "Activated" , "False"),
("folder", "str", "Folder to observe", "container"),
@@ -79,7 +79,7 @@ class HotFolder(Hook):
newpath = join(self.getConfig("folder"), "finished", f if self.getConfig("keep") else "tmp_"+f)
move(path, newpath)
- self.log.info(_("Added %s from HotFolder") % f)
+ self.logInfo(_("Added %s from HotFolder") % f)
self.core.api.addPackage(f, [newpath], 1)
\ No newline at end of file
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index a9fc11f53..b9f3c1ba6 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -36,7 +36,7 @@ from pycurl import FORM_FILE
class IRCInterface(Thread, Hook):
__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, Hook):
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, Hook):
# 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, Hook):
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=""):
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 02d343096..613e6575a 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -30,7 +30,7 @@ BUFFER_SIZE = 4096
class MergeFiles(Hook):
__name__ = "MergeFiles"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = "Merges parts splitted with hjsplit"
__config__ = [
("activated" , "bool" , "Activated" , "False"),
@@ -60,11 +60,11 @@ class MergeFiles(Hook):
download_folder = save_join(download_folder, pack.folder)
for name, file_list in files.iteritems():
- self.core.log.info("Starting merging of %s" % name)
+ self.logInfo("Starting merging of %s" % name)
final_file = open(join(download_folder, fs_encode(name)), "wb")
for splitted_file in file_list:
- self.core.log.debug("Merging part %s" % splitted_file)
+ self.logDebug("Merging part %s" % splitted_file)
pyfile = self.core.files.getFile(fid_dict[splitted_file])
pyfile.setStatus("processing")
try:
@@ -80,7 +80,7 @@ class MergeFiles(Hook):
else:
break
s_file.close()
- self.core.log.debug("Finished merging part %s" % splitted_file)
+ self.logDebug("Finished merging part %s" % splitted_file)
except Exception, e:
print traceback.print_exc()
finally:
@@ -89,6 +89,6 @@ class MergeFiles(Hook):
pyfile.release()
final_file.close()
- self.core.log.info("Finished merging of %s" % name)
+ self.logInfo("Finished merging of %s" % name)
diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py
index f15148538..ddf8db69f 100644
--- a/module/plugins/hooks/MultiHome.py
+++ b/module/plugins/hooks/MultiHome.py
@@ -22,7 +22,7 @@ from time import time
class MultiHome(Hook):
__name__ = "MultiHome"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = """ip address changer"""
__config__ = [ ("activated", "bool", "Activated" , "False"),
("interfaces", "str", "Interfaces" , "None") ]
@@ -54,7 +54,7 @@ class MultiHome(Hook):
if iface:
iface.useFor(pluginName, account)
requestFactory.iface = lambda: iface.adress
- self.log.debug("Multihome: using address: "+iface.adress)
+ self.logDebug("Multihome: using address: "+iface.adress)
return oldGetRequest(pluginName, account)
requestFactory.getRequest = getRequest
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostTo.py
index 7ca5e5cde..cd9f7ccef 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostTo.py
@@ -5,7 +5,7 @@ from module.plugins.internal.MultiHoster import MultiHoster
class RehostTo(MultiHoster):
__name__ = "RehostTo"
- __version__ = "0.42"
+ __version__ = "0.43"
__type__ = "hook"
__config__ = [("activated", "bool", "Activated", "False"),
@@ -31,7 +31,7 @@ class RehostTo(MultiHoster):
user = self.account.selectAccount()[0]
if not user:
- self.log.error("Rehost.to: "+ _("Please add your rehost.to account first and restart pyLoad"))
+ self.logError("Rehost.to: "+ _("Please add your rehost.to account first and restart pyLoad"))
return
data = self.account.getAccountInfo(user)
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index c800b44bf..b30289287 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -29,7 +29,7 @@ from module.plugins.Hook import threaded, Expose, Hook
class UpdateManager(Hook):
__name__ = "UpdateManager"
- __version__ = "0.13"
+ __version__ = "0.15"
__description__ = """checks for updates"""
__config__ = [("activated", "bool", "Activated", "True"),
("interval", "int", "Check interval in minutes", "480"),
@@ -70,12 +70,12 @@ class UpdateManager(Hook):
if self.updated and not self.reloaded:
self.info["plugins"] = True
- self.log.info(_("*** Plugins have been updated, please restart pyLoad ***"))
+ self.logInfo(_("*** Plugins have been updated, please restart pyLoad ***"))
elif self.updated and self.reloaded:
- self.log.info(_("Plugins updated and reloaded"))
+ self.logInfo(_("Plugins updated and reloaded"))
self.updated = False
elif self.version == "None":
- self.log.info(_("No plugin updates available"))
+ self.logInfo(_("No plugin updates available"))
@Expose
def recheckForUpdates(self):
@@ -92,16 +92,16 @@ class UpdateManager(Hook):
# Still no updates, plugins will be checked
if self.version == "None":
- self.log.info(_("No Updates for pyLoad"))
+ self.logInfo(_("No Updates for pyLoad"))
return version_check[1:]
self.info["pyload"] = True
- self.log.info(_("*** New pyLoad Version %s available ***") % self.version)
- self.log.info(_("*** Get it here: http://pyload.org/download ***"))
+ self.logInfo(_("*** New pyLoad Version %s available ***") % self.version)
+ self.logInfo(_("*** Get it here: http://pyload.org/download ***"))
except:
- self.log.warning(_("Not able to connect server for updates"))
+ self.logWarning(_("Not able to connect server for updates"))
return None # Nothing will be done
@@ -145,7 +145,7 @@ class UpdateManager(Hook):
if name in IGNORE or (type, name) in IGNORE:
continue
- self.log.info(_("New version of %(type)s|%(name)s : %(version).2f") % {
+ self.logInfo(_("New version of %(type)s|%(name)s : %(version).2f") % {
"type": type,
"name": name,
"version": float(version)
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index a96adf524..13a5aaadd 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -28,7 +28,7 @@ from module.plugins.hooks.IRCInterface import IRCInterface
class XMPPInterface(IRCInterface, JabberClient):
__name__ = "XMPPInterface"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = """connect to jabber and let owner perform different tasks"""
__config__ = [("activated", "bool", "Activated", "False"),
("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"),
@@ -97,22 +97,22 @@ class XMPPInterface(IRCInterface, JabberClient):
try:
self.loop()
except Exception, ex:
- self.core.log.error("pyLoad XMPP: %s" % str(ex))
+ self.logError("pyLoad XMPP: %s" % str(ex))
def stream_state_changed(self, state, arg):
"""This one is called when the state of stream connecting the component
to a server changes. This will usually be used to let the user
know what is going on."""
- self.log.debug("pyLoad XMPP: *** State changed: %s %r ***" % (state, arg))
+ self.logDebug("pyLoad XMPP: *** State changed: %s %r ***" % (state, arg))
def disconnected(self):
- self.log.debug("pyLoad XMPP: Client was disconnected")
+ self.logDebug("pyLoad XMPP: Client was disconnected")
def stream_closed(self, stream):
- self.log.debug("pyLoad XMPP: Stream was closed | %s" % stream)
+ self.logDebug("pyLoad XMPP: Stream was closed | %s" % stream)
def stream_error(self, err):
- self.log.debug("pyLoad XMPP: Stream Error: %s" % err)
+ self.logDebug("pyLoad XMPP: Stream Error: %s" % err)
def get_message_handlers(self):
"""Return list of (message_type, message_handler) tuples.
@@ -128,8 +128,8 @@ class XMPPInterface(IRCInterface, JabberClient):
subject = stanza.get_subject()
body = stanza.get_body()
t = stanza.get_type()
- self.log.debug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(), )))
- self.log.debug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body, subject, t))
+ self.logDebug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(), )))
+ self.logDebug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body, subject, t))
if t == "headline":
# 'headline' messages should never be replied to
@@ -173,7 +173,7 @@ class XMPPInterface(IRCInterface, JabberClient):
messages.append(m)
except Exception, e:
- self.log.error("pyLoad XMPP: " + repr(e))
+ self.logError("pyLoad XMPP: " + repr(e))
return messages
@@ -186,7 +186,7 @@ class XMPPInterface(IRCInterface, JabberClient):
def announce(self, message):
""" send message to all owners"""
for user in self.getConfig("owners").split(";"):
- self.log.debug("pyLoad XMPP: Send message to %s" % user)
+ self.logDebug("pyLoad XMPP: Send message to %s" % user)
to_jid = JID(user)
diff --git a/module/plugins/hoster/ARD.py b/module/plugins/hoster/ARD.py
index 5ab65cd4b..cda783091 100644
--- a/module/plugins/hoster/ARD.py
+++ b/module/plugins/hoster/ARD.py
@@ -39,7 +39,7 @@ class RTMP:
class ARD(Hoster):
__name__ = "ARD Mediathek"
- __version__ = "0.1"
+ __version__ = "0.11"
__pattern__ = r"http://www\.ardmediathek\.de/.*"
__config__ = []
@@ -73,7 +73,7 @@ class ARD(Hoster):
chown(location, uid, gid)
except Exception, e:
- self.log.warning(_("Setting User and Group failed: %s") % str(e))
+ self.logWarning(_("Setting User and Group failed: %s") % str(e))
output_file = save_join(location, save_path(pyfile.name)) + os.path.splitext(playpath)[1]
diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py
index efc96ff28..0b8b70d06 100644
--- a/module/plugins/hoster/AlldebridCom.py
+++ b/module/plugins/hoster/AlldebridCom.py
@@ -10,7 +10,7 @@ from module.utils import parseFileSize
class AlldebridCom(Hoster):
__name__ = "AlldebridCom"
- __version__ = "0.31"
+ __version__ = "0.32"
__type__ = "hoster"
__pattern__ = r"https?://.*alldebrid\..*"
@@ -37,7 +37,7 @@ class AlldebridCom(Hoster):
self.logError("Please enter your AllDebrid account or deactivate this plugin")
self.fail("No AllDebrid account provided")
- self.log.debug("AllDebrid: Old URL: %s" % pyfile.url)
+ self.logDebug("AllDebrid: Old URL: %s" % pyfile.url)
if re.match(self.__pattern__, pyfile.url):
new_url = pyfile.url
else:
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 850812c5d..ee5fdf6af 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,7 +11,7 @@ class DepositfilesCom(SimpleHoster):
__name__ = "DepositfilesCom"
__type__ = "hoster"
__pattern__ = r"http://[\w\.]*?(depositfiles\.com|dfiles\.eu)(/\w{1,3})?/files/[\w]+"
- __version__ = "0.43"
+ __version__ = "0.44"
__description__ = """Depositfiles.com Download Hoster"""
__author_name__ = ("spoob", "zoidberg")
__author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz")
@@ -35,7 +35,7 @@ class DepositfilesCom(SimpleHoster):
if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline()
if re.search(r'File is checked, please try again in a minute.', self.html) is not None:
- self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.")
+ self.logInfo("DepositFiles.com: The file is being checked. Waiting 1 minute.")
self.setWait(61)
self.wait()
self.retry()
@@ -43,7 +43,7 @@ class DepositfilesCom(SimpleHoster):
wait = re.search(r'html_download_api-limit_interval\">(\d+)</span>', self.html)
if wait:
wait_time = int(wait.group(1))
- self.log.info( "%s: Traffic used up. Waiting %d seconds." % (self.__name__, wait_time) )
+ self.logInfo( "%s: Traffic used up. Waiting %d seconds." % (self.__name__, wait_time) )
self.setWait(wait_time)
self.wantReconnect = True
self.wait()
@@ -52,7 +52,7 @@ class DepositfilesCom(SimpleHoster):
wait = re.search(r'>Try in (\d+) minutes or use GOLD account', self.html)
if wait:
wait_time = int(wait.group(1))
- self.log.info( "%s: All free slots occupied. Waiting %d minutes." % (self.__name__, wait_time) )
+ self.logInfo( "%s: All free slots occupied. Waiting %d minutes." % (self.__name__, wait_time) )
self.setWait(wait_time * 60, False)
wait = re.search(r'Please wait (\d+) sec', self.html)
diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py
index 1f933e776..f5182a788 100644
--- a/module/plugins/hoster/FileApeCom.py
+++ b/module/plugins/hoster/FileApeCom.py
@@ -9,7 +9,7 @@ class FileApeCom(Hoster):
__name__ = "FileApeCom"
__type__ = "hoster"
__pattern__ = r"http://(www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = """FileApe Download Hoster"""
__author_name__ = ("espes")
@@ -58,5 +58,5 @@ class FileApeCom(Hoster):
check = self.checkDownload({"exp": "Download ticket expired"})
if check == "exp":
- self.log.info("Ticket expired, retrying...")
+ self.logInfo("Ticket expired, retrying...")
self.retry() \ No newline at end of file
diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py
index 5f36de3c4..8c6a183c7 100644
--- a/module/plugins/hoster/FilesMailRu.py
+++ b/module/plugins/hoster/FilesMailRu.py
@@ -32,7 +32,7 @@ class FilesMailRu(Hoster):
__name__ = "FilesMailRu"
__type__ = "hoster"
__pattern__ = r"http://files\.mail\.ru/.*"
- __version__ = "0.3"
+ __version__ = "0.31"
__description__ = """Files.Mail.Ru One-Klick Hoster"""
__author_name__ = ("oZiRiz")
__author_mail__ = ("ich@oziriz.de")
@@ -96,5 +96,5 @@ class FilesMailRu(Hoster):
# (Loading 100MB in to ram is not an option)
check = self.checkDownload({"html": "<meta name="}, read_size=50000)
if check == "html":
- self.log.info(_("There was HTML Code in the Downloaded File("+ self.pyfile.name +")...redirect error? The Download will be restarted."))
+ self.logInfo(_("There was HTML Code in the Downloaded File("+ self.pyfile.name +")...redirect error? The Download will be restarted."))
self.retry()
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index e616badc2..ae0636979 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -55,7 +55,7 @@ class NetloadIn(Hoster):
__name__ = "NetloadIn"
__type__ = "hoster"
__pattern__ = r"https?://.*netload\.in/(?:datei(.*?)(?:\.htm|/)|index.php?id=10&file_id=)"
- __version__ = "0.42"
+ __version__ = "0.43"
__description__ = """Netload.in Download Hoster"""
__author_name__ = ("spoob", "RaNaN", "Gregy")
__author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "gregy@gregy.cz")
@@ -80,7 +80,7 @@ class NetloadIn(Hoster):
self.pyfile.name = self.api_data["filename"]
if self.premium:
- self.log.debug("Netload: Use Premium Account")
+ self.logDebug("Netload: Use Premium Account")
return True
if self.download_html():
@@ -109,7 +109,7 @@ class NetloadIn(Hoster):
self.download_api_data(n+1)
return
- self.log.debug("Netload: APIDATA: "+src)
+ self.logDebug("Netload: APIDATA: "+src)
self.api_data = {}
if src and ";" in src and src not in ("unknown file_data", "unknown_server_data", "No input file specified."):
lines = src.split(";")
@@ -131,21 +131,21 @@ class NetloadIn(Hoster):
def final_wait(self, page):
wait_time = self.get_wait_time(page)
self.setWait(wait_time)
- self.log.debug("Netload: final wait %d seconds" % wait_time)
+ self.logDebug("Netload: final wait %d seconds" % wait_time)
self.wait()
self.url = self.get_file_url(page)
def download_html(self):
- self.log.debug("Netload: Entering download_html")
+ self.logDebug("Netload: Entering download_html")
page = self.load(self.url, decode=True)
t = time() + 30
if "/share/templates/download_hddcrash.tpl" in page:
- self.log.error("Netload HDD Crash")
+ self.logError("Netload HDD Crash")
self.fail(_("File temporarily not available"))
if not self.api_data:
- self.log.debug("API Data may be useless, get details from html page")
+ self.logDebug("API Data may be useless, get details from html page")
if "* The file was deleted" in page:
self.offline()
@@ -165,21 +165,21 @@ class NetloadIn(Hoster):
t = time() + 30
if "/share/templates/download_hddcrash.tpl" in page:
- self.log.error("Netload HDD Crash")
+ self.logError("Netload HDD Crash")
self.fail(_("File temporarily not available"))
- self.log.debug("Netload: try number %d " % i)
+ self.logDebug("Netload: try number %d " % i)
if ">Your download is being prepared.<" in page:
- self.log.debug("Netload: We will prepare your download")
+ self.logDebug("Netload: We will prepare your download")
self.final_wait(page)
return True
if ">An access request has been made from IP address <" in page:
wait = self.get_wait_time(page)
if wait == 0:
- self.log.debug("Netload: Wait was 0 setting 30")
+ self.logDebug("Netload: Wait was 0 setting 30")
wait = 30
- self.log.info(_("Netload: waiting between downloads %d s." % wait))
+ self.logInfo(_("Netload: waiting between downloads %d s." % wait))
self.wantReconnect = True
self.setWait(wait)
self.wait()
@@ -187,7 +187,7 @@ class NetloadIn(Hoster):
return self.download_html()
- self.log.debug("Netload: Trying to find captcha")
+ self.logDebug("Netload: Trying to find captcha")
try:
url_captcha_html = "http://netload.in/" + re.search('(index.php\?id=10&amp;.*&amp;captcha=1)', page).group(1).replace("amp;", "")
@@ -199,7 +199,7 @@ class NetloadIn(Hoster):
page = self.load(url_captcha_html, cookies=True)
captcha_url = "http://netload.in/" + re.search('(share/includes/captcha.php\?t=\d*)', page).group(1)
except:
- self.log.debug("Netload: Could not find captcha, try again from beginning")
+ self.logDebug("Netload: Could not find captcha, try again from beginning")
captchawaited = False
continue
@@ -208,7 +208,7 @@ class NetloadIn(Hoster):
wait = self.get_wait_time(page)
if i == 0: self.pyfile.waitUntil = time() # dont wait contrary to time on website
else: self.pyfile.waitUntil = t
- self.log.info(_("Netload: waiting for captcha %d s.") % (self.pyfile.waitUntil - time()))
+ self.logInfo(_("Netload: waiting for captcha %d s.") % (self.pyfile.waitUntil - time()))
#self.setWait(wait)
self.wait()
captchawaited = True
@@ -226,12 +226,12 @@ class NetloadIn(Hoster):
if attempt is not None:
return attempt.group(1)
else:
- self.log.debug("Netload: Backup try for final link")
+ self.logDebug("Netload: Backup try for final link")
file_url_pattern = r"<a href=\"(.+)\" class=\"Orange_Link\">Click here"
attempt = re.search(file_url_pattern, page)
return "http://netload.in/"+attempt.group(1)
except:
- self.log.debug("Netload: Getting final link failed")
+ self.logDebug("Netload: Getting final link failed")
return None
def get_wait_time(self, page):
@@ -240,7 +240,7 @@ class NetloadIn(Hoster):
def proceed(self, url):
- self.log.debug("Netload: Downloading..")
+ self.logDebug("Netload: Downloading..")
self.download(url, disposition=True)
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 8b31dd42c..cbbf5115a 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -50,7 +50,7 @@ class RapidshareCom(Hoster):
__name__ = "RapidshareCom"
__type__ = "hoster"
__pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
- __version__ = "1.38"
+ __version__ = "1.39"
__description__ = """Rapidshare.com Download Hoster"""
__config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]]
__author_name__ = ("spoob", "RaNaN", "mkaay")
@@ -93,7 +93,7 @@ class RapidshareCom(Hoster):
self.handleFree()
elif self.api_data["status"] == "2":
- self.log.info(_("Rapidshare: Traffic Share (direct download)"))
+ self.logInfo(_("Rapidshare: Traffic Share (direct download)"))
self.pyfile.name = self.get_file_name()
self.download(self.pyfile.url, get={"directstart":1})
@@ -113,24 +113,24 @@ class RapidshareCom(Hoster):
#tmp = "#!download|%(server)s|%(id)s|%(name)s|%(size)s"
download = "http://%(host)s/cgi-bin/rsapi.cgi?sub=download&editparentlocation=0&bin=1&fileid=%(id)s&filename=%(name)s&dlauth=%(auth)s" % self.dl_dict
- self.log.debug("RS API Request: %s" % download)
+ self.logDebug("RS API Request: %s" % download)
self.download(download, ref=False)
check = self.checkDownload({"ip" : "You need RapidPro to download more files from your IP address",
"auth" : "Download auth invalid"})
if check == "ip":
self.setWait(60)
- self.log.info(_("Already downloading from this ip address, waiting 60 seconds"))
+ self.logInfo(_("Already downloading from this ip address, waiting 60 seconds"))
self.wait()
self.handleFree()
elif check == "auth":
- self.log.info(_("Invalid Auth Code, download will be restarted"))
+ self.logInfo(_("Invalid Auth Code, download will be restarted"))
self.offset += 5
self.handleFree()
def handlePremium(self):
info = self.account.getAccountInfo(self.user, True)
- self.log.debug("%s: Use Premium Account" % self.__name__)
+ self.logDebug("%s: Use Premium Account" % self.__name__)
url = self.api_data["mirror"]
self.download(url, get={"directstart":1})
@@ -144,7 +144,7 @@ class RapidshareCom(Hoster):
api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
api_param_file = {"sub": "checkfiles", "incmd5": "1", "files": self.id, "filenames": self.name}
src = self.load(api_url_base, cookies=False, get=api_param_file).strip()
- self.log.debug("RS INFO API: %s" % src)
+ self.logDebug("RS INFO API: %s" % src)
if src.startswith("ERROR"):
return
fields = src.split(",")
@@ -178,19 +178,19 @@ class RapidshareCom(Hoster):
prepare = "https://api.rapidshare.com/cgi-bin/rsapi.cgi?sub=download&fileid=%(id)s&filename=%(name)s&try=1&cbf=RSAPIDispatcher&cbid=1" % {"name": name, "id" : id}
- self.log.debug("RS API Request: %s" % prepare)
+ self.logDebug("RS API Request: %s" % prepare)
result = self.load(prepare, ref=False)
- self.log.debug("RS API Result: %s" % result)
+ self.logDebug("RS API Result: %s" % result)
between_wait = re.search("You need to wait (\d+) seconds", result)
if "You need RapidPro to download more files from your IP address" in result:
self.setWait(60)
- self.log.info(_("Already downloading from this ip address, waiting 60 seconds"))
+ self.logInfo(_("Already downloading from this ip address, waiting 60 seconds"))
self.wait()
elif "Too many users downloading from this server right now" in result or "All free download slots are full" in result:
self.setWait(120)
- self.log.info(_("RapidShareCom: No free slots"))
+ self.logInfo(_("RapidShareCom: No free slots"))
self.wait()
elif "This file is too big to download it for free" in result:
self.fail(_("You need a premium account for this file"))
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index ff4843afd..54cbf9b32 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
class RealdebridCom(Hoster):
__name__ = "RealdebridCom"
- __version__ = "0.49"
+ __version__ = "0.50"
__type__ = "hoster"
__pattern__ = r"https?://.*real-debrid\..*"
@@ -40,7 +40,7 @@ class RealdebridCom(Hoster):
self.logError(_("Please enter your Real-debrid account or deactivate this plugin"))
self.fail("No Real-debrid account provided")
- self.log.debug("Real-Debrid: Old URL: %s" % pyfile.url)
+ self.logDebug("Real-Debrid: Old URL: %s" % pyfile.url)
if re.match(self.__pattern__, pyfile.url):
new_url = pyfile.url
else:
@@ -71,7 +71,7 @@ class RealdebridCom(Hoster):
else:
new_url = new_url.replace("https://", "http://")
- self.log.debug("Real-Debrid: New URL: %s" % new_url)
+ self.logDebug("Real-Debrid: New URL: %s" % new_url)
if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):
#only use when name wasnt already set
diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py
index 141dcb8c8..e306823a0 100644
--- a/module/plugins/hoster/RehostTo.py
+++ b/module/plugins/hoster/RehostTo.py
@@ -6,7 +6,7 @@ from module.plugins.Hoster import Hoster
class RehostTo(Hoster):
__name__ = "RehostTo"
- __version__ = "0.11"
+ __version__ = "0.12"
__type__ = "hoster"
__pattern__ = r"https?://.*rehost.to\..*"
__description__ = """rehost.com hoster plugin"""
@@ -22,13 +22,13 @@ class RehostTo(Hoster):
def process(self, pyfile):
if not self.account:
- self.log.error(_("Please enter your rehost.to account or deactivate this plugin"))
+ self.logError(_("Please enter your rehost.to account or deactivate this plugin"))
self.fail("No rehost.to account provided")
data = self.account.getAccountInfo(self.user)
long_ses = data["long_ses"]
- self.log.debug("Rehost.to: Old URL: %s" % pyfile.url)
+ self.logDebug("Rehost.to: Old URL: %s" % pyfile.url)
new_url = "http://rehost.to/process_download.php?user=cookie&pass=%s&dl=%s" % (long_ses, quote(pyfile.url, ""))
#raise timeout to 2min
diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py
index 7f0dee0e5..24536d351 100644
--- a/module/plugins/hoster/ShareplaceCom.py
+++ b/module/plugins/hoster/ShareplaceCom.py
@@ -9,7 +9,7 @@ class ShareplaceCom(Hoster):
__name__ = "ShareplaceCom"
__type__ = "hoster"
__pattern__ = r"(http://)?(www\.)?shareplace\.(com|org)/\?[a-zA-Z0-9]+"
- __version__ = "0.1"
+ __version__ = "0.11"
__description__ = """Shareplace.com Download Hoster"""
__author_name__ = ("ACCakut, based on YourfilesTo by jeix and skydancer")
__author_mail__ = ("none")
@@ -31,7 +31,7 @@ class ShareplaceCom(Hoster):
wait_time = self.get_waiting_time()
self.setWait(wait_time)
- self.log.debug("%s: Waiting %d seconds." % (self.__name__,wait_time))
+ self.logDebug("%s: Waiting %d seconds." % (self.__name__,wait_time))
self.wait()
def get_waiting_time(self):
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 5c38fdaad..1c3891eb1 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -27,7 +27,7 @@ class UlozTo(SimpleHoster):
__name__ = "UlozTo"
__type__ = "hoster"
__pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)"
- __version__ = "0.92"
+ __version__ = "0.93"
__description__ = """uloz.to"""
__author_name__ = ("zoidberg")
@@ -101,7 +101,7 @@ class UlozTo(SimpleHoster):
captcha_id = inputs[captcha_id_field]
captcha_text = self.decryptCaptcha("http://img.uloz.to/captcha/%s.png" % captcha_id)
- self.log.debug(' CAPTCHA ID:' + captcha_id + ' CAPTCHA TEXT:' + captcha_text)
+ self.logDebug(' CAPTCHA ID:' + captcha_id + ' CAPTCHA TEXT:' + captcha_text)
"""
self.setStorage("captcha_id", captcha_id)
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 520111369..f38336773 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -88,7 +88,7 @@ class UploadedTo(Hoster):
__name__ = "UploadedTo"
__type__ = "hoster"
__pattern__ = r"https?://[\w\.-]*?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)"
- __version__ = "0.70"
+ __version__ = "0.71"
__description__ = """Uploaded.net Download Hoster"""
__author_name__ = ("spoob", "mkaay", "zoidberg", "netpok", "stickell")
__author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz", "netpok@gmail.com", "l.stickell@yahoo.it")
@@ -154,10 +154,10 @@ class UploadedTo(Hoster):
def handlePremium(self):
info = self.account.getAccountInfo(self.user, True)
- self.log.debug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__,
+ self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__,
"left": info["trafficleft"] / 1024 / 1024})
if int(self.data[1]) / 1024 > info["trafficleft"]:
- self.log.info(_("%s: Not enough traffic left" % self.__name__))
+ self.logInfo(_("%s: Not enough traffic left" % self.__name__))
self.account.empty(self.user)
self.resetAccount()
self.fail(_("Traffic exceeded"))
diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index a2348b9f9..65d6cc4e9 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -26,7 +26,7 @@ class UploadheroCom(SimpleHoster):
__name__ = "UploadheroCom"
__type__ = "hoster"
__pattern__ = r"http://(?:www\.)?uploadhero\.com?/dl/\w+"
- __version__ = "0.13"
+ __version__ = "0.14"
__description__ = """UploadHero.com plugin"""
__author_name__ = ("mcmyst", "zoidberg")
__author_mail__ = ("mcmyst@hotmail.fr", "zoidberg@mujmail.cz")
@@ -67,10 +67,10 @@ class UploadheroCom(SimpleHoster):
self.download(download_url)
def handlePremium(self):
- self.log.debug("%s: Use Premium Account" % self.__name__)
+ self.logDebug("%s: Use Premium Account" % self.__name__)
self.html = self.load(self.pyfile.url)
link = re.search(self.DOWNLOAD_URL_PATTERN, self.html).group(1)
- self.log.debug("Downloading link : '%s'" % link)
+ self.logDebug("Downloading link : '%s'" % link)
self.download(link)
def checkErrors(self):
diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py
index 4a157a787..3037cfd20 100644
--- a/module/plugins/hoster/UploadingCom.py
+++ b/module/plugins/hoster/UploadingCom.py
@@ -26,7 +26,7 @@ class UploadingCom(SimpleHoster):
__name__ = "UploadingCom"
__type__ = "hoster"
__pattern__ = r"http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>[\w\d]+)"
- __version__ = "0.32"
+ __version__ = "0.33"
__description__ = """Uploading.Com File Download Hoster"""
__author_name__ = ("jeix", "mkaay", "zoidberg")
__author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "zoidberg@mujmail.cz")
@@ -80,7 +80,7 @@ class UploadingCom(SimpleHoster):
response = json_loads(self.load(ajax_url, post = {'action': 'second_page', 'code': self.file_info['ID']}))
if 'answer' in response and 'wait_time' in response['answer']:
wait_time = int(response['answer']['wait_time'])
- self.log.info("%s: Waiting %d seconds." % (self.__name__, wait_time))
+ self.logInfo("%s: Waiting %d seconds." % (self.__name__, wait_time))
self.setWait(wait_time)
self.wait()
else:
diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py
index d4422afc3..4486eb84a 100644
--- a/module/plugins/hoster/VeehdCom.py
+++ b/module/plugins/hoster/VeehdCom.py
@@ -11,13 +11,13 @@ class VeehdCom(Hoster):
('filename_spaces', 'bool', "Allow spaces in filename", 'False'),
('replacement_char', 'str', "Filename replacement character", '_'),
]
- __version__ = '0.21'
+ __version__ = '0.22'
__description__ = """Veehd.com Download Hoster"""
__author_name__ = ('cat')
__author_mail__ = ('cat@pyload')
def _debug(self, msg):
- self.log.debug('[%s] %s' % (self.__name__, msg))
+ self.logDebug('[%s] %s' % (self.__name__, msg))
def setup(self):
self.html = None
diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py
index 5bc5e9ac7..3dab1b1bb 100644
--- a/module/plugins/hoster/WuploadCom.py
+++ b/module/plugins/hoster/WuploadCom.py
@@ -47,7 +47,7 @@ class WuploadCom(Hoster):
__name__ = "WuploadCom"
__type__ = "hoster"
__pattern__ = r"http://[\w\.]*?wupload\..*?/file/(([a-z][0-9]+/)?[0-9]+)(/.*)?"
- __version__ = "0.20"
+ __version__ = "0.21"
__description__ = """Wupload com"""
__author_name__ = ("jeix", "paulking")
__author_mail__ = ("jeix@hasnomail.de", "")
@@ -113,7 +113,7 @@ class WuploadCom(Hoster):
def getDomain(self):
result = json_loads(
self.load(self.API_ADDRESS + "/utility?method=getWuploadDomainForCurrentIp&format=json", decode=True))
- self.log.debug("%s: response to get domain %s" % (self.__name__, result))
+ self.logDebug("%s: response to get domain %s" % (self.__name__, result))
return result["FSApi_Utility"]["getWuploadDomainForCurrentIp"]["response"]
def downloadPremium(self):
diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py
index 3e66b966a..92b77f73a 100644
--- a/module/plugins/hoster/Xdcc.py
+++ b/module/plugins/hoster/Xdcc.py
@@ -32,7 +32,7 @@ from module.plugins.Hoster import Hoster
class Xdcc(Hoster):
__name__ = "Xdcc"
- __version__ = "0.31"
+ __version__ = "0.32"
__pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/
__type__ = "hoster"
__config__ = [
@@ -59,7 +59,7 @@ class Xdcc(Hoster):
for i in range(0,3):
try:
nmn = self.doDownload(pyfile.url)
- self.log.debug("%s: Download of %s finished." % (self.__name__, nmn))
+ self.logDebug("%s: Download of %s finished." % (self.__name__, nmn))
return
except socket.error, e:
if hasattr(e, "errno"):
@@ -68,7 +68,7 @@ class Xdcc(Hoster):
errno = e.args[0]
if errno in (10054,):
- self.log.debug("XDCC: Server blocked our ip, retry in 5 min")
+ self.logDebug("XDCC: Server blocked our ip, retry in 5 min")
self.setWait(300)
self.wait()
continue
@@ -176,10 +176,10 @@ class Xdcc(Hoster):
if nick == msg["target"][0:len(nick)] and "PRIVMSG" == msg["action"]:
if msg["text"] == "\x01VERSION\x01":
- self.log.debug("XDCC: Sending CTCP VERSION.")
+ self.logDebug("XDCC: Sending CTCP VERSION.")
sock.send("NOTICE %s :%s\r\n" % (msg['origin'], "pyLoad! IRC Interface"))
elif msg["text"] == "\x01TIME\x01":
- self.log.debug("Sending CTCP TIME.")
+ self.logDebug("Sending CTCP TIME.")
sock.send("NOTICE %s :%d\r\n" % (msg['origin'], time.time()))
elif msg["text"] == "\x01LAG\x01":
pass # don't know how to answer
@@ -212,12 +212,12 @@ class Xdcc(Hoster):
self.pyfile.name = packname
filename = save_join(location, packname)
- self.log.info("XDCC: Downloading %s from %s:%d" % (packname, ip, port))
+ self.logInfo("XDCC: Downloading %s from %s:%d" % (packname, ip, port))
self.pyfile.setStatus("downloading")
newname = self.req.download(ip, port, filename, sock, self.pyfile.setProgress)
if newname and newname != filename:
- self.log.info("%(name)s saved as %(newname)s" % {"name": self.pyfile.name, "newname": newname})
+ self.logInfo("%(name)s saved as %(newname)s" % {"name": self.pyfile.name, "newname": newname})
filename = newname
# kill IRC socket
diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py
index b67ccb68d..c2183f8a8 100644
--- a/module/plugins/hoster/YourfilesTo.py
+++ b/module/plugins/hoster/YourfilesTo.py
@@ -9,7 +9,7 @@ class YourfilesTo(Hoster):
__name__ = "YourfilesTo"
__type__ = "hoster"
__pattern__ = r"(http://)?(www\.)?yourfiles\.(to|biz)/\?d=[a-zA-Z0-9]+"
- __version__ = "0.2"
+ __version__ = "0.21"
__description__ = """Youfiles.to Download Hoster"""
__author_name__ = ("jeix", "skydancer")
__author_mail__ = ("jeix@hasnomail.de", "skydancer@hasnomail.de")
@@ -31,7 +31,7 @@ class YourfilesTo(Hoster):
wait_time = self.get_waiting_time()
self.setWait(wait_time)
- self.log.debug("%s: Waiting %d seconds." % (self.__name__,wait_time))
+ self.logDebug("%s: Waiting %d seconds." % (self.__name__,wait_time))
self.wait()
def get_waiting_time(self):