Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/container/LinkList.py
	module/plugins/container/TXT.py
	module/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugin/Extractor.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/container/TXT.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/ZippyshareCom.py

1 files changed, 15 insertions, 12 deletions

diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index 6b1f6c02e..f2c8a96a4 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -2,10 +2,9 @@
 
 from __future__ import with_statement
 
+import os
 import time
 
-from os import listdir, makedirs
-from os.path import exists, isfile, join
 from shutil import move
 
 from pyload.plugin.Addon import Addon
@@ -15,7 +14,7 @@ from pyload.utils import fs_encode, safe_join
 class HotFolder(Addon):
     __name    = "HotFolder"
     __type    = "addon"
-    __version = "0.12"
+    __version = "0.13"
 
     __config = [("folder"    , "str" , "Folder to observe"    , "container"),
                 ("watch_file", "bool", "Observe link file"    , False      ),
@@ -28,7 +27,7 @@ class HotFolder(Addon):
 
 
     def setup(self):
-        self.interval = 10
+        self.interval = 30
 
 
     def activate(self):
@@ -37,31 +36,35 @@ class HotFolder(Addon):
 
     def periodical(self):
         folder = fs_encode(self.getConfig("folder"))
+        file   = fs_encode(self.getConfig("file"))
 
         try:
-            if not exists(join(folder, "finished")):
-                makedirs(join(folder, "finished"))
+            if not os.path.isdir(os.path.join(folder, "finished")):
+                os.makedirs(os.path.join(folder, "finished"))
 
             if self.getConfig("watch_file"):
-                file = fs_encode(self.getConfig("file"))
                 with open(file, "a+") as f:
+                    f.seek(0)
                     content = f.read().strip()
 
                 if content:
-                    name = "%s_%s.txt" % (self.getConfig("file"), time.strftime("%H-%M-%S_%d%b%Y"))
+                    f = open(file, "wb")
+                    f.close()
+
+                    name = "%s_%s.txt" % (file, time.strftime("%H-%M-%S_%d%b%Y"))
 
                     with open(safe_join(folder, "finished", name), "wb") as f:
                         f.write(content)
 
                     self.core.api.addPackage(f.name, [f.name], 1)
 
-            for f in listdir(folder):
-                path = join(folder, f)
+            for f in os.listdir(folder):
+                path = os.path.join(folder, f)
 
-                if not isfile(path) or f.endswith("~") or f.startswith("#") or f.startswith("."):
+                if not os.path.isfile(path) or f.endswith("~") or f.startswith("#") or f.startswith("."):
                     continue
 
-                newpath = join(folder, "finished", f if self.getConfig("keep") else "tmp_" + f)
+                newpath = os.path.join(folder, "finished", f if self.getConfig("keep") else "tmp_" + f)
                 move(path, newpath)
 
                 self.logInfo(_("Added %s from HotFolder") % f)