From 27ebe0ad2b25d816ffd1fdb8135da19fcc1b0db3 Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Wed, 8 May 2013 17:09:01 +0200
Subject: FilezyNet: hoster added

---
 module/plugins/hoster/FilezyNet.py | 103 +++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 module/plugins/hoster/FilezyNet.py

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
new file mode 100644
index 000000000..ee09b91f4
--- /dev/null
+++ b/module/plugins/hoster/FilezyNet.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+import re
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from module.utils import html_unescape
+from module.network.RequestFactory import getURL 
+
+class FilezyNet(SimpleHoster):
+  __name__ = "FilezyNet"
+  __type__ = "hoster"
+  __version__ = "0.1"
+  __pattern__ = r"http://filezy.net/.*/.*.html"
+  __description__ = """filezy.net hoster plugin"""
+
+  FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(.*)">'
+  FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
+  FILE_INFO_PATTERN = r'<p>Download: <span>(?P<N>[^<]+)</span> <span class="plansize">(?P<S>[^<]+)</span>'
+  FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>'
+
+  def setup(self):
+    self.resumeDownload = True
+    self.multiDL = False
+
+  def handleFree(self):
+    # Define search patterns
+    op_pattern = '<input type="hidden" name="op" value="(.*)">'
+    id_pattern = '<input type="hidden" name="id" value="(.*)">'
+    fn_pattern = '<input type="hidden" name="fname" value="(.*)">'
+    re_pattern = '<input type="hidden" name="referer" value="(.*)">'
+    ul_pattern = '<input type="hidden" name="usr_login" value="(.*)">'
+    rand_pattern = '<input type="hidden" name="rand" value="(.*)">'
+    link_pattern = '<a href="(.*)" class="btn-video">Download File</a>'
+
+    # Get HTML source
+    self.logDebug("Getting first HTML source")
+    html = self.load(self.pyfile.url)
+    self.logDebug(" > Done")
+
+    op_val = re.search(op_pattern, html).group(1)
+    id_val = re.search(id_pattern, html).group(1)
+    fn_val = re.search(fn_pattern, html).group(1)
+    re_val = re.search(re_pattern, html).group(1)
+    ul_val = re.search(ul_pattern, html).group(1)
+
+    # Debug values
+    self.logDebug(" > Op " + op_val)
+    self.logDebug(" > Id " + id_val)
+    self.logDebug(" > Fname " + fn_val)
+    self.logDebug(" > Referer " + re_val)
+    self.logDebug(" > User Login " + ul_val)
+
+    # Create post data
+    post_data = {"op" : op_val, "usr_login" : ul_val, "id" : id_val, "fname" : fn_val, "referer" : re_val, "method_free" : "+Free+Download"}
+
+    # Post and get new HTML source
+    self.logDebug("Getting second HTML source")
+    html = self.load(self.pyfile.url, post = post_data, decode=True)
+    self.logDebug(" > Done")
+
+    # Retrieve data
+    if re.search(op_pattern, html) is not None:
+      op_val = re.search(op_pattern, html).group(1)
+    else:
+      self.retry(3, 10, "Second html: no op found!!")
+
+    if re.search(id_pattern, html) is not None:
+      id_val = re.search(id_pattern, html).group(1)
+    else:
+      self.retry(3, 10, "Second html: no id found!!")
+
+    if re.search(rand_pattern, html) is not None:
+      rand_val = re.search(rand_pattern, html).group(1)
+    else:
+      self.retry(3, 10, "Second html: no rand found!!")
+
+    re_val = self.pyfile.url
+
+    # Debug values
+    self.logDebug(" > Op " + op_val)
+    self.logDebug(" > Id " + id_val)
+    self.logDebug(" > Rand " + rand_val)
+    self.logDebug(" > Referer " + re_val)
+
+    self.setWait(31)
+    self.wait()
+
+    # Create post data
+    post_data = {"op" : op_val, "id" : id_val, "rand" : rand_val, "referer" : re_val, "method_free" : "+Free+Download", "method_premium" : "", "down_direct" : "1"}
+
+    # Post and get new HTML source
+    self.logDebug("Getting third HTML source")
+    html = self.load(self.pyfile.url, post = post_data, decode=True)
+    self.logDebug(" > Done")
+
+    # Get link value
+    if re.search(link_pattern, html) is not None:
+      link_val = re.search(link_pattern, html).group(1)
+      self.logDebug(" > Link " + link_val)
+      self.download(link_val)
+    else:
+      self.logDebug("No link found!!")
+      self.retry(3, 10, "No link found!!")
+
+getInfo = create_getInfo(FilezyNet)
-- 
cgit v1.2.3


From 738f7660920e7a4c6aecc2c830ceb204dc3750f0 Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Wed, 8 May 2013 20:11:08 +0200
Subject: remove unnecessary patterns

---
 module/plugins/hoster/FilezyNet.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index ee09b91f4..4fa1924e1 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -11,8 +11,6 @@ class FilezyNet(SimpleHoster):
   __pattern__ = r"http://filezy.net/.*/.*.html"
   __description__ = """filezy.net hoster plugin"""
 
-  FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(.*)">'
-  FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
   FILE_INFO_PATTERN = r'<p>Download: <span>(?P<N>[^<]+)</span> <span class="plansize">(?P<S>[^<]+)</span>'
   FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>'
 
-- 
cgit v1.2.3


From e2557715e85974c5ec3a1aac4c1dccf21de24a2a Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Wed, 15 May 2013 13:41:01 +0200
Subject: Version 1.00: delete finished packages only instead all finished
 links

---
 module/plugins/hooks/DeleteFinished.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index e0df69eef..29959eb57 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -18,12 +18,13 @@
 """
 
 from module.plugins.Hook import Hook
+from module.database import style
 from time import time
 
 
 class DeleteFinished(Hook):
     __name__ = "DeleteFinished"
-    __version__ = "0.5"
+    __version__ = "1.00"
     __description__ = "Automatically delete finished packages from queue"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -32,6 +33,11 @@ class DeleteFinished(Hook):
     __author_name__ = ("Walter Purcaro")
     __author_mail__ = ("vuolter@gmail.com")
 
+    @style.queue
+    def deleteFinished(self):
+        self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))")
+        self.c.execute("DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)")
+
     def wakeup(self, pypack):
         # self.logDebug("self.wakeup")
         self.removeEvent("packageFinished", self.wakeup)
@@ -40,8 +46,8 @@ class DeleteFinished(Hook):
     def periodical(self):
         # self.logDebug("self.periodical")
         if not self.info["sleep"]:
-            self.core.api.deleteFinished()
-            self.logDebug("called self.core.api.deleteFinished")
+            self.logInfo("self.deleteFinished")
+            self.deleteFinished()
             self.info["sleep"] = True
             self.addEvent("packageFinished", self.wakeup)
 
@@ -72,6 +78,7 @@ class DeleteFinished(Hook):
         interval = self.getConfig("interval") * 3600
         if interval != self.interval:
             self.interval = interval
+            self.initPeriodical()
 
     def unload(self):
         # self.logDebug("self.unload")
-- 
cgit v1.2.3


From 79e660e8e87cc47156fb6478d9186750b0cff837 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Wed, 15 May 2013 16:40:15 +0200
Subject: Version 1.01: code cosmetics

---
 module/plugins/hooks/DeleteFinished.py | 57 +++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index 29959eb57..e71772eed 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -24,7 +24,7 @@ from time import time
 
 class DeleteFinished(Hook):
     __name__ = "DeleteFinished"
-    __version__ = "1.00"
+    __version__ = "1.01"
     __description__ = "Automatically delete finished packages from queue"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -33,6 +33,33 @@ class DeleteFinished(Hook):
     __author_name__ = ("Walter Purcaro")
     __author_mail__ = ("vuolter@gmail.com")
 
+    ## overwrited methods ##
+    def periodical(self):
+        # self.logDebug("self.periodical")
+        if not self.info["sleep"]:
+            self.logInfo("self.deleteFinished")
+            self.deleteFinished()
+            self.info["sleep"] = True
+            self.addEvent("packageFinished", self.wakeup)
+
+    def pluginConfigChanged(self, plugin, name, value):
+        # self.logDebug("self.pluginConfigChanged")
+        if name == "interval" and value != self.interval:
+            self.interval = value
+            self.initPeriodical()
+
+    def unload(self):
+        # self.logDebug("self.unload")
+        self.removeEvent("packageFinished", self.wakeup)
+
+    def coreReady(self):
+        # self.logDebug("self.coreReady")
+        self.info = {"sleep": True}
+        interval = self.getConfig("interval") * 3600
+        self.pluginConfigChanged("DeleteFinished", "interval", interval)
+        self.addEvent("packageFinished", self.wakeup)
+
+    ## own methods ##
     @style.queue
     def deleteFinished(self):
         self.c.execute("DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (0,4))")
@@ -43,14 +70,7 @@ class DeleteFinished(Hook):
         self.removeEvent("packageFinished", self.wakeup)
         self.info["sleep"] = False
 
-    def periodical(self):
-        # self.logDebug("self.periodical")
-        if not self.info["sleep"]:
-            self.logInfo("self.deleteFinished")
-            self.deleteFinished()
-            self.info["sleep"] = True
-            self.addEvent("packageFinished", self.wakeup)
-
+    ## event managing ##
     def addEvent(self, event, handler):
         if event in self.manager.events:
             if handler not in self.manager.events[event]:
@@ -72,22 +92,3 @@ class DeleteFinished(Hook):
         else:
             # self.logDebug("self.removeEvent: " + event + ": NOT removed handler")
             return False
-
-    def configEvents(self, plugin=None, name=None, value=None):
-        # self.logDebug("self.configEvents")
-        interval = self.getConfig("interval") * 3600
-        if interval != self.interval:
-            self.interval = interval
-            self.initPeriodical()
-
-    def unload(self):
-        # self.logDebug("self.unload")
-        self.removeEvent("pluginConfigChanged", self.configEvents)
-        self.removeEvent("packageFinished", self.wakeup)
-
-    def coreReady(self):
-        # self.logDebug("self.coreReady")
-        self.info = {"sleep": True}
-        self.addEvent("pluginConfigChanged", self.configEvents)
-        self.configEvents()
-        self.addEvent("packageFinished", self.wakeup)
-- 
cgit v1.2.3


From 04764f8665df33c720d63e83ce0f62d7c9dde1f2 Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Sat, 18 May 2013 17:54:52 +0200
Subject: now based on XFileSharingPro.py

---
 module/plugins/hoster/FilezyNet.py | 95 +++-----------------------------------
 1 file changed, 7 insertions(+), 88 deletions(-)

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 4fa1924e1..026850d71 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -1,101 +1,20 @@
 # -*- coding: utf-8 -*-
-import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.utils import html_unescape
-from module.network.RequestFactory import getURL 
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
-class FilezyNet(SimpleHoster):
+class FilezyNet(XFileSharingPro):
   __name__ = "FilezyNet"
   __type__ = "hoster"
   __version__ = "0.1"
   __pattern__ = r"http://filezy.net/.*/.*.html"
   __description__ = """filezy.net hoster plugin"""
 
-  FILE_INFO_PATTERN = r'<p>Download: <span>(?P<N>[^<]+)</span> <span class="plansize">(?P<S>[^<]+)</span>'
-  FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>'
+  HOSTER_NAME = "filezy.net"
+
+  FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
+  WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
 
   def setup(self):
     self.resumeDownload = True
-    self.multiDL = False
-
-  def handleFree(self):
-    # Define search patterns
-    op_pattern = '<input type="hidden" name="op" value="(.*)">'
-    id_pattern = '<input type="hidden" name="id" value="(.*)">'
-    fn_pattern = '<input type="hidden" name="fname" value="(.*)">'
-    re_pattern = '<input type="hidden" name="referer" value="(.*)">'
-    ul_pattern = '<input type="hidden" name="usr_login" value="(.*)">'
-    rand_pattern = '<input type="hidden" name="rand" value="(.*)">'
-    link_pattern = '<a href="(.*)" class="btn-video">Download File</a>'
-
-    # Get HTML source
-    self.logDebug("Getting first HTML source")
-    html = self.load(self.pyfile.url)
-    self.logDebug(" > Done")
-
-    op_val = re.search(op_pattern, html).group(1)
-    id_val = re.search(id_pattern, html).group(1)
-    fn_val = re.search(fn_pattern, html).group(1)
-    re_val = re.search(re_pattern, html).group(1)
-    ul_val = re.search(ul_pattern, html).group(1)
-
-    # Debug values
-    self.logDebug(" > Op " + op_val)
-    self.logDebug(" > Id " + id_val)
-    self.logDebug(" > Fname " + fn_val)
-    self.logDebug(" > Referer " + re_val)
-    self.logDebug(" > User Login " + ul_val)
-
-    # Create post data
-    post_data = {"op" : op_val, "usr_login" : ul_val, "id" : id_val, "fname" : fn_val, "referer" : re_val, "method_free" : "+Free+Download"}
-
-    # Post and get new HTML source
-    self.logDebug("Getting second HTML source")
-    html = self.load(self.pyfile.url, post = post_data, decode=True)
-    self.logDebug(" > Done")
-
-    # Retrieve data
-    if re.search(op_pattern, html) is not None:
-      op_val = re.search(op_pattern, html).group(1)
-    else:
-      self.retry(3, 10, "Second html: no op found!!")
-
-    if re.search(id_pattern, html) is not None:
-      id_val = re.search(id_pattern, html).group(1)
-    else:
-      self.retry(3, 10, "Second html: no id found!!")
-
-    if re.search(rand_pattern, html) is not None:
-      rand_val = re.search(rand_pattern, html).group(1)
-    else:
-      self.retry(3, 10, "Second html: no rand found!!")
-
-    re_val = self.pyfile.url
-
-    # Debug values
-    self.logDebug(" > Op " + op_val)
-    self.logDebug(" > Id " + id_val)
-    self.logDebug(" > Rand " + rand_val)
-    self.logDebug(" > Referer " + re_val)
-
-    self.setWait(31)
-    self.wait()
-
-    # Create post data
-    post_data = {"op" : op_val, "id" : id_val, "rand" : rand_val, "referer" : re_val, "method_free" : "+Free+Download", "method_premium" : "", "down_direct" : "1"}
-
-    # Post and get new HTML source
-    self.logDebug("Getting third HTML source")
-    html = self.load(self.pyfile.url, post = post_data, decode=True)
-    self.logDebug(" > Done")
-
-    # Get link value
-    if re.search(link_pattern, html) is not None:
-      link_val = re.search(link_pattern, html).group(1)
-      self.logDebug(" > Link " + link_val)
-      self.download(link_val)
-    else:
-      self.logDebug("No link found!!")
-      self.retry(3, 10, "No link found!!")
+    self.multiDL = self.premium
 
 getInfo = create_getInfo(FilezyNet)
-- 
cgit v1.2.3


From 4ff7c4e72c2733864deb4a507debf024b0e86d74 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Mon, 20 May 2013 22:14:24 +0200
Subject: Version 1.02: removed imported method time

---
 module/plugins/hooks/DeleteFinished.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index e71772eed..01cb1b8e1 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -17,14 +17,13 @@
     @author: Walter Purcaro
 """
 
-from module.plugins.Hook import Hook
 from module.database import style
-from time import time
+from module.plugins.Hook import Hook
 
 
 class DeleteFinished(Hook):
     __name__ = "DeleteFinished"
-    __version__ = "1.01"
+    __version__ = "1.02"
     __description__ = "Automatically delete finished packages from queue"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -33,7 +32,7 @@ class DeleteFinished(Hook):
     __author_name__ = ("Walter Purcaro")
     __author_mail__ = ("vuolter@gmail.com")
 
-    ## overwrited methods ##
+    ## overwritten methods ##
     def periodical(self):
         # self.logDebug("self.periodical")
         if not self.info["sleep"]:
-- 
cgit v1.2.3


From c2919a5896318c8874383aef40de9008f49d3d97 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Wed, 15 May 2013 16:18:38 +0200
Subject: Added plugin SkipRev

---
 module/plugins/hooks/SkipRev.py | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 module/plugins/hooks/SkipRev.py

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
new file mode 100644
index 000000000..39cf8e548
--- /dev/null
+++ b/module/plugins/hooks/SkipRev.py
@@ -0,0 +1,41 @@
+  # -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+    @author: Walter Purcaro
+"""
+
+from module.plugins.Hook import Hook
+
+
+class SkipRev(Hook):
+    __name__ = "SkipRev"
+    __version__ = "0.01"
+    __description__ = "Skip download when filename has rev extension"
+    __config__ = [
+        ("activated", "bool", "Activated", "False"),
+        ("number", "int", "Do not skip until rev part", "1")
+    ]
+    __author_name__ = ("Walter Purcaro")
+    __author_mail__ = ("vuolter@gmail.com")
+
+    def downloadPreparing(self, pyfile):
+        name = basename(pyfile.name)
+        number = self.getConfig("number")
+        if name.find(".rev") != -1:
+            for i in range(1, number):
+                if name.find(i + ".rev") != -1:
+                    return
+            pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From 35f0f402b60f18e2c32580151667cfc59bd8663f Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Wed, 15 May 2013 16:46:30 +0200
Subject: Version 0.02: log actions

---
 module/plugins/hooks/SkipRev.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 39cf8e548..0ac8de412 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -22,7 +22,7 @@ from module.plugins.Hook import Hook
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -32,10 +32,12 @@ class SkipRev(Hook):
     __author_mail__ = ("vuolter@gmail.com")
 
     def downloadPreparing(self, pyfile):
+        # self.logDebug("self.downloadPreparing")
         name = basename(pyfile.name)
         number = self.getConfig("number")
         if name.find(".rev") != -1:
             for i in range(1, number):
                 if name.find(i + ".rev") != -1:
                     return
+            self.logInfo("Skipping " + name)
             pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From d30434b88b3d13aef1ba8cf0f29385229c82c9ed Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Wed, 15 May 2013 20:57:04 +0200
Subject: Version 0.3: use endswith instead of find (thx stickell)

---
 module/plugins/hooks/SkipRev.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 0ac8de412..ce57fe4b5 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -22,7 +22,7 @@ from module.plugins.Hook import Hook
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -34,10 +34,10 @@ class SkipRev(Hook):
     def downloadPreparing(self, pyfile):
         # self.logDebug("self.downloadPreparing")
         name = basename(pyfile.name)
-        number = self.getConfig("number")
-        if name.find(".rev") != -1:
-            for i in range(1, number):
-                if name.find(i + ".rev") != -1:
+        max = self.getConfig("number")
+        if name.endswith(".rev"):
+            for n in range(1, max):
+                if name.endswith(n + ".rev"):
                     return
             self.logInfo("Skipping " + name)
             pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From 4df433cfb18df8428a497e7e6a3f6a5ca8b1fb06 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Fri, 17 May 2013 17:52:43 +0200
Subject: Version 0.04: forgot to import basename

---
 module/plugins/hooks/SkipRev.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index ce57fe4b5..4e839dc7a 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -18,11 +18,11 @@
 """
 
 from module.plugins.Hook import Hook
-
+from os.path import basename
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
-- 
cgit v1.2.3


From f7e6bb7bc4fcb680aa61d68760ab5f5620552185 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Fri, 17 May 2013 21:38:50 +0200
Subject: Version 0.05: several fixed according stickell advices

---
 module/plugins/hooks/SkipRev.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 4e839dc7a..9e9f1af64 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -19,10 +19,12 @@
 
 from module.plugins.Hook import Hook
 from os.path import basename
+from re import group, search
+
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -34,10 +36,10 @@ class SkipRev(Hook):
     def downloadPreparing(self, pyfile):
         # self.logDebug("self.downloadPreparing")
         name = basename(pyfile.name)
-        max = self.getConfig("number")
         if name.endswith(".rev"):
-            for n in range(1, max):
-                if name.endswith(n + ".rev"):
-                    return
+            number = self.getConfig("number")
+            part = search('(\.part(.+?)\.rev)*$', name).group(2)
+            if int(part) <= number:
+                return
             self.logInfo("Skipping " + name)
             pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From 2c8d1c3b562e43f02064c1c70ca763751ad38e64 Mon Sep 17 00:00:00 2001
From: Vuolter <vuolter@gmail.com>
Date: Mon, 20 May 2013 23:57:14 +0200
Subject: Version 0.06: improved filename recognition (big thanks to stickell)

---
 module/plugins/hooks/SkipRev.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 9e9f1af64..dccb153d8 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -19,12 +19,12 @@
 
 from module.plugins.Hook import Hook
 from os.path import basename
-from re import group, search
+from re import search
 
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -38,8 +38,8 @@ class SkipRev(Hook):
         name = basename(pyfile.name)
         if name.endswith(".rev"):
             number = self.getConfig("number")
-            part = search('(\.part(.+?)\.rev)*$', name).group(2)
-            if int(part) <= number:
+            part = search(r'\.part(\d+)\.rev$', name)
+            if not part or int(part.group(1)) <= number:
                 return
             self.logInfo("Skipping " + name)
             pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From ce4e1fde9ae98af79e37027a361b692126a8594f Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 25 May 2013 15:11:24 +0300
Subject: NCryptIn: version increased

http://forum.pyload.org/viewtopic.php?p=9444#p9444
---
 module/plugins/crypter/NCryptIn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 5e1ea347c..e1cd30475 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -11,7 +11,7 @@ class NCryptIn(Crypter):
     __name__ = "NCryptIn"
     __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?ncrypt.in/folder-([^/\?]+)"
-    __version__ = "1.21"
+    __version__ = "1.22"
     __description__ = """NCrypt.in Crypter Plugin"""
     __author_name__ = ("fragonib")
     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")
-- 
cgit v1.2.3


From 10da5243a284e220c8d6fcbafe7d3004ab3255c9 Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Sun, 26 May 2013 02:48:38 +0200
Subject: working again. javascript, yay.

---
 module/plugins/hoster/FilezyNet.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 026850d71..57619c38c 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
+import re
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from pycurl import FOLLOWLOCATION
 
 class FilezyNet(XFileSharingPro):
   __name__ = "FilezyNet"
@@ -12,9 +14,21 @@ class FilezyNet(XFileSharingPro):
 
   FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
   WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
+  DOWNLOAD_JS_PATTERN = r"<script type='text/javascript'>eval(.*)"
 
   def setup(self):
     self.resumeDownload = True
     self.multiDL = self.premium
 
+  def getDownloadLink(self):
+    self.logDebug("Getting download link")
+
+    data = self.getPostParameters()
+    self.req.http.c.setopt(FOLLOWLOCATION, 0)
+    self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True)
+    self.header = self.req.http.header
+    self.req.http.c.setopt(FOLLOWLOCATION, 1)
+
+    return re.search(self.DIRECT_LINK_PATTERN, self.js.eval(re.search(self.DOWNLOAD_JS_PATTERN, self.html).group(1))).group(1)
+
 getInfo = create_getInfo(FilezyNet)
-- 
cgit v1.2.3


From 300f9e4333d87382e46791e1d6473b91f62f7e1d Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Sun, 26 May 2013 16:28:05 +0200
Subject: remove useless header stuff. try to increase readability

---
 module/plugins/hoster/FilezyNet.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 57619c38c..76e16d3ad 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
-from pycurl import FOLLOWLOCATION
 
 class FilezyNet(XFileSharingPro):
   __name__ = "FilezyNet"
@@ -24,11 +23,11 @@ class FilezyNet(XFileSharingPro):
     self.logDebug("Getting download link")
 
     data = self.getPostParameters()
-    self.req.http.c.setopt(FOLLOWLOCATION, 0)
     self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True)
-    self.header = self.req.http.header
-    self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
-    return re.search(self.DIRECT_LINK_PATTERN, self.js.eval(re.search(self.DOWNLOAD_JS_PATTERN, self.html).group(1))).group(1)
+    obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html)
+    dl_file_now = self.js.eval(obfuscated_js.group(1))
+    link = re.search(self.DIRECT_LINK_PATTERN, dl_file_now)
+    return link.group(1)
 
 getInfo = create_getInfo(FilezyNet)
-- 
cgit v1.2.3


From 11e3612c0fdee3d45d9207c2a6544744dff501e1 Mon Sep 17 00:00:00 2001
From: ajs124_desk <ajs@online.de>
Date: Sun, 26 May 2013 18:20:57 +0200
Subject: convert intendation from two to four spaces

---
 module/plugins/hoster/FilezyNet.py | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 76e16d3ad..7c5729c2d 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -3,31 +3,31 @@ import re
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
 class FilezyNet(XFileSharingPro):
-  __name__ = "FilezyNet"
-  __type__ = "hoster"
-  __version__ = "0.1"
-  __pattern__ = r"http://filezy.net/.*/.*.html"
-  __description__ = """filezy.net hoster plugin"""
+    __name__ = "FilezyNet"
+    __type__ = "hoster"
+    __version__ = "0.1"
+    __pattern__ = r"http://filezy.net/.*/.*.html"
+    __description__ = """filezy.net hoster plugin"""
 
-  HOSTER_NAME = "filezy.net"
+    HOSTER_NAME = "filezy.net"
 
-  FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
-  WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
-  DOWNLOAD_JS_PATTERN = r"<script type='text/javascript'>eval(.*)"
+    FILE_SIZE_PATTERN = r'<span class="plansize">(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</span>'
+    WAIT_PATTERN = r'<div id="countdown_str" class="seconds">\n<!--Wait--> <span id=".*?">(\d+)</span>'
+    DOWNLOAD_JS_PATTERN = r"<script type='text/javascript'>eval(.*)"
 
-  def setup(self):
-    self.resumeDownload = True
-    self.multiDL = self.premium
+    def setup(self):
+        self.resumeDownload = True
+        self.multiDL = self.premium
 
-  def getDownloadLink(self):
-    self.logDebug("Getting download link")
+    def getDownloadLink(self):
+        self.logDebug("Getting download link")
 
-    data = self.getPostParameters()
-    self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True)
+        data = self.getPostParameters()
+        self.html = self.load(self.pyfile.url, post = data, ref = True, decode = True)
 
-    obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html)
-    dl_file_now = self.js.eval(obfuscated_js.group(1))
-    link = re.search(self.DIRECT_LINK_PATTERN, dl_file_now)
-    return link.group(1)
+        obfuscated_js = re.search(self.DOWNLOAD_JS_PATTERN, self.html)
+        dl_file_now = self.js.eval(obfuscated_js.group(1))
+        link = re.search(self.DIRECT_LINK_PATTERN, dl_file_now)
+        return link.group(1)
 
 getInfo = create_getInfo(FilezyNet)
-- 
cgit v1.2.3


From d8cf7a3acd26e79940528e75ed5f4b6246aa4861 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sun, 26 May 2013 22:29:22 +0300
Subject: Premium4Me: see

http://forum.pyload.org/viewtopic.php?p=9423#p9423
---
 module/plugins/hoster/Premium4Me.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index 5dd907b9f..08479b59c 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode
 
 class Premium4Me(Hoster):
     __name__ = "Premium4Me"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __type__ = "hoster"
 
     __pattern__ = r"http://premium4.me/.*"
@@ -42,7 +42,7 @@ class Premium4Me(Hoster):
         check = self.checkDownload({"nopremium": "No premium account available"})
 
         if check == "nopremium":
-            self.retry(3, 60, 'No premium account available')
+            self.retry(60, 300, 'No premium account available')
 
         err = ''
         if self.req.http.code == '420':
-- 
cgit v1.2.3


From 001d008744577ae916f05194a48663a0931a1955 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 27 May 2013 16:14:40 +0200
Subject: Version 0.07: code cosmetics

---
 module/plugins/hooks/SkipRev.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index dccb153d8..561329122 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -24,7 +24,7 @@ from re import search
 
 class SkipRev(Hook):
     __name__ = "SkipRev"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __description__ = "Skip download when filename has rev extension"
     __config__ = [
         ("activated", "bool", "Activated", "False"),
@@ -36,10 +36,11 @@ class SkipRev(Hook):
     def downloadPreparing(self, pyfile):
         # self.logDebug("self.downloadPreparing")
         name = basename(pyfile.name)
-        if name.endswith(".rev"):
-            number = self.getConfig("number")
-            part = search(r'\.part(\d+)\.rev$', name)
-            if not part or int(part.group(1)) <= number:
-                return
-            self.logInfo("Skipping " + name)
-            pyfile.setStatus("skipped")
+        if not name.endswith(".rev"):
+            return
+        number = self.getConfig("number")
+        part = search(r'\.part(\d+)\.rev$', name)
+        if not part or int(part.group(1)) <= number:
+            return
+        self.logInfo("Skipping " + name)
+        pyfile.setStatus("skipped")
-- 
cgit v1.2.3


From aef05012d15cfadea317b4779baf6916bc739729 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 27 May 2013 21:42:59 +0200
Subject: LinkdecrypterCom: plugin deactivated

---
 module/plugins/hooks/LinkdecrypterCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py
index d3d6bce68..c117cafb9 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterCom.py
@@ -24,9 +24,9 @@ from module.utils import remove_chars
 
 class LinkdecrypterCom(Hook):
     __name__ = "LinkdecrypterCom"
-    __version__ = "0.17"
+    __version__ = "0.18"
     __description__ = """linkdecrypter.com - regexp loader"""
-    __config__ = [ ("activated", "bool", "Activated" , "True") ]
+    __config__ = [ ("activated", "bool", "Activated" , "False") ]
     __author_name__ = ("zoidberg")
 
     def coreReady(self):
-- 
cgit v1.2.3


From 88e4c28dd9f3cfea6a8cbca4dc95ce0c34af9973 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Thu, 30 May 2013 14:33:54 +0200
Subject: ZippyshareCom: fixed #135

---
 module/plugins/hoster/ZippyshareCom.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 84974e7ba..756a92ef3 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -10,10 +10,10 @@ class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
     __pattern__ = r"(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)"
-    __version__ = "0.37"
+    __version__ = "0.38"
     __description__ = """Zippyshare.com Download Hoster"""
-    __author_name__ = ("spoob", "zoidberg")
-    __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz")
+    __author_name__ = ("spoob", "zoidberg", "stickell")
+    __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
     __config__ = [("swfdump_path", "string", "Path to swfdump", "")]
     
     FILE_NAME_PATTERN = r'>Name:</font>\s*<font [^>]*>(?P<N>[^<]+)</font><br />'
@@ -62,7 +62,12 @@ class ZippyshareCom(SimpleHoster):
         found = re.search(self.DOWNLOAD_URL_PATTERN, self.html, re.S)
         if found:
             #Method #1: JS eval
-            url = self.js.eval("\n".join(found.groups()))
+            js = "\n".join(found.groups())
+            regex = r"document.getElementById\(\\*'dlbutton\\*'\).omg"
+            omg = re.search(regex + r" = ([^;]+);", js).group(1)
+            js = re.sub(regex + r" = ([^;]+);", '', js)
+            js = re.sub(regex, omg, js)
+            url = self.js.eval(js)
         else:
             #Method #2: SWF eval
             seed_search = re.search(self.SEED_PATTERN, self.html)
-- 
cgit v1.2.3


From c73f11e28d8dd982f41498799ad4ef437b5df2d7 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Thu, 30 May 2013 14:43:16 +0200
Subject: UploadheroCom: test link

---
 module/plugins/hoster/UploadheroCom.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/plugins/hoster/UploadheroCom.py b/module/plugins/hoster/UploadheroCom.py
index 502f849af..a2348b9f9 100644
--- a/module/plugins/hoster/UploadheroCom.py
+++ b/module/plugins/hoster/UploadheroCom.py
@@ -16,6 +16,9 @@
     @author: zoidberg
 """
 
+# Test link (random.bin):
+# http://uploadhero.co/dl/wQBRAVSM
+
 import re
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
-- 
cgit v1.2.3


From 7f618aa3a7886ddc942f7a83a297233b5c39c921 Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Thu, 30 May 2013 16:18:45 +0200
Subject: Recreated StreamcloudEu plugin using XFileSharingPro

---
 module/plugins/hoster/StreamcloudEu.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 module/plugins/hoster/StreamcloudEu.py

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
new file mode 100644
index 000000000..eee9b5d67
--- /dev/null
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+import re
+
+class StreamcloudEu(XFileSharingPro):
+    __name__ = "StreamcloudEu"
+    __type__ = "hoster"
+    __pattern__ = r"https?://(www\.)?streamcloud\.eu/"
+    __version__ = "0.01"
+    __description__ = """Streamcloud.eu hoster plugin"""
+    __author_name__ = ("seoester")
+    __author_mail__ = ("seoester@googlemail.com")
+
+    HOSTER_NAME = "streamcloud.eu"
+    DIRECT_LINK_PATTERN = r'file: "(https?://stor\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
+
+    def getDownloadLink(self):
+        found = re.search(self.DIRECT_LINK_PATTERN, self.html, re.S)
+        if found:
+        	return found.group(1)
+
+        return XFileSharingPro.getDownloadLink(self)
-- 
cgit v1.2.3


From ec7645ffe3fe97db9f6d2efb249df47c624a418c Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Thu, 30 May 2013 16:27:18 +0200
Subject: StreamcloudEu plugin: MultiDL enabled

---
 module/plugins/hoster/StreamcloudEu.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index eee9b5d67..a041d917c 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -14,9 +14,13 @@ class StreamcloudEu(XFileSharingPro):
     HOSTER_NAME = "streamcloud.eu"
     DIRECT_LINK_PATTERN = r'file: "(https?://stor\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
 
+    def setup(self):
+        XFileSharingPro.setup(self)
+        self.multiDL = True
+
     def getDownloadLink(self):
         found = re.search(self.DIRECT_LINK_PATTERN, self.html, re.S)
         if found:
-        	return found.group(1)
+            return found.group(1)
 
         return XFileSharingPro.getDownloadLink(self)
-- 
cgit v1.2.3


From d274fc9e0b3ff69b336eda724d77b01853f5fc2a Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Thu, 30 May 2013 22:42:46 +0200
Subject: Improved DIRECT_LINK_PATTERN

---
 module/plugins/hoster/StreamcloudEu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index a041d917c..3636dd029 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -12,7 +12,7 @@ class StreamcloudEu(XFileSharingPro):
     __author_mail__ = ("seoester@googlemail.com")
 
     HOSTER_NAME = "streamcloud.eu"
-    DIRECT_LINK_PATTERN = r'file: "(https?://stor\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
+    DIRECT_LINK_PATTERN = r'file: "(https?://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
 
     def setup(self):
         XFileSharingPro.setup(self)
-- 
cgit v1.2.3


From 5c960c221efe5e6d08ca7d91e366de10c41e40e2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 2 Jun 2013 20:44:26 +0200
Subject: Set activated to False for all captcha hook plugins

---
 module/plugins/hooks/BypassCaptcha.py | 4 ++--
 module/plugins/hooks/Captcha9kw.py    | 4 ++--
 module/plugins/hooks/CaptchaTrader.py | 4 ++--
 module/plugins/hooks/ImageTyperz.py   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index 24ad17dd8..e24a439af 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -41,9 +41,9 @@ class BypassCaptchaException(Exception):
 
 class BypassCaptcha(Hook):
     __name__ = "BypassCaptcha"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __description__ = """send captchas to BypassCaptcha.com"""
-    __config__ = [("activated", "bool", "Activated", True),
+    __config__ = [("activated", "bool", "Activated", False),
                   ("force", "bool", "Force BC even if client is connected", False),
                   ("passkey", "password", "Passkey", "")]
     __author_name__ = ("RaNaN", "Godofdream", "zoidberg")
diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index bb2b8c862..f7226fc59 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -30,9 +30,9 @@ from module.plugins.Hook import Hook
 
 class Captcha9kw(Hook):
     __name__ = "Captcha9kw"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __description__ = """send captchas to 9kw.eu"""
-    __config__ = [("activated", "bool", "Activated", True),
+    __config__ = [("activated", "bool", "Activated", False),
                   ("force", "bool", "Force CT even if client is connected", True),
                   ("https", "bool", "Enable HTTPS", "False"),
                   ("confirm", "bool", "Confirm Captcha", "False"),
diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py
index 2b8a50a8e..c648c0bd8 100644
--- a/module/plugins/hooks/CaptchaTrader.py
+++ b/module/plugins/hooks/CaptchaTrader.py
@@ -46,9 +46,9 @@ class CaptchaTraderException(Exception):
 
 class CaptchaTrader(Hook):
     __name__ = "CaptchaTrader"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __description__ = """send captchas to captchatrader.com"""
-    __config__ = [("activated", "bool", "Activated", True),
+    __config__ = [("activated", "bool", "Activated", False),
                   ("username", "str", "Username", ""),
                   ("force", "bool", "Force CT even if client is connected", False),
                   ("passkey", "password", "Password", ""),]
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index 59b6334a7..f8f515113 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -42,9 +42,9 @@ class ImageTyperzException(Exception):
 
 class ImageTyperz(Hook):
     __name__ = "ImageTyperz"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __description__ = """send captchas to ImageTyperz.com"""
-    __config__ = [("activated", "bool", "Activated", True),
+    __config__ = [("activated", "bool", "Activated", False),
                   ("username", "str", "Username", ""),
                   ("passkey", "password", "Password", ""),
                   ("force", "bool", "Force IT even if client is connected", False)]
-- 
cgit v1.2.3


From acb54e231e3fbe7c943f2fed222b91b8c4be0dff Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Mon, 3 Jun 2013 17:47:00 +0200
Subject: More accurate regular expressions

---
 module/plugins/hoster/StreamcloudEu.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 3636dd029..9c45e83d7 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -5,14 +5,14 @@ import re
 class StreamcloudEu(XFileSharingPro):
     __name__ = "StreamcloudEu"
     __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?streamcloud\.eu/"
+    __pattern__ = r"http://(www\.)?streamcloud\.eu/\S+"
     __version__ = "0.01"
     __description__ = """Streamcloud.eu hoster plugin"""
     __author_name__ = ("seoester")
     __author_mail__ = ("seoester@googlemail.com")
 
     HOSTER_NAME = "streamcloud.eu"
-    DIRECT_LINK_PATTERN = r'file: "(https?://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
+    DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
 
     def setup(self):
         XFileSharingPro.setup(self)
-- 
cgit v1.2.3


From 50466c97f81a9ef567f4c6397304891fb3d390b6 Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Mon, 3 Jun 2013 20:26:31 +0200
Subject: Added create_getInfo call

---
 module/plugins/hoster/StreamcloudEu.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 9c45e83d7..705bc4bb5 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -24,3 +24,5 @@ class StreamcloudEu(XFileSharingPro):
             return found.group(1)
 
         return XFileSharingPro.getDownloadLink(self)
+
+getInfo = create_getInfo(StreamcloudEu)
-- 
cgit v1.2.3


From 3c75929ef6240e260f97e335ac23fc8275f03b48 Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Mon, 3 Jun 2013 21:22:57 +0200
Subject: super() function used

---
 module/plugins/hoster/StreamcloudEu.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 705bc4bb5..9e7c61ccc 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -15,7 +15,7 @@ class StreamcloudEu(XFileSharingPro):
     DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
 
     def setup(self):
-        XFileSharingPro.setup(self)
+        super(XFileSharingPro, self).setup()
         self.multiDL = True
 
     def getDownloadLink(self):
@@ -23,6 +23,6 @@ class StreamcloudEu(XFileSharingPro):
         if found:
             return found.group(1)
 
-        return XFileSharingPro.getDownloadLink(self)
+        return super(XFileSharingPro, self).getDownloadLink()
 
 getInfo = create_getInfo(StreamcloudEu)
-- 
cgit v1.2.3


From 6328dfe998ce791ea24368b820a5b637eb1f86f7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Jun 2013 21:27:56 +0200
Subject: getConfig instead getConf for all

---
 module/plugins/hooks/ExtractArchive.py | 4 ++--
 module/plugins/hoster/VeehdCom.py      | 6 +++---
 module/plugins/hoster/XHamsterCom.py   | 4 ++--
 module/plugins/hoster/Xdcc.py          | 8 ++++----
 module/plugins/hoster/YoutubeCom.py    | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index a5a973b7f..f55589fec 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.12"
+    __version__ = "0.13"
     __description__ = "Extract different kind of archives"
     __config__ = [("activated", "bool", "Activated", True),
         ("fullpath", "bool", "Extract full path", True),
@@ -153,7 +153,7 @@ class ExtractArchive(Hook):
                 out = save_join(dl, p.folder, self.getConfig("destination"), "")
                 #relative to package folder if destination is relative, otherwise absolute path overwrites them
 
-                if self.getConf("subfolder"):
+                if self.getConfig("subfolder"):
                     out = join(out, fs_encode(p.folder))
 
                 if not exists(out):
diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py
index 23048b831..d4422afc3 100644
--- a/module/plugins/hoster/VeehdCom.py
+++ b/module/plugins/hoster/VeehdCom.py
@@ -11,7 +11,7 @@ class VeehdCom(Hoster):
         ('filename_spaces', 'bool', "Allow spaces in filename", 'False'),
         ('replacement_char', 'str', "Filename replacement character", '_'),
     ]
-    __version__ = '0.2'
+    __version__ = '0.21'
     __description__ = """Veehd.com Download Hoster"""
     __author_name__ = ('cat')
     __author_mail__ = ('cat@pyload')
@@ -55,12 +55,12 @@ class VeehdCom(Hoster):
         name = match.group(1)
         
         # replace unwanted characters in filename
-        if self.getConf('filename_spaces'):
+        if self.getConfig('filename_spaces'):
             pattern = '[^0-9A-Za-z\.\ ]+'
         else:
             pattern = '[^0-9A-Za-z\.]+'
             
-        name = re.sub(pattern, self.getConf('replacement_char'),
+        name = re.sub(pattern, self.getConfig('replacement_char'),
             name)
         return name + '.avi'
 
diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py
index 0779a78e6..866c5da45 100644
--- a/module/plugins/hoster/XHamsterCom.py
+++ b/module/plugins/hoster/XHamsterCom.py
@@ -17,7 +17,7 @@ class XHamsterCom(Hoster):
     __name__ = "XHamsterCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?xhamster\.com/movies/.+"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
     __description__ = """XHamster.com Video Download Hoster"""
 
@@ -31,7 +31,7 @@ class XHamsterCom(Hoster):
             self.offline()
 
         if self.getConfig("type"):
-            self.desired_fmt = self.getConf("type")    
+            self.desired_fmt = self.getConfig("type")    
            
         self.pyfile.name = self.get_file_name() + self.desired_fmt
         self.download(self.get_file_url())
diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py
index 6f0a1b176..3e66b966a 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.3"
+    __version__ = "0.31"
     __pattern__ = r'xdcc://.*?(/#?.*?)?/.*?/#?\d+/?' # xdcc://irc.Abjects.net/#channel/[XDCC]|Shit/#0004/
     __type__ = "hoster"
     __config__ = [
@@ -91,9 +91,9 @@ class Xdcc(Hoster):
         chan   = m.group(2)
         bot    = m.group(3)
         pack   = m.group(4)
-        nick   = self.getConf('nick')
-        ident  = self.getConf('ident')
-        real   = self.getConf('realname')
+        nick   = self.getConfig('nick')
+        ident  = self.getConfig('ident')
+        real   = self.getConfig('realname')
         
         temp = server.split(':')
         ln = len(temp)
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 70db597cf..e3eddf638 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -34,7 +34,7 @@ class YoutubeCom(Hoster):
     __name__ = "YoutubeCom"
     __type__ = "hoster"
     __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*"
-    __version__ = "0.32"
+    __version__ = "0.33"
     __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"),
         ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0),
         (".mp4", "bool", "Allow .mp4", True),
@@ -83,17 +83,17 @@ class YoutubeCom(Hoster):
             self.tempOffline()
 
         #get config
-        use3d = self.getConf("3d")
+        use3d = self.getConfig("3d")
         if use3d:
             quality = {"sd":82,"hd":84,"fullhd":85,"240p":83,"360p":82,"480p":82,"720p":84,"1080p":85,"3072p":85}
         else:
             quality = {"sd":18,"hd":22,"fullhd":37,"240p":5,"360p":18,"480p":35,"720p":22,"1080p":37,"3072p":38}
-        desired_fmt = self.getConf("fmt")
+        desired_fmt = self.getConfig("fmt")
         if desired_fmt and desired_fmt not in self.formats:
             self.logWarning("FMT %d unknown - using default." % desired_fmt)
             desired_fmt = 0
         if not desired_fmt:
-            desired_fmt = quality.get(self.getConf("quality"), 18)
+            desired_fmt = quality.get(self.getConfig("quality"), 18)
 
         #parse available streams
         streams = re.search(r'"url_encoded_fmt_stream_map": "(.*?)",', html).group(1)
-- 
cgit v1.2.3


From 9c2ec070b58afbafff037f157b18b2b98a917e24 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 3 Jun 2013 22:12:04 +0200
Subject: Revert to a simple version of the plugin

until the new one will be stable.
---
 module/plugins/hooks/RestartFailed.py | 137 ++++++----------------------------
 1 file changed, 22 insertions(+), 115 deletions(-)

diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index 7ee53deb9..b8339e9e3 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -1,124 +1,31 @@
-  # -*- coding: utf-8 -*-
-
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: Walter Purcaro
-"""
+# -*- coding: utf-8 -*-
 
 from module.plugins.Hook import Hook
-from time import time
-
 
 class RestartFailed(Hook):
     __name__ = "RestartFailed"
-    __version__ = "1.5"
-    __description__ = "Automatically restart failed/aborted downloads"
-    __config__ = [
-        ("activated", "bool", "Activated", "True"),
-        ("dlFail", "bool", "Restart when download fail", "True"),
-        ("dlFail_n", "int", "Only when failed downloads are at least", "5"),
-        ("dlFail_i", "int", "Only when elapsed time since last restart is (min)", "10"),
-        ("dlPrcs", "bool", "Restart after all downloads are processed", "True"),
-        ("recnt", "bool", "Restart after reconnecting", "True"),
-        ("rsLoad", "bool", "Restart on plugin activation", "False")
-    ]
-    __author_name__ = ("Walter Purcaro")
-    __author_mail__ = ("vuolter@gmail.com")
-
-    def restart(self, arg=None):
-        # self.logDebug("self.restart")
-        self.info["timerflag"] = False
-        self.info["dlfailed"] = 0
-        self.core.api.restartFailed()
-        self.logDebug("self.restart: self.core.api.restartFailed")
-        self.info["lastrstime"] = time()
-
-    def periodical(self):
-        # self.logDebug("self.periodical")
-        if self.info["timerflag"]:
-            self.restart()
-
-    def checkInterval(self, arg=None):
-        # self.logDebug("self.checkInterval")
-        now = time()
-        lastrstime = self.info["lastrstime"]
-        interval = self.getConfig("dlFail_i") * 60
-        if now < lastrstime + interval:
-            self.info["timerflag"] = True
-        else:
-            self.restart()
-
-    def checkFailed(self, pyfile):
-        # self.logDebug("self.checkFailed")
-        self.info["dlfailed"] += 1
-        curr = self.info["dlfailed"]
-        max = self.getConfig("dlFail_n")
-        if curr >= max:
-            self.checkInterval()
-
-    def addEvent(self, event, handler):
-        if event in self.manager.events:
-            if handler not in self.manager.events[event]:
-                self.manager.events[event].append(handler)
-                # self.logDebug("self.addEvent: " + event + ": added handler")
-            else:
-                # self.logDebug("self.addEvent: " + event + ": NOT added handler")
-                return False
-        else:
-            self.manager.events[event] = [handler]
-            # self.logDebug("self.addEvent: " + event + ": added event and handler")
-        return True
+    __version__ = "1.51"
+    __description__ = "restartedFailed Packages after defined time"
+    __config__ = [("activated", "bool", "Activated" , "False"),
+                  ("interval", "int", "Interval in Minutes", "15") ]
+ 
+    __author_name__ = ("bambie")
+    __author_mail__ = ("bambie@gulli.com")
 
-    def removeEvent(self, event, handler):
-        if event in self.manager.events and handler in self.manager.events[event]:
-            self.manager.events[event].remove(handler)
-            # self.logDebug("self.removeEvent: " + event + ": removed handler")
-            return True
-        else:
-            # self.logDebug("self.removeEvent: " + event + ": NOT removed handler")
-            return False
+    interval = 300
 
-    def configEvents(self, plugin=None, name=None, value=None):
-        # self.logDebug("self.configEvents")
-        self.interval = self.getConfig("dlFail_i") * 60
-        dlFail = self.getConfig("dlFail")
-        dlPrcs = self.getConfig("dlPrcs")
-        recnt = self.getConfig("recnt")
-        if dlPrcs:
-            self.addEvent("allDownloadsProcessed", self.checkInterval)
-        else:
-            self.removeEvent("allDownloadsProcessed", self.checkInterval)
-            if not dlFail:
-                self.info["timerflag"] = False
-        if recnt:
-            self.addEvent("afterReconnecting", self.restart)
-        else:
-            self.removeEvent("afterReconnecting", self.restart)
-
-    def unload(self):
-        # self.logDebug("self.unload")
-        self.removeEvent("pluginConfigChanged", self.configEvents)
-        self.removeEvent("downloadFailed", self.checkFailed)
-        self.removeEvent("allDownloadsProcessed", self.checkInterval)
-        self.removeEvent("afterReconnecting", self.restart)
+    def setup(self):
+        self.info = {"running": False}
 
     def coreReady(self):
-        # self.logDebug("self.coreReady")
-        self.info = {"dlfailed": 0, "lastrstime": 0, "timerflag": False}
-        if self.getConfig("rsLoad"):
-            self.restart()
-        self.addEvent("downloadFailed", self.checkFailed)
-        self.addEvent("pluginConfigChanged", self.configEvents)
-        self.configEvents()
+        self.info["running"] = True
+        self.logInfo("loaded")
+        self.interval = self.getConfig("interval") * 60
+        self.logDebug("interval is set to %s", self.interval)
+
+    def periodical(self):
+        self.logDebug("periodical called")
+        if self.getConfig("interval") * 60 != self.interval:
+            self.interval = self.getConfig("interval") * 60
+            self.logDebug("interval is set to %s", self.interval)
+        self.core.api.restartFailed()
-- 
cgit v1.2.3


From d9b83418f8680070199d21bc265095149d3f5d45 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Tue, 4 Jun 2013 16:34:43 +0200
Subject: New multi hoster plugin: UnrestrictLi

---
 module/plugins/accounts/UnrestrictLi.py | 47 +++++++++++++++++++++
 module/plugins/hooks/UnrestrictLi.py    | 43 ++++++++++++++++++++
 module/plugins/hoster/UnrestrictLi.py   | 72 +++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)
 create mode 100644 module/plugins/accounts/UnrestrictLi.py
 create mode 100644 module/plugins/hooks/UnrestrictLi.py
 create mode 100644 module/plugins/hoster/UnrestrictLi.py

diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
new file mode 100644
index 000000000..d01f7cde8
--- /dev/null
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+from module.plugins.Account import Account
+from module.common.json_layer import json_loads
+
+
+class UnrestrictLi(Account):
+    __name__ = "UnrestrictLi"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """Unrestrict.li account plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    def loadAccountInfo(self, user, req):
+        if 'unrestrict_user' not in req.cj.cookies:
+            self.login(user, self.getAccountData(user), req)
+        json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json')
+        self.logDebug("JSON data: " + json_data)
+        json_data = json_loads(json_data)
+
+        validuntil = json_data['result']['expires']
+        trafficleft = int(json_data['result']['traffic'] / 1024)
+
+        return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
+
+    def login(self, user, data, req):
+        self.html = req.load("https://unrestrict.li/sign_in",
+                             post={"return": "",
+                                   "username": user, "password": data["password"], "signin": "Sign+in"})
+        if 'unrestrict_user' not in req.cj.cookies:
+            self.wrongPassword()
diff --git a/module/plugins/hooks/UnrestrictLi.py b/module/plugins/hooks/UnrestrictLi.py
new file mode 100644
index 000000000..793e63e8f
--- /dev/null
+++ b/module/plugins/hooks/UnrestrictLi.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+from module.plugins.internal.MultiHoster import MultiHoster
+from module.network.RequestFactory import getURL
+from module.common.json_layer import json_loads
+
+
+class UnrestrictLi(MultiHoster):
+    __name__ = "UnrestrictLi"
+    __version__ = "0.01"
+    __type__ = "hook"
+    __config__ = [("activated", "bool", "Activated", "False"),
+                  ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
+                  ("hosterList", "str", "Hoster list (comma separated)", ""),
+                  ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
+                  ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
+
+    __description__ = """Unrestrict.li hook plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    def getHoster(self):
+        json_data = getURL('http://unrestrict.li/api/jdownloader/hosts.php?format=json')
+        json_data = json_loads(json_data)
+
+        host_list = [element['host'] for element in json_data['result']]
+
+        return host_list
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
new file mode 100644
index 000000000..273a300a0
--- /dev/null
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+import re
+from datetime import datetime, timedelta
+
+from module.plugins.Hoster import Hoster
+from module.common.json_layer import json_loads
+
+
+def secondsToMidnight():
+    # Seconds until 00:10 GMT+2
+    now = datetime.utcnow() + timedelta(hours=2)
+    if now.hour is 0 and now.minute < 10:
+        midnight = now
+    else:
+        midnight = now + timedelta(days=1)
+    midnight = midnight.replace(hour=0, minute=10, second=0, microsecond=0)
+    return int((midnight - now).total_seconds())
+
+
+class UnrestrictLi(Hoster):
+    __name__ = "UnrestrictLi"
+    __version__ = "0.01"
+    __type__ = "hoster"
+    __pattern__ = r"https?://.*(unrestrict|unr)\.li"
+    __description__ = """Unrestrict.li hoster plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    def init(self):
+        self.chunkLimit = -1
+        self.resumeDownload = True
+
+    def process(self, pyfile):
+        if not self.account:
+            self.logError("Please enter your Unrestrict.li account or deactivate this plugin")
+            self.fail("No Unrestrict.li account provided")
+
+        self.logDebug("Old URL: %s" % pyfile.url)
+        if re.match(self.__pattern__, pyfile.url):
+            new_url = pyfile.url
+        else:
+            for i in xrange(5):
+                page = self.req.load('https://unrestrict.li/unrestrict.php', post={'link': pyfile.url, 'domain': 'long'})
+                self.logDebug("JSON data: " + page)
+                if page != '':
+                    break
+            if "You are not allowed to download from this host" in page:
+                self.fail("You are not allowed to download from this host")
+            elif "You have reached your daily limit for this host" in page:
+                self.logInfo("Reached daily limit for this host. Waiting until 00:10 GMT+2")
+                self.retry(5, secondsToMidnight(), "Daily limit for this host reached")
+            new_url = json_loads(page).keys()[0]
+
+        self.logDebug("New URL: " + new_url)
+
+        self.download(new_url, disposition=True)
-- 
cgit v1.2.3


From 3e23b11528b392ca358e1713cf2e564c327faf1a Mon Sep 17 00:00:00 2001
From: Gonzalo SR <gonzalo@gonzalosr.com>
Date: Fri, 7 Jun 2013 01:42:17 +0200
Subject: Added plugin to support megacrypter.com

Implemented as hoster instead of crypter because I couldn't find an easy way to hand the file decryption key and the download URL to the MegaNz plugin. (Real MegaNz URL is never known).

Right now it doesn't support password protected megacrypter URLs.

Tested with some files. Works well thus far.

Feedback welcome.
---
 module/plugins/hoster/MegacrypterCom.py | 59 +++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 module/plugins/hoster/MegacrypterCom.py

diff --git a/module/plugins/hoster/MegacrypterCom.py b/module/plugins/hoster/MegacrypterCom.py
new file mode 100644
index 000000000..9f012e5be
--- /dev/null
+++ b/module/plugins/hoster/MegacrypterCom.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+import re
+
+from module.common.json_layer import json
+from module.plugins.hoster.MegaNz import MegaNz
+
+
+class MegacrypterCom(MegaNz):
+    __name__ = "MegacrypterCom"
+    __type__ = "hoster"
+    __pattern__ = r"(https?://[a-z0-9]{0,10}\.?megacrypter\.com/[a-zA-Z0-9!_\-]+)"
+    __version__ = "0.1"
+    __description__ = """megacrypter plugin, based and inherits from RaNaN's MegaNz plugin"""
+    __author_name__ = ("GonzaloSR", )
+    __author_mail__ = ("gonzalo@gonzalosr.com", )
+
+    API_URL = "http://megacrypter.com/api"
+    FILE_SUFFIX = ".crypted"
+
+   
+    def callApi(self, **kwargs):
+        """ Dispatch a call to the api, see megacrypter.com/api_doc """
+        self.logDebug("JSON request: " + json.dumps(kwargs))
+        resp = self.load(self.API_URL, post=json.dumps(kwargs))
+        self.logDebug("API Response: " + resp)
+        return json.loads(resp)
+
+   
+    def process(self, pyfile):
+
+        key = None
+
+        # match is guaranteed because plugin was chosen to handle url
+        node = re.search(self.__pattern__, pyfile.url).group(1)
+
+
+        # get Mega.co.nz link info
+        info = self.callApi(link=node, m="info")
+        
+        # get crypted file URL
+        dl = self.callApi(link=node, m="dl")
+
+
+        # TODO: map error codes, implement password protection
+        # if info["pass"] == true:
+        #    crypted_file_key, md5_file_key = info["key"].split("#")
+
+
+        key = self.b64_decode(info["key"])
+
+        pyfile.name = info["name"] + self.FILE_SUFFIX
+
+        self.download(dl["url"])
+        self.decryptFile(key)
+
+        # Everything is finished and final name can be set
+        pyfile.name = info["name"]
+
+
-- 
cgit v1.2.3


From 2fc5fbb43eb6a64be697c884c596ba069f59dd10 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 7 Jun 2013 17:42:27 +0300
Subject: EasybytezCom: updated regex

---
 module/plugins/hoster/EasybytezCom.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 96e3d93d2..a13491ad2 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -23,14 +23,12 @@ class EasybytezCom(XFileSharingPro):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __description__ = """easybytez.com"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = ("zoidberg", "stickell")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
-    FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
-    FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[^<]+)\)</font>'
-    FILE_INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>'
+    FILE_INFO_PATTERN = r'<h2>Download File (?P<N>.+)</h2>\s*<font [^>]+>You have requested <font color="red">[^<]+</font> \((?P<S>.+)\)</font>'
     FILE_OFFLINE_PATTERN = r'<h1>File not available</h1>'
 
     DIRECT_LINK_PATTERN = r'(http://(\w+\.(easybytez|zingload)\.com|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
-- 
cgit v1.2.3


From 03e0a1895e9b523060d733398b0948b96002e08d Mon Sep 17 00:00:00 2001
From: Christopher <4Christopher@gmx.de>
Date: Fri, 7 Jun 2013 18:42:38 +0200
Subject: XvidstageCom.py: The plugin is now implemented based on
 XFileSharingPro.

---
 module/plugins/hoster/XvidstageCom.py | 92 +++--------------------------------
 1 file changed, 7 insertions(+), 85 deletions(-)

diff --git a/module/plugins/hoster/XvidstageCom.py b/module/plugins/hoster/XvidstageCom.py
index 4962c05af..32c5fe0c3 100644
--- a/module/plugins/hoster/XvidstageCom.py
+++ b/module/plugins/hoster/XvidstageCom.py
@@ -17,98 +17,20 @@
     @author: 4Christopher
 """
 
-import re
-import HTMLParser
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
-from module.plugins.Hoster import Hoster
-from module.network.RequestFactory import getURL
-
-
-def setup(self):
-    self.wantReconnect = False
-    self.resumeDownload = True
-    self.multiDL = True
-
-
-def getInfo(urls):
-    result = []
-
-    for url in urls:
-        result.append(parseFileInfo(url, getInfoMode=True))
-    yield result
-
-
-def parseFileInfo(url, getInfoMode=False):
-    html = getURL(url)
-    info = {"name": url, "size": 0, "status": 3}
-    try:
-        info['name'] = re.search(r'(?:Filename|Dateiname):</b></td><td nowrap[^>]*?>(.*?)<', html).group(1)
-        info['size'] = re.search(r'(?:Size|Größe):</b></td><td>.*? <small>\((\d+?) bytes\)', html).group(1)
-    except: ## The file is offline
-        info['status'] = 1
-    else:
-        info['status'] = 2
-
-    if getInfoMode:
-        return info['name'], info['size'], info['status'], url
-    else:
-        return info['name'], info['size'], info['status'], html
-
-
-class XvidstageCom(Hoster):
+class XvidstageCom(XFileSharingPro):
     __name__ = 'XvidstageCom'
-    __version__ = '0.4'
+    __version__ = '0.5'
     __pattern__ = r'http://(?:www.)?xvidstage.com/(?P<id>[0-9A-Za-z]+)'
     __type__ = 'hoster'
     __description__ = """A Plugin that allows you to download files from http://xvidstage.com"""
     __author_name__ = ('4Christopher')
     __author_mail__ = ('4Christopher@gmx.de')
 
+    HOSTER_NAME = "xvidstage.com"
 
-    def process(self, pyfile):
-        pyfile.name, pyfile.size, pyfile.status, self.html = parseFileInfo(pyfile.url)
-        self.logDebug('Name: %s' % pyfile.name)
-        if pyfile.status == 1: ## offline
-            self.offline()
-        self.id = re.search(self.__pattern__, pyfile.url).group('id')
-
-        wait_sec = int(re.search(r'countdown_str">.+?>(\d+?)<', self.html).group(1))
-        self.setWait(wait_sec, reconnect=False)
-        self.logDebug('Waiting %d seconds before submitting the captcha' % wait_sec)
-        self.wait()
-
-        rand = re.search(r'<input type="hidden" name="rand" value="(.*?)">', self.html).group(1)
-        self.logDebug('rand: %s, id: %s' % (rand, self.id))
-        self.html = self.req.load(pyfile.url,
-                                  post={'op': 'download2', 'id': self.id, 'rand': rand, 'code': self.get_captcha()})
-        file_url = re.search(r'<a href="(?P<url>.*?)">(?P=url)</a>', self.html).group('url')
-        try:
-            hours_file_available = int(
-                re.search(r'This direct link will be available for your IP next (?P<hours>\d+?) hours',
-                          self.html).group('hours'))
-            self.logDebug(
-                'You have %d hours to download this file with your current IP address.' % hours_file_available)
-        except:
-            self.logDebug('Failed')
-        self.logDebug('Download file: %s' % file_url)
-        self.download(file_url)
-        check = self.checkDownload({'empty': re.compile(r'^$')})
-
-        if check == 'empty':
-            self.logInfo('Downloaded File was empty')
-        # self.retry()
-
-    def get_captcha(self):
-        ## <span style='position:absolute;padding-left:7px;padding-top:6px;'>&#49; …
-        cap_chars = {}
-        for pad_left, char in re.findall(r"position:absolute;padding-left:(\d+?)px;.*?;'>(.*?)<", self.html):
-            cap_chars[int(pad_left)] = char
-
-        h = HTMLParser.HTMLParser()
-        ## Sorting after padding-left
-        captcha = ''
-        for pad_left in sorted(cap_chars):
-            captcha += h.unescape(cap_chars[pad_left])
+    def setup(self):
+        self.resumeDownload = self.multiDL = self.premium
 
-        self.logDebug('The captcha is: %s' % captcha)
-        return captcha
+getInfo = create_getInfo(XvidstageCom)
-- 
cgit v1.2.3


From 3b40cf9b963b77f81dd48b46af7492c10be6d5b1 Mon Sep 17 00:00:00 2001
From: Christopher <4Christopher@gmx.de>
Date: Sat, 8 Jun 2013 13:51:40 +0200
Subject: XvidstageCom: Implemented as hook plugin (XFileSharingPro) and
 removed hoster plugin.

---
 module/plugins/hooks/XFileSharingPro.py | 46 ++++++++++++++++-----------------
 module/plugins/hoster/XvidstageCom.py   | 36 --------------------------
 2 files changed, 23 insertions(+), 59 deletions(-)
 delete mode 100644 module/plugins/hoster/XvidstageCom.py

diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 105c70113..ceaec96c6 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -5,7 +5,7 @@ import re
 
 class XFileSharingPro(Hook):
     __name__ = "XFileSharingPro"
-    __version__ = "0.04"
+    __version__ = "0.05"
     __type__ = "hook"
     __config__ = [ ("activated" , "bool" , "Activated"  , "True"),
                    ("loadDefault", "bool", "Include default (built-in) hoster list" , "True"),
@@ -14,57 +14,57 @@ class XFileSharingPro(Hook):
     __description__ = """Hoster URL pattern loader for the generic XFileSharingPro plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
-          
+
     def coreReady(self):
         self.loadPattern()
-      
-    def loadPattern(self):         
+
+    def loadPattern(self):
         hosterList = self.getConfigSet('includeList')
-        excludeList = self.getConfigSet('excludeList')         
-        
-        if self.getConfig('loadDefault'):        
+        excludeList = self.getConfigSet('excludeList')
+
+        if self.getConfig('loadDefault'):
             hosterList |= set((
             #WORKING HOSTERS:
             "aieshare.com", "asixfiles.com", "banashare.com", "cyberlocker.ch", "eyesfile.co", "eyesfile.com",
-            "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com", 
-            "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be",  
-            #NOT TESTED:            
-            "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com", 
+            "fileband.com", "filedwon.com", "filedownloads.org", "hipfile.com", "kingsupload.com", "mlfat4arab.com",
+            "netuploaded.com", "odsiebie.pl", "q4share.com", "ravishare.com", "uptobox.com", "verzend.be", "xvidstage.com",
+            #NOT TESTED:
+            "bebasupload.com", "boosterking.com", "divxme.com", "filevelocity.com", "glumbouploads.com", "grupload.com", "heftyfile.com",
             "host4desi.com", "laoupload.com", "linkzhost.com", "movreel.com", "rockdizfile.com", "limfile.com"
-            "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", "shareswift.com", "sharingonline.com", "6ybh-upload.com", 
-            "skipfile.com", "spaadyshare.com", "space4file.com", "uploadbaz.com", "uploadc.com", 
-            "uploaddot.com", "uploadfloor.com", "uploadic.com", "uploadville.com", "vidbull.com", "zalaa.com", 
+            "share76.com", "sharebeast.com", "sharehut.com", "sharerun.com", "shareswift.com", "sharingonline.com", "6ybh-upload.com",
+            "skipfile.com", "spaadyshare.com", "space4file.com", "uploadbaz.com", "uploadc.com",
+            "uploaddot.com", "uploadfloor.com", "uploadic.com", "uploadville.com", "vidbull.com", "zalaa.com",
             "zomgupload.com", "kupload.org", "movbay.org", "multishare.org", "omegave.org", "toucansharing.org", "uflinq.org",
             "banicrazy.info", "flowhot.info", "upbrasil.info", "shareyourfilez.biz", "bzlink.us", "cloudcache.cc", "fileserver.cc"
             "farshare.to", "filemaze.ws", "filehost.ws", "filestock.ru", "moidisk.ru", "4up.im", "100shared.com",
             #WRONG FILE NAME:
-            "sendmyway.com", "upchi.co.il", "180upload.com", 
+            "sendmyway.com", "upchi.co.il", "180upload.com",
             #NOT WORKING:
             "amonshare.com", "imageporter.com", "file4safe.com",
             #DOWN OR BROKEN:
             "ddlanime.com", "fileforth.com", "loombo.com", "goldfile.eu", "putshare.com"
-            ))             
-              
+            ))
+
         hosterList -= (excludeList)
         hosterList -= set(('', u''))
-        
+
         if not hosterList:
             self.unload()
             return
-                                            
+
         regexp = r"http://(?:[^/]*\.)?(%s)/\w{12}" % ("|".join(sorted(hosterList)).replace('.','\.'))
         #self.logDebug(regexp)
-        
+
         dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']
         dict["pattern"] = regexp
         dict["re"] = re.compile(regexp)
         self.logDebug("Pattern loaded - handling %d hosters" % len(hosterList))
-        
+
     def getConfigSet(self, option):
         s = self.getConfig(option).lower().replace('|',',').replace(';',',')
         return set([x.strip() for x in s.split(',')])
-        
+
     def unload(self):
         dict = self.core.pluginManager.hosterPlugins['XFileSharingPro']
         dict["pattern"] = r"^unmatchable$"
-        dict["re"] = re.compile(r"^unmatchable$")
\ No newline at end of file
+        dict["re"] = re.compile(r"^unmatchable$")
diff --git a/module/plugins/hoster/XvidstageCom.py b/module/plugins/hoster/XvidstageCom.py
deleted file mode 100644
index 32c5fe0c3..000000000
--- a/module/plugins/hoster/XvidstageCom.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: 4Christopher
-"""
-
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
-
-class XvidstageCom(XFileSharingPro):
-    __name__ = 'XvidstageCom'
-    __version__ = '0.5'
-    __pattern__ = r'http://(?:www.)?xvidstage.com/(?P<id>[0-9A-Za-z]+)'
-    __type__ = 'hoster'
-    __description__ = """A Plugin that allows you to download files from http://xvidstage.com"""
-    __author_name__ = ('4Christopher')
-    __author_mail__ = ('4Christopher@gmx.de')
-
-    HOSTER_NAME = "xvidstage.com"
-
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
-
-getInfo = create_getInfo(XvidstageCom)
-- 
cgit v1.2.3


From 4a567fcddf6fdd4c2787f9d0153bfdb176993d15 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 8 Jun 2013 14:41:37 +0200
Subject: EasybytezCom: fixed coversion feature and updated regex
 http://forum.pyload.org/viewtopic.php?p=9597#p9597

---
 module/plugins/hoster/EasybytezCom.py    |  2 +-
 module/plugins/hoster/XFileSharingPro.py | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index a13491ad2..0f18448f5 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -31,7 +31,7 @@ class EasybytezCom(XFileSharingPro):
     FILE_INFO_PATTERN = r'<h2>Download File (?P<N>.+)</h2>\s*<font [^>]+>You have requested <font color="red">[^<]+</font> \((?P<S>.+)\)</font>'
     FILE_OFFLINE_PATTERN = r'<h1>File not available</h1>'
 
-    DIRECT_LINK_PATTERN = r'(http://(\w+\.(easybytez|zingload)\.com|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
+    DIRECT_LINK_PATTERN = r'(http://(\w+\.(easyload|easybytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
     OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)'
     ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<Center><b>)(.*?)</'
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 1120a2a8b..2103b0c20 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -23,7 +23,7 @@ from urlparse import urlparse
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError
 from module.plugins.ReCaptcha import ReCaptcha
-from module.plugins.internal.CaptchaService import SolveMedia, AdsCaptcha
+from module.plugins.internal.CaptchaService import SolveMedia
 from module.utils import html_unescape
 
 class XFileSharingPro(SimpleHoster):
@@ -35,10 +35,10 @@ class XFileSharingPro(SimpleHoster):
     __name__ = "XFileSharingPro"
     __type__ = "hoster"
     __pattern__ = r"^unmatchable$"
-    __version__ = "0.17"
+    __version__ = "0.18"
     __description__ = """XFileSharingPro common hoster base"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = ("zoidberg", "stickell")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
     FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
     FILE_SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[^<]+)\)</font>'
@@ -151,7 +151,8 @@ class XFileSharingPro(SimpleHoster):
     def handlePremium(self):
         self.html = self.load(self.pyfile.url, post = self.getPostParameters())
         found = re.search(self.DIRECT_LINK_PATTERN, self.html)
-        if not found: self.parseError('DIRECT LINK')
+        if not found:
+            self.parseError('DIRECT LINK')
         self.startDownload(found.group(1))
 
     def handleOverriden(self):
@@ -183,13 +184,17 @@ class XFileSharingPro(SimpleHoster):
         found = re.search(self.OVR_DOWNLOAD_LINK_PATTERN, self.html)
         if not found: self.parseError('DIRECT LINK (OVR)')
         self.pyfile.url = found.group(1)
-        self.retry()
+        header = self.load(self.pyfile.url, just_header=True)
+        if 'location' in header:  # Direct link
+            self.startDownload(self.pyfile.url)
+        else:
+            self.retry()
 
     def startDownload(self, link):
         link = link.strip()
         if self.captcha: self.correctCaptcha()
         self.logDebug('DIRECT LINK: %s' % link)
-        self.download(link)
+        self.download(link, disposition=True)
 
     def checkErrors(self):
         found = re.search(self.ERROR_PATTERN, self.html)
-- 
cgit v1.2.3


From 6b33802de7933801d8045368e2b9b8488149aa08 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 8 Jun 2013 14:44:53 +0200
Subject: EasybytezCom: version increase after
 4a567fcddf6fdd4c2787f9d0153bfdb176993d15

---
 module/plugins/hoster/EasybytezCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 0f18448f5..61957085b 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -23,7 +23,7 @@ class EasybytezCom(XFileSharingPro):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
-    __version__ = "0.15"
+    __version__ = "0.16"
     __description__ = """easybytez.com"""
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-- 
cgit v1.2.3


From 5740943d0fd04f70fc575db0c93d45163e2459d8 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sun, 9 Jun 2013 15:59:43 +0200
Subject: TurbobitNet: updated FILE_OFFLINE_PATTERN

http://forum.pyload.org/viewtopic.php?p=9962#p9962
---
 module/plugins/hoster/TurbobitNet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index b429d5510..09ce46a31 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -36,14 +36,14 @@ class TurbobitNet(SimpleHoster):
     __name__ = "TurbobitNet"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*"
-    __version__ = "0.08"
+    __version__ = "0.09"
     __description__ = """Turbobit.net plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
 
     FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>" #long filenames are shortened
     FILE_NAME_PATTERN = r'<meta name="keywords" content="\s+(?P<N>[^,]+)' #full name but missing on page2
-    FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File was not found'
+    FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File (?:was )?not found'
     FILE_URL_REPLACEMENTS = [(r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*", "http://turbobit.net/\g<ID>.html")]
     SH_COOKIES = [("turbobit.net", "user_lang", "en")]
 
-- 
cgit v1.2.3


From a3fe31b7f49fae8820ecc14e1b50121a633a74ba Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Tue, 11 Jun 2013 12:35:33 +0200
Subject: RestartFailed: fixed debug messages

---
 module/plugins/hooks/RestartFailed.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index b8339e9e3..c78ccf96c 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -4,7 +4,7 @@ from module.plugins.Hook import Hook
 
 class RestartFailed(Hook):
     __name__ = "RestartFailed"
-    __version__ = "1.51"
+    __version__ = "1.52"
     __description__ = "restartedFailed Packages after defined time"
     __config__ = [("activated", "bool", "Activated" , "False"),
                   ("interval", "int", "Interval in Minutes", "15") ]
@@ -21,11 +21,11 @@ class RestartFailed(Hook):
         self.info["running"] = True
         self.logInfo("loaded")
         self.interval = self.getConfig("interval") * 60
-        self.logDebug("interval is set to %s", self.interval)
+        self.logDebug("interval is set to %s" % self.interval)
 
     def periodical(self):
         self.logDebug("periodical called")
         if self.getConfig("interval") * 60 != self.interval:
             self.interval = self.getConfig("interval") * 60
-            self.logDebug("interval is set to %s", self.interval)
+            self.logDebug("interval is set to %s" % self.interval)
         self.core.api.restartFailed()
-- 
cgit v1.2.3


From cc967b40cae1b7a4a7dd40036fecf5d5dfdc43d3 Mon Sep 17 00:00:00 2001
From: stefanos <antispam-github-com@trash-mail.com>
Date: Wed, 12 Jun 2013 18:18:47 +0300
Subject: Update Captcha9kw.py

option for timeout, answercheck every 3 seconds is enough and hints for prio/confirm
---
 module/plugins/hooks/Captcha9kw.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index f7226fc59..25ca3b05f 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -30,14 +30,15 @@ from module.plugins.Hook import Hook
 
 class Captcha9kw(Hook):
     __name__ = "Captcha9kw"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __description__ = """send captchas to 9kw.eu"""
     __config__ = [("activated", "bool", "Activated", False),
                   ("force", "bool", "Force CT even if client is connected", True),
                   ("https", "bool", "Enable HTTPS", "False"),
-                  ("confirm", "bool", "Confirm Captcha", "False"),
-                  ("captchaperhour", "int", "Captcha per hour", "9999"),
-                  ("prio", "int", "Prio (1-10)", "0"),
+                  ("confirm", "bool", "Confirm Captcha (Cost +6)", "False"),
+                  ("captchaperhour", "int", "Captcha per hour (max. 9999)", "9999"),
+                  ("prio", "int", "Prio 1-10 (Cost +1-10)", "0"),
+                  ("timeout", "int", "Timeout (max. 300)", "220"),                  
                   ("passkey", "password", "API key", ""),]
     __author_name__ = ("RaNaN")
     __author_mail__ = ("RaNaN@pyload.org")
@@ -76,7 +77,7 @@ class Captcha9kw(Hook):
                           "prio": self.getConfig("prio"),
                           "confirm": self.getConfig("confirm"),
                           "captchaperhour": self.getConfig("captchaperhour"),
-                          "maxtimeout": "220",
+                          "maxtimeout": self.timeout,
                           "pyload": "1", 
                           "source": "pyload", 
                           "base64": "1", 
@@ -87,13 +88,13 @@ class Captcha9kw(Hook):
         if response.isdigit():
             self.logInfo(_("NewCaptchaID from upload: %s : %s" % (response,task.captchaFile)))
 
-            for i in range(1, 220, 1): 
+            for i in range(1, 100, 1): 
                 response2 = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "id": response,"pyload": "1","source": "pyload", "action": "usercaptchacorrectdata" })
 
                 if(response2 != ""):
                     break;
 
-                time.sleep(1)
+                time.sleep(3)
 
             result = response2
             task.data["ticket"] = response
@@ -115,7 +116,7 @@ class Captcha9kw(Hook):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.setWaiting(220)
+            task.setWaiting(self.timeout)
             start_new_thread(self.processCaptcha, (task,))
 
         else:
-- 
cgit v1.2.3


From 845918643751ec7a16c4fd00c50bbd6d315177df Mon Sep 17 00:00:00 2001
From: stefanos <antispam-github-com@trash-mail.com>
Date: Wed, 12 Jun 2013 22:52:27 +0200
Subject: Update Captcha9kw.py

corrected self.timeout to self.getConfig("timeout")
---
 module/plugins/hooks/Captcha9kw.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index 25ca3b05f..755e2519a 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -77,7 +77,7 @@ class Captcha9kw(Hook):
                           "prio": self.getConfig("prio"),
                           "confirm": self.getConfig("confirm"),
                           "captchaperhour": self.getConfig("captchaperhour"),
-                          "maxtimeout": self.timeout,
+                          "maxtimeout": self.getConfig("timeout"),
                           "pyload": "1", 
                           "source": "pyload", 
                           "base64": "1", 
@@ -116,7 +116,7 @@ class Captcha9kw(Hook):
 
         if self.getCredits() > 0:
             task.handler.append(self)
-            task.setWaiting(self.timeout)
+            task.setWaiting(self.getConfig("timeout"))
             start_new_thread(self.processCaptcha, (task,))
 
         else:
-- 
cgit v1.2.3


From 03f2a4599193ed35fc654bba5155ffd7499bdfbf Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 14 Jun 2013 12:57:12 +0200
Subject: Premium4.me -> Premium.to

---
 module/plugins/accounts/Premium4Me.py | 12 ++++++------
 module/plugins/hooks/Premium4Me.py    | 12 ++++++------
 module/plugins/hoster/Premium4Me.py   | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/plugins/accounts/Premium4Me.py b/module/plugins/accounts/Premium4Me.py
index de4fdc219..c95b9b129 100644
--- a/module/plugins/accounts/Premium4Me.py
+++ b/module/plugins/accounts/Premium4Me.py
@@ -2,14 +2,14 @@ from module.plugins.Account import Account
 
 class Premium4Me(Account):
     __name__ = "Premium4Me"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __type__ = "account"
-    __description__ = """Premium4.me account plugin"""
-    __author_name__ = ("RaNaN", "zoidberg")
-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+    __description__ = """Premium.to account plugin"""
+    __author_name__ = ("RaNaN", "zoidberg", "stickell")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
     def loadAccountInfo(self, user, req):
-        traffic = req.load("http://premium4.me/api/traffic.php?authcode=%s" % self.authcode)
+        traffic = req.load("http://premium.to/api/traffic.php?authcode=%s" % self.authcode)
 
         account_info = {"trafficleft": int(traffic) / 1024,
                         "validuntil": -1}
@@ -17,7 +17,7 @@ class Premium4Me(Account):
         return account_info
 
     def login(self, user, data, req):
-        self.authcode = req.load("http://premium4.me/api/getauthcode.php?username=%s&password=%s" % (user, data["password"])).strip()
+        self.authcode = req.load("http://premium.to/api/getauthcode.php?username=%s&password=%s" % (user, data["password"])).strip()
         
         if "wrong username" in self.authcode:
             self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/hooks/Premium4Me.py b/module/plugins/hooks/Premium4Me.py
index b49eb41a9..16b02ce87 100644
--- a/module/plugins/hooks/Premium4Me.py
+++ b/module/plugins/hooks/Premium4Me.py
@@ -5,19 +5,19 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class Premium4Me(MultiHoster):
     __name__ = "Premium4Me"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __type__ = "hook"
 
     __config__ = [("activated", "bool", "Activated", "False"),
         ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
         ("hosterList", "str", "Hoster list (comma separated)", "")]
-    __description__ = """premium4.me hook plugin"""
-    __author_name__ = ("RaNaN", "zoidberg")
-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+    __description__ = """Premium.to hook plugin"""
+    __author_name__ = ("RaNaN", "zoidberg", "stickell")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
     def getHoster(self):
 
-        page = getURL("http://premium4.me/api/hosters.php?authcode=%s" % self.account.authcode)
+        page = getURL("http://premium.to/api/hosters.php?authcode=%s" % self.account.authcode)
         return [x.strip() for x in page.replace("\"", "").split(";")]
 
     def coreReady(self):
@@ -27,7 +27,7 @@ class Premium4Me(MultiHoster):
         user = self.account.selectAccount()[0]
 
         if not user:
-            self.logError(_("Please add your premium4.me account first and restart pyLoad"))
+            self.logError(_("Please add your premium.to account first and restart pyLoad"))
             return
 
         return MultiHoster.coreReady(self)
\ No newline at end of file
diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index 08479b59c..4058c707a 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -11,11 +11,11 @@ from module.utils import fs_encode
 
 class Premium4Me(Hoster):
     __name__ = "Premium4Me"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __type__ = "hoster"
 
-    __pattern__ = r"http://premium4.me/.*"
-    __description__ = """premium4.me hoster plugin"""
+    __pattern__ = r"http://premium.to/.*"
+    __description__ = """Premium.to hoster plugin"""
     __author_name__ = ("RaNaN", "zoidberg", "stickell")
     __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
@@ -25,10 +25,10 @@ class Premium4Me(Hoster):
 
     def process(self, pyfile):
         if not self.account:
-            self.logError(_("Please enter your premium4.me account or deactivate this plugin"))
-            self.fail("No premium4.me account provided")
+            self.logError(_("Please enter your premium.to account or deactivate this plugin"))
+            self.fail("No premium.to account provided")
 
-        self.logDebug("premium4.me: Old URL: %s" % pyfile.url)
+        self.logDebug("premium.to: Old URL: %s" % pyfile.url)
 
         tra = self.getTraffic()
 
@@ -36,7 +36,7 @@ class Premium4Me(Hoster):
         self.req.setOption("timeout", 120)
 
         self.download(
-            "http://premium4.me/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, "")),
+            "http://premium.to/api/getfile.php?authcode=%s&link=%s" % (self.account.authcode, quote(pyfile.url, "")),
             disposition=True)
 
         check = self.checkDownload({"nopremium": "No premium account available"})
@@ -64,7 +64,7 @@ class Premium4Me(Hoster):
 
     def getTraffic(self):
         try:
-            traffic = int(self.load("http://premium4.me/api/traffic.php?authcode=%s" % self.account.authcode))
+            traffic = int(self.load("http://premium.to/api/traffic.php?authcode=%s" % self.account.authcode))
         except:
             traffic = 0
         return traffic       
-- 
cgit v1.2.3


From d941665ed67b9bc1f188edef8b3ff8f923f6d337 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sun, 16 Jun 2013 14:41:41 +0200
Subject: YouTubeCom: fixed #166. See also #163

---
 module/plugins/hoster/YoutubeCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index e3eddf638..129b948bf 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -34,7 +34,7 @@ class YoutubeCom(Hoster):
     __name__ = "YoutubeCom"
     __type__ = "hoster"
     __pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*"
-    __version__ = "0.33"
+    __version__ = "0.34"
     __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"),
         ("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0),
         (".mp4", "bool", "Allow .mp4", True),
@@ -76,7 +76,7 @@ class YoutubeCom(Hoster):
     def process(self, pyfile):
         html = self.load(pyfile.url, decode=True)
 
-        if '<h1 id="unavailable-message" class="message">' in html:
+        if re.search(r'<div id="player-unavailable" class="\s*player-width player-height\s*">', html):
             self.offline()
 
         if "We have been receiving a large volume of requests from your network." in html:
-- 
cgit v1.2.3


From 447e2d68df1bb922c05849c5448cbfaac92d1c8a Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 17 Jun 2013 15:23:11 +0300
Subject: DebridItaliaCom: new hoster supported

---
 module/plugins/hooks/DebridItaliaCom.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hooks/DebridItaliaCom.py b/module/plugins/hooks/DebridItaliaCom.py
index 80cdc45f6..99b2dd626 100644
--- a/module/plugins/hooks/DebridItaliaCom.py
+++ b/module/plugins/hooks/DebridItaliaCom.py
@@ -20,7 +20,7 @@ from module.plugins.internal.MultiHoster import MultiHoster
 
 class DebridItaliaCom(MultiHoster):
     __name__ = "DebridItaliaCom"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __type__ = "hook"
     __config__ = [("activated", "bool", "Activated", "False"),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
@@ -38,4 +38,5 @@ class DebridItaliaCom(MultiHoster):
                 "bitshare.com", "share-links.biz", "putlocker.com", "uploaded.to",
                 "speedload.org", "rapidgator.net", "likeupload.net", "cyberlocker.ch",
                 "depositfiles.com", "extabit.com", "filefactory.com", "sharefiles.co",
-                "ryushare.com", "tusfiles.net", "nowvideo.co", "cloudzer.net", "letitbit.net"]
+                "ryushare.com", "tusfiles.net", "nowvideo.co", "cloudzer.net", "letitbit.net",
+                "easybytez.com"]
-- 
cgit v1.2.3


From 3e2c08f5a6031f9af068af62b064c6056bbef67b Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 17 Jun 2013 21:30:30 +0200
Subject: RapidgatorNet: fixed #168

---
 module/plugins/hoster/RapidgatorNet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py
index d2ca77e0f..1a97eaa54 100644
--- a/module/plugins/hoster/RapidgatorNet.py
+++ b/module/plugins/hoster/RapidgatorNet.py
@@ -29,7 +29,7 @@ class RapidgatorNet(SimpleHoster):
     __name__ = "RapidgatorNet"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www\.)?(rapidgator.net)/file/(\w+)"
-    __version__ = "0.17"
+    __version__ = "0.18"
     __description__ = """rapidgator.net"""
     __author_name__ = ("zoidberg", "chrox", "stickell")
 
@@ -39,7 +39,7 @@ class RapidgatorNet(SimpleHoster):
     FILE_OFFLINE_PATTERN = r'<title>File not found</title>'
 
     JSVARS_PATTERN = r"\s+var\s*(startTimerUrl|getDownloadUrl|captchaUrl|fid|secs)\s*=\s*'?(.*?)'?;"
-    DOWNLOAD_LINK_PATTERN = r"return '(http[^']+)';\s*}\s*}\s*}\);"
+    DOWNLOAD_LINK_PATTERN = r"return '(http[^']+)';\s*}\s*}\s*}?\);"
     RECAPTCHA_KEY_PATTERN = r'"http://api.recaptcha.net/challenge?k=(.*?)"'
     ADSCAPTCHA_SRC_PATTERN = r'(http://api.adscaptcha.com/Get.aspx[^"\']*)'
     SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"'
-- 
cgit v1.2.3


From c05646c876698372b1060d06fa2005363d7032ac Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 17 Jun 2013 21:33:40 +0200
Subject: RapidgatorNet: code reformat

---
 module/plugins/hoster/RapidgatorNet.py | 38 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py
index 1a97eaa54..3c4611446 100644
--- a/module/plugins/hoster/RapidgatorNet.py
+++ b/module/plugins/hoster/RapidgatorNet.py
@@ -18,13 +18,13 @@
 
 import re
 from pycurl import HTTPHEADER
-from random import random
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia, AdsCaptcha
 from module.common.json_layer import json_loads
 from module.network.HTTPRequest import BadHeader
 
+
 class RapidgatorNet(SimpleHoster):
     __name__ = "RapidgatorNet"
     __type__ = "hoster"
@@ -43,28 +43,28 @@ class RapidgatorNet(SimpleHoster):
     RECAPTCHA_KEY_PATTERN = r'"http://api.recaptcha.net/challenge?k=(.*?)"'
     ADSCAPTCHA_SRC_PATTERN = r'(http://api.adscaptcha.com/Get.aspx[^"\']*)'
     SOLVEMEDIA_PATTERN = r'http:\/\/api\.solvemedia\.com\/papi\/challenge\.script\?k=(.*?)"'
-    
+
     def setup(self):
         self.resumeDownload = False
         self.multiDL = False
         self.sid = None
         self.chunkLimit = 1
         self.req.setOption("timeout", 120)
-        
+
     def process(self, pyfile):
-        if self.account:            
-            self.sid = self.account.getAccountData(self.user).get('SID', None) 
-        
+        if self.account:
+            self.sid = self.account.getAccountData(self.user).get('SID', None)
+
         if self.sid:
             self.handlePremium()
         else:
-            self.handleFree()            
+            self.handleFree()
 
     def getAPIResponse(self, cmd):
         try:
             json = self.load('%s/%s' % (self.API_URL, cmd),
-                             get = {'sid': self.sid,
-                                    'url': self.pyfile.url}, decode = True)
+                             get={'sid': self.sid,
+                                  'url': self.pyfile.url}, decode=True)
             self.logDebug('API:%s' % cmd, json, "SID: %s" % self.sid)
             json = json_loads(json)
             status = json['response_status']
@@ -94,11 +94,11 @@ class RapidgatorNet(SimpleHoster):
         self.download(url)
 
     def handleFree(self):
-        self.html = self.load(self.pyfile.url, decode = True)
+        self.html = self.load(self.pyfile.url, decode=True)
         self.getFileInfo()
-    
+
         if "You can download files up to 500 MB in free mode" in self.html \
-        or "This file can be downloaded by premium only" in self.html:
+            or "This file can be downloaded by premium only" in self.html:
             self.fail("Premium account needed for download")
 
         self.checkWait()
@@ -109,13 +109,15 @@ class RapidgatorNet(SimpleHoster):
         self.req.http.lastURL = self.pyfile.url
         self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
 
-        url = "http://rapidgator.net%s?fid=%s" % (jsvars.get('startTimerUrl', '/download/AjaxStartTimer'), jsvars["fid"])
+        url = "http://rapidgator.net%s?fid=%s" % (
+            jsvars.get('startTimerUrl', '/download/AjaxStartTimer'), jsvars["fid"])
         jsvars.update(self.getJsonResponse(url))
 
         self.setWait(int(jsvars.get('secs', 30)) + 1, False)
         self.wait()
 
-        url = "http://rapidgator.net%s?sid=%s" % (jsvars.get('getDownloadUrl', '/download/AjaxGetDownload'), jsvars["sid"])
+        url = "http://rapidgator.net%s?sid=%s" % (
+            jsvars.get('getDownloadUrl', '/download/AjaxGetDownload'), jsvars["sid"])
         jsvars.update(self.getJsonResponse(url))
 
         self.req.http.lastURL = self.pyfile.url
@@ -167,7 +169,8 @@ class RapidgatorNet(SimpleHoster):
         self.download(download_url)
 
     def checkWait(self):
-        found = re.search(r"(?:Delay between downloads must be not less than|Try again in)\s*(\d+)\s*(hour|min)", self.html)
+        found = re.search(r"(?:Delay between downloads must be not less than|Try again in)\s*(\d+)\s*(hour|min)",
+                          self.html)
         if found:
             wait_time = int(found.group(1)) * {"hour": 60, "min": 1}[found.group(2)]
         else:
@@ -180,13 +183,14 @@ class RapidgatorNet(SimpleHoster):
         self.logDebug("Waiting %d minutes" % wait_time)
         self.setWait(wait_time * 60, True)
         self.wait()
-        self.retry(max_tries = 24)
+        self.retry(max_tries=24)
 
     def getJsonResponse(self, url):
-        response = self.load(url, decode = True)
+        response = self.load(url, decode=True)
         if not response.startswith('{'):
             self.retry()
         self.logDebug(url, response)
         return json_loads(response)
 
+
 getInfo = create_getInfo(RapidgatorNet)
-- 
cgit v1.2.3


From 95f86060e833b444542ebadede42ac06cc93749a Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Wed, 19 Jun 2013 13:52:02 +0200
Subject: UnrestrictLi: get API data for size/checksum

---
 module/plugins/hoster/UnrestrictLi.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index 273a300a0..1652dc606 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -35,7 +35,7 @@ def secondsToMidnight():
 
 class UnrestrictLi(Hoster):
     __name__ = "UnrestrictLi"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "hoster"
     __pattern__ = r"https?://.*(unrestrict|unr)\.li"
     __description__ = """Unrestrict.li hoster plugin"""
@@ -65,7 +65,9 @@ class UnrestrictLi(Hoster):
             elif "You have reached your daily limit for this host" in page:
                 self.logInfo("Reached daily limit for this host. Waiting until 00:10 GMT+2")
                 self.retry(5, secondsToMidnight(), "Daily limit for this host reached")
-            new_url = json_loads(page).keys()[0]
+            page = json_loads(page)
+            new_url = page.keys()[0]
+            self.api_data = page[new_url]
 
         self.logDebug("New URL: " + new_url)
 
-- 
cgit v1.2.3


From a672b812ba74aadceda950d36dcffcb27d2a8604 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Thu, 20 Jun 2013 16:47:24 +0200
Subject: FilerNet: premium support

---
 module/plugins/accounts/FilerNet.py | 63 +++++++++++++++++++++++++++++++++++++
 module/plugins/hoster/FilerNet.py   | 30 +++++++++++++-----
 2 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 module/plugins/accounts/FilerNet.py

diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
new file mode 100644
index 000000000..7afd00f25
--- /dev/null
+++ b/module/plugins/accounts/FilerNet.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+import re
+import _strptime
+import time
+
+from module.plugins.Account import Account
+from module.utils import parseFileSize
+
+
+class FilerNet(Account):
+    __name__ = "FilerNet"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """Filer.net account plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
+    WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>"
+    TRAFFIC_PATTERN = r'Traffic</th>\s*<td>([^<]+)</td>'
+    FREE_PATTERN = r'Account Status</th>\s*<td>\s*Free'
+
+    def loadAccountInfo(self, user, req):
+        self.html = req.load("https://filer.net/profile")
+
+        # Free user
+        if re.search(self.FREE_PATTERN, self.html):
+            return {"premium": False, "validuntil": None, "trafficleft": None}
+
+        until = re.search(self.WALID_UNTIL_PATTERN, self.html)
+        traffic = re.search(self.TRAFFIC_PATTERN, self.html)
+        if until and traffic:
+            validuntil = int(time.mktime(time.strptime(until.group(1), "%d.%m.%Y %H:%M:%S")))
+            trafficleft = parseFileSize(traffic.group(1)) / 1024
+            return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
+        else:
+            self.logError('Unable to retrieve account information - Plugin may be out of date')
+            return {"premium": False, "validuntil": None, "trafficleft": None}
+
+    def login(self, user, data, req):
+        self.html = req.load("https://filer.net/login")
+        token = re.search(self.TOKEN_PATTERN, self.html).group(1)
+        self.html = req.load("https://filer.net/login_check",
+                             post={"_username": user, "_password": data["password"],
+                                   "_remember_me": "on", "_csrf_token": token, "_target_path": "https://filer.net/"})
+        if 'Logout' not in self.html:
+            self.wrongPassword()
diff --git a/module/plugins/hoster/FilerNet.py b/module/plugins/hoster/FilerNet.py
index 9693723f9..815685ef8 100644
--- a/module/plugins/hoster/FilerNet.py
+++ b/module/plugins/hoster/FilerNet.py
@@ -30,7 +30,7 @@ class FilerNet(SimpleHoster):
     __name__ = "FilerNet"
     __type__ = "hoster"
     __pattern__ = r"https?://(www\.)?filer\.net/get/(\w+)"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __description__ = """Filer.net Download Hoster"""
     __author_name__ = ("stickell")
     __author_mail__ = ("l.stickell@yahoo.it")
@@ -38,10 +38,17 @@ class FilerNet(SimpleHoster):
     FILE_INFO_PATTERN = r'<h1 class="page-header">Free Download (?P<N>\S+) <small>(?P<S>[\w.]+) (?P<U>\w+)</small></h1>'
     FILE_OFFLINE_PATTERN = r'Nicht gefunden'
     RECAPTCHA_KEY = '6LcFctISAAAAAAgaeHgyqhNecGJJRnxV1m_vAz3V'
+    DIRECT_LINK_PATTERN = r'href="([^"]+)">Get download</a>'
 
     def process(self, pyfile):
+        if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()):
+            self.handlePremium()
+        else:
+            self.handleFree()
+
+    def handleFree(self):
         self.req.setOption("timeout", 120)
-        self.html = self.load(pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES)
+        self.html = self.load(self.pyfile.url, decode=not self.SH_BROKEN_ENCODING, cookies=self.SH_COOKIES)
 
         # Wait between downloads
         m = re.search(r'musst du <span id="time">(\d+)</span> Sekunden warten', self.html)
@@ -50,12 +57,7 @@ class FilerNet(SimpleHoster):
             self.retry(3, waittime, 'Wait between free downloads')
 
         self.getFileInfo()
-        if self.premium and (not self.SH_CHECK_TRAFFIC or self.checkTrafficLeft()):
-            self.handlePremium()
-        else:
-            self.handleFree()
 
-    def handleFree(self):
         self.html = self.load(self.pyfile.url, decode=True)
 
         inputs = self.parseHtmlForm(input_names='token')[1]
@@ -99,5 +101,19 @@ class FilerNet(SimpleHoster):
 
         self.download(downloadURL, disposition=True)
 
+    def handlePremium(self):
+        header = self.load(self.pyfile.url, just_header=True)
+        if 'location' in header:  # Direct Download ON
+            dl = self.pyfile.url
+        else:  # Direct Download OFF
+            html = self.load(self.pyfile.url)
+            m = re.search(self.DIRECT_LINK_PATTERN, html)
+            if not m:
+                self.parseError("Unable to detect direct link, try to enable 'Direct download' in your user settings")
+            dl = 'http://filer.net' + m.group(1)
+
+        self.logDebug('Direct link: ' + dl)
+        self.download(dl, disposition=True)
+
 
 getInfo = create_getInfo(FilerNet)
-- 
cgit v1.2.3


From 3dd3a1253018ef21db08e8116ea6eb5166826f86 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 22 Jun 2013 16:41:09 +0200
Subject: HotFolder: see

http://forum.pyload.org/viewtopic.php?f=13&t=2735
---
 module/plugins/hooks/HotFolder.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index ee1031ad5..21ed5ef8e 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.2"
     __description__ = """observe folder and file for changes and add container and links"""
     __config__ = [ ("activated", "bool", "Activated" , "False"),
                    ("folder", "str", "Folder to observe", "container"),
@@ -46,7 +46,7 @@ class HotFolder(Hook):
         
     def periodical(self):
         
-        if not exists(join(self.getConfig("folder"), "finished")):
+        if self.getConfig("keep") and not exists(join(self.getConfig("folder"), "finished")):
             makedirs(join(self.getConfig("folder"), "finished"))
           
         if self.getConfig("watch_file"):
@@ -82,4 +82,4 @@ class HotFolder(Hook):
             self.log.info(_("Added %s from HotFolder") % f)
             self.core.api.addPackage(f, [newpath], 1)
             
-        
\ No newline at end of file
+        
-- 
cgit v1.2.3


From cd1926a9be479e18d7782075c0687fd4733a93c3 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 22 Jun 2013 20:39:19 +0200
Subject: DdlstogrageComFolder: fixed regex. Now based on SimpleCrypter

---
 module/plugins/crypter/DdlstorageComFolder.py | 46 +++++++++++++--------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py
index d536032c6..d76988c92 100644
--- a/module/plugins/crypter/DdlstorageComFolder.py
+++ b/module/plugins/crypter/DdlstorageComFolder.py
@@ -1,32 +1,30 @@
 # -*- coding: utf-8 -*-
 
-import re
-from module.plugins.Crypter import Crypter
-from module.plugins.hoster.MediafireCom import checkHTMLHeader
-from module.common.json_layer import json_loads
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
 
-class DdlstorageComFolder(Crypter):
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+
+
+class DdlstorageComFolder(SimpleCrypter):
     __name__ = "DdlstorageComFolder"
     __type__ = "crypter"
     __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/folder/\w{10}"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __description__ = """DDLStorage.com Folder Plugin"""
-    __author_name__ = ("godofdream")
-    __author_mail__ = ("soilfiction@gmail.com")
-
-    FILE_URL_PATTERN = '<a style="text-decoration:none;" href="http://www.ddlstorage.com/(.*)">'
+    __author_name__ = ("godofdream", "stickell")
+    __author_mail__ = ("soilfiction@gmail.com", "l.stickell@yahoo.it")
 
-    def decrypt(self, pyfile):
-        new_links = []
-        # load and parse html            
-        html = self.load(pyfile.url)
-        found = re.findall(self.FILE_URL_PATTERN, html)
-        self.logDebug(found)
-        for link in found:
-            # file page
-            new_links.append("http://www.ddlstorage.com/%s" % link)
-    
-        if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
-        else:
-            self.fail('Could not extract any links')
+    LINK_PATTERN = '<a class="sub_title" style="text-decoration:none;" href="(http://www.ddlstorage.com/.*)">'
-- 
cgit v1.2.3


From 03b3d43698aaf8195e4470faf7ab613c31c48b21 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 22 Jun 2013 20:47:10 +0200
Subject: DdlstorageCom: updated regex + code cleanup

---
 module/plugins/hoster/DdlstorageCom.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py
index 1ad5fa6d8..5eaebf1d1 100644
--- a/module/plugins/hoster/DdlstorageCom.py
+++ b/module/plugins/hoster/DdlstorageCom.py
@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
+
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
 
+
 class DdlstorageCom(XFileSharingPro):
     __name__ = "DdlstorageCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/\w{12}"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __description__ = """DDLStorage.com hoster plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
-    
-    FILE_INFO_PATTERN = r'<h2>\s*Download File\s*<span[^>]*>(?P<N>[^>]+)</span></h2>\s*[^\(]*\((?P<S>[^\)]+)\)</h2>'
+    __author_name__ = ("zoidberg", "stickell")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+
+    FILE_INFO_PATTERN = r'<p class="sub_title"[^>]*>(?P<N>.+) \((?P<S>[^)]+)\)</p>'
     HOSTER_NAME = "ddlstorage.com"
-   
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium        
-        self.chunkLimit = 1
+
 
 getInfo = create_getInfo(DdlstorageCom)
\ No newline at end of file
-- 
cgit v1.2.3


From 647fb9759f964ae71fdcf942c55e7ac10cbfcdcd Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 22 Jun 2013 20:55:22 +0200
Subject: HotFolder: Rollback after
 http://forum.pyload.org/viewtopic.php?p=10169#p10169

---
 module/plugins/hooks/HotFolder.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/plugins/hooks/HotFolder.py b/module/plugins/hooks/HotFolder.py
index 21ed5ef8e..ee1031ad5 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.2"
+    __version__ = "0.1"
     __description__ = """observe folder and file for changes and add container and links"""
     __config__ = [ ("activated", "bool", "Activated" , "False"),
                    ("folder", "str", "Folder to observe", "container"),
@@ -46,7 +46,7 @@ class HotFolder(Hook):
         
     def periodical(self):
         
-        if self.getConfig("keep") and not exists(join(self.getConfig("folder"), "finished")):
+        if not exists(join(self.getConfig("folder"), "finished")):
             makedirs(join(self.getConfig("folder"), "finished"))
           
         if self.getConfig("watch_file"):
@@ -82,4 +82,4 @@ class HotFolder(Hook):
             self.log.info(_("Added %s from HotFolder") % f)
             self.core.api.addPackage(f, [newpath], 1)
             
-        
+        
\ No newline at end of file
-- 
cgit v1.2.3


From 19d10abe861dcb35d838f384a68b042f56490fcd Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sat, 22 Jun 2013 21:25:27 +0200
Subject: UnrestrictLi: account plugin revisited

---
 module/plugins/accounts/UnrestrictLi.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index d01f7cde8..9ec2ea996 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -21,27 +21,34 @@ from module.common.json_layer import json_loads
 
 class UnrestrictLi(Account):
     __name__ = "UnrestrictLi"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "account"
     __description__ = """Unrestrict.li account plugin"""
     __author_name__ = ("stickell")
     __author_mail__ = ("l.stickell@yahoo.it")
 
     def loadAccountInfo(self, user, req):
-        if 'unrestrict_user' not in req.cj.cookies:
-            self.login(user, self.getAccountData(user), req)
         json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json')
         self.logDebug("JSON data: " + json_data)
         json_data = json_loads(json_data)
 
+        if 'vip' in json_data['result'] and json_data['result']['vip'] == 0:
+            return {"premium": False}
+
         validuntil = json_data['result']['expires']
         trafficleft = int(json_data['result']['traffic'] / 1024)
 
         return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
 
     def login(self, user, data, req):
+        html = req.load("https://unrestrict.li/sign_in")
+
+        if 'solvemedia' in html:
+            self.logError("A Captcha is required. Go to http://unrestrict.li/sign_in and login, then retry")
+            return
+
         self.html = req.load("https://unrestrict.li/sign_in",
-                             post={"return": "",
-                                   "username": user, "password": data["password"], "signin": "Sign+in"})
-        if 'unrestrict_user' not in req.cj.cookies:
+                             post={"username": user, "password": data["password"], "signin": "Sign in"})
+
+        if 'sign_out' not in self.html:
             self.wrongPassword()
-- 
cgit v1.2.3


From d898872107f8a6a7a4d8b8610ef367a7b07d6a88 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sun, 23 Jun 2013 20:19:26 +0200
Subject: UnrestrictLi: added ability to delete the download history

---
 module/plugins/hooks/UnrestrictLi.py  | 5 +++--
 module/plugins/hoster/UnrestrictLi.py | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/module/plugins/hooks/UnrestrictLi.py b/module/plugins/hooks/UnrestrictLi.py
index 793e63e8f..0810a22d5 100644
--- a/module/plugins/hooks/UnrestrictLi.py
+++ b/module/plugins/hooks/UnrestrictLi.py
@@ -22,13 +22,14 @@ from module.common.json_layer import json_loads
 
 class UnrestrictLi(MultiHoster):
     __name__ = "UnrestrictLi"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __type__ = "hook"
     __config__ = [("activated", "bool", "Activated", "False"),
                   ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"),
                   ("hosterList", "str", "Hoster list (comma separated)", ""),
                   ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
-                  ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
+                  ("interval", "int", "Reload interval in hours (0 to disable)", "24"),
+                  ("history", "bool", "Delete History", "False")]
 
     __description__ = """Unrestrict.li hook plugin"""
     __author_name__ = ("stickell")
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index 1652dc606..e866a9269 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -35,7 +35,7 @@ def secondsToMidnight():
 
 class UnrestrictLi(Hoster):
     __name__ = "UnrestrictLi"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __type__ = "hoster"
     __pattern__ = r"https?://.*(unrestrict|unr)\.li"
     __description__ = """Unrestrict.li hoster plugin"""
@@ -56,7 +56,8 @@ class UnrestrictLi(Hoster):
             new_url = pyfile.url
         else:
             for i in xrange(5):
-                page = self.req.load('https://unrestrict.li/unrestrict.php', post={'link': pyfile.url, 'domain': 'long'})
+                page = self.req.load('https://unrestrict.li/unrestrict.php',
+                                     post={'link': pyfile.url, 'domain': 'long'})
                 self.logDebug("JSON data: " + page)
                 if page != '':
                     break
@@ -72,3 +73,7 @@ class UnrestrictLi(Hoster):
         self.logDebug("New URL: " + new_url)
 
         self.download(new_url, disposition=True)
+
+        if self.getConfig("history"):
+            self.load("https://unrestrict.li/history/&delete=all")
+            self.logInfo("Download history deleted")
-- 
cgit v1.2.3


From a3ae4ba6df133beb7f6daf0443210f59d3e86399 Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Mon, 24 Jun 2013 00:51:12 +0200
Subject: Bugfix: super() function

---
 module/plugins/hoster/StreamcloudEu.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 9e7c61ccc..7dec2e65b 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -15,7 +15,7 @@ class StreamcloudEu(XFileSharingPro):
     DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.mp4)",'
 
     def setup(self):
-        super(XFileSharingPro, self).setup()
+        super(StreamcloudEu, self).setup()
         self.multiDL = True
 
     def getDownloadLink(self):
@@ -23,6 +23,6 @@ class StreamcloudEu(XFileSharingPro):
         if found:
             return found.group(1)
 
-        return super(XFileSharingPro, self).getDownloadLink()
+        return super(StreamcloudEu, self).getDownloadLink()
 
 getInfo = create_getInfo(StreamcloudEu)
-- 
cgit v1.2.3


From 40831c996c0c80e369d2232bd707e0b2088056fc Mon Sep 17 00:00:00 2001
From: Seoester <seoester@googlemail.com>
Date: Mon, 24 Jun 2013 00:51:54 +0200
Subject: StreamcloudEu Update to meet increased bot protection

---
 module/plugins/hoster/StreamcloudEu.py | 85 +++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 7dec2e65b..35b9a0bd2 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.network.HTTPRequest import HTTPRequest
+from time import sleep
 import re
 
 class StreamcloudEu(XFileSharingPro):
@@ -23,6 +25,87 @@ class StreamcloudEu(XFileSharingPro):
         if found:
             return found.group(1)
 
-        return super(StreamcloudEu, self).getDownloadLink()
+        for i in range(5):
+            self.logDebug("Getting download link: #%d" % i)
+            data = self.getPostParameters()
+            httpRequest = HTTPRequest(options=self.req.options)
+            httpRequest.cj = self.req.cj
+            sleep(10)
+            self.html = httpRequest.load(self.pyfile.url, post = data, referer=False, cookies=True, decode = True)
+            self.header = httpRequest.header
+
+            found = re.search("Location\s*:\s*(.*)", self.header, re.I)
+            if found:
+                break
+
+            found = re.search(self.DIRECT_LINK_PATTERN, self.html, re.S)
+            if found:
+                break
+
+        else:
+            if self.errmsg and 'captcha' in self.errmsg:
+                self.fail("No valid captcha code entered")
+            else:
+                self.fail("Download link not found")
+
+        return found.group(1)
+
+    def getPostParameters(self):
+        for i in range(3):
+            if not self.errmsg: self.checkErrors()
+
+            if hasattr(self,"FORM_PATTERN"):
+                action, inputs = self.parseHtmlForm(self.FORM_PATTERN)
+            else:
+                action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
+
+            if not inputs:
+                action, inputs = self.parseHtmlForm('F1')
+                if not inputs:
+                    if self.errmsg:
+                        self.retry()
+                    else:
+                        self.parseError("Form not found")
+
+            self.logDebug(self.HOSTER_NAME, inputs)
+
+            if 'op' in inputs and inputs['op'] in ('download1', 'download2', 'download3'):
+                if "password" in inputs:
+                    if self.passwords:
+                        inputs['password'] = self.passwords.pop(0)
+                    else:
+                        self.fail("No or invalid passport")
+
+                if not self.premium:
+                    found = re.search(self.WAIT_PATTERN, self.html)
+                    if found:
+                        wait_time = int(found.group(1)) + 1
+                        self.setWait(wait_time, False)
+                    else:
+                        wait_time = 0
+
+                    self.captcha = self.handleCaptcha(inputs)
+
+                    if wait_time: self.wait()
+
+                self.errmsg = None
+                self.logDebug("getPostParameters {0}".format(i))
+                return inputs
+
+            else:
+                inputs['referer'] = self.pyfile.url
+
+                if self.premium:
+                    inputs['method_premium'] = "Premium Download"
+                    if 'method_free' in inputs: del inputs['method_free']
+                else:
+                    inputs['method_free'] = "Free Download"
+                    if 'method_premium' in inputs: del inputs['method_premium']
+
+                self.html = self.load(self.pyfile.url, post = inputs, ref = False)
+                self.errmsg = None
+
+        else: self.parseError('FORM: %s' % (inputs['op'] if 'op' in inputs else 'UNKNOWN'))
+
 
 getInfo = create_getInfo(StreamcloudEu)
-- 
cgit v1.2.3


From 3229f1593f18efeceb8b98f45d4d4c15a5555d16 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Tue, 25 Jun 2013 14:16:12 +0300
Subject: StreamcloudEu: increased version number after
 40831c996c0c80e369d2232bd707e0b2088056fc

---
 module/plugins/hoster/StreamcloudEu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 35b9a0bd2..73c0465f8 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -8,7 +8,7 @@ class StreamcloudEu(XFileSharingPro):
     __name__ = "StreamcloudEu"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?streamcloud\.eu/\S+"
-    __version__ = "0.01"
+    __version__ = "0.02"
     __description__ = """Streamcloud.eu hoster plugin"""
     __author_name__ = ("seoester")
     __author_mail__ = ("seoester@googlemail.com")
-- 
cgit v1.2.3


From 0903563a3e3fe087e21fb54d1a77f388492f87d7 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 28 Jun 2013 16:34:52 +0200
Subject: Fixed #170

---
 module/plugins/hooks/XFileSharingPro.py         |  2 +-
 module/plugins/hoster/HundredEightyUploadCom.py | 36 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 module/plugins/hoster/HundredEightyUploadCom.py

diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index ceaec96c6..f14ba7eb7 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -38,7 +38,7 @@ class XFileSharingPro(Hook):
             "banicrazy.info", "flowhot.info", "upbrasil.info", "shareyourfilez.biz", "bzlink.us", "cloudcache.cc", "fileserver.cc"
             "farshare.to", "filemaze.ws", "filehost.ws", "filestock.ru", "moidisk.ru", "4up.im", "100shared.com",
             #WRONG FILE NAME:
-            "sendmyway.com", "upchi.co.il", "180upload.com",
+            "sendmyway.com", "upchi.co.il",
             #NOT WORKING:
             "amonshare.com", "imageporter.com", "file4safe.com",
             #DOWN OR BROKEN:
diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
new file mode 100644
index 000000000..d8b744359
--- /dev/null
+++ b/module/plugins/hoster/HundredEightyUploadCom.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+
+
+class HundredEightyUploadCom(XFileSharingPro):
+    __name__ = "HundredEightyUploadCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:\w*\.)?180upload\.com/(\w+).*"
+    __version__ = "0.01"
+    __description__ = """180upload.com hoster plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    FILE_NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>.+)</td></tr>-->'
+    FILE_SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.]+) (?P<U>[A-Z]+)\s*<small>'
+
+    HOSTER_NAME = "180upload.com"
+
+
+getInfo = create_getInfo(HundredEightyUploadCom)
-- 
cgit v1.2.3


From 7bf2fe99e8d704719a81b3a9ac7ffdb4b0324987 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 28 Jun 2013 16:51:29 +0200
Subject: LoadTo: Plugin rewritten to fix #181

---
 module/plugins/hoster/LoadTo.py | 64 ++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 43 deletions(-)

diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py
index babf354a9..0f99c272a 100644
--- a/module/plugins/hoster/LoadTo.py
+++ b/module/plugins/hoster/LoadTo.py
@@ -16,41 +16,25 @@
     @author: halfman
 """
 
+# Test links (random.bin):
+# http://www.load.to/dNsmgXRk4/random.bin
+# http://www.load.to/edbNTxcUb/random100.bin
+
 import re
-from module.plugins.Hoster import Hoster
-from module.network.RequestFactory import getURL
-
-def getInfo(urls):
-    result = []
-
-    for url in urls:
-
-        html = getURL(url, decode=True)
-        if re.search(LoadTo.FILE_OFFLINE_PATTERN, html):
-            # File offline
-            result.append((url, 0, 1, url))
-        else:
-            # Get file info
-            name = re.search(LoadTo.FILE_NAME_PATTERN, html)
-            size = re.search(LoadTo.SIZE_PATTERN, html)
-            if name is not None and size is not None:
-                name = name.group(1)
-                size = size.group(1)
-                result.append((name, size, 2, url))
-    yield result
-
-class LoadTo(Hoster):
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class LoadTo(SimpleHoster):
     __name__ = "LoadTo"
     __type__ = "hoster"
-    __pattern__ = r"http://(www.*?\.)?load\.to/.{7,10}?/.*" 
-    __version__ = "0.11"
-    __description__ = """load.to"""
-    __author_name__ = ("halfman")
-    __author_mail__ = ("Pulpan3@gmail.com")
+    __pattern__ = r"http://(?:www\.)?load\.to/\w+"
+    __version__ = "0.12"
+    __description__ = """Load.to hoster plugin"""
+    __author_name__ = ("halfman", "stickell")
+    __author_mail__ = ("Pulpan3@gmail.com", "l.stickell@yahoo.it")
 
-    FILE_NAME_PATTERN = r'<div class="toolarge"><h1>(.+?)</h1></div>'
+    FILE_INFO_PATTERN = r'<a [^>]+>(?P<N>.+)</a></h3>\s*Size: (?P<S>\d+) Bytes'
     URL_PATTERN = r'<form method="post" action="(.+?)"'
-    SIZE_PATTERN = r'<div class="download_table_right">(\d+) Bytes</div>'
     FILE_OFFLINE_PATTERN = r'Can\'t find file. Please check URL.<br />'
     WAIT_PATTERN = r'type="submit" value="Download \((\d+)\)"'
 
@@ -61,23 +45,17 @@ class LoadTo(Hoster):
 
         self.html = self.load(pyfile.url, decode=True)
 
-        if re.search(self.FILE_OFFLINE_PATTERN, self.html):
-            self.offline()
-        
-        found = re.search(self.FILE_NAME_PATTERN, self.html)
-        if found is None:
-            self.fail("Parse error (NAME)")
-        pyfile.name = found.group(1)
-
         found = re.search(self.URL_PATTERN, self.html)
-        if found is None:
-            self.fail("Parse error (URL)")
+        if not found:
+            self.parseError('URL')
         download_url = found.group(1)
-        
+
         timmy = re.search(self.WAIT_PATTERN, self.html)
         if timmy:
             self.setWait(timmy.group(1))
             self.wait()
 
-        self.req.setOption("timeout", 120)
-        self.download(download_url)
\ No newline at end of file
+        self.download(download_url, disposition=True)
+
+
+getInfo = create_getInfo(LoadTo)
-- 
cgit v1.2.3


From 01af811fe357442d7ae734f5b1c56ffb95e81c71 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 5 Jul 2013 14:02:02 +0200
Subject: EasybytezCom: update FILE_INFO_PATTERN

---
 module/plugins/hoster/EasybytezCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 61957085b..8cc4b6e8f 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -28,7 +28,7 @@ class EasybytezCom(XFileSharingPro):
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
-    FILE_INFO_PATTERN = r'<h2>Download File (?P<N>.+)</h2>\s*<font [^>]+>You have requested <font color="red">[^<]+</font> \((?P<S>.+)\)</font>'
+    FILE_INFO_PATTERN = r'<span class="name">(?P<N>.+)</span><br>\s*<span class="size">(?P<S>[^<]+)</span>'
     FILE_OFFLINE_PATTERN = r'<h1>File not available</h1>'
 
     DIRECT_LINK_PATTERN = r'(http://(\w+\.(easyload|easybytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
-- 
cgit v1.2.3


From 3037e8bc5564535f123f45862b71bab2bd918a35 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Fri, 5 Jul 2013 14:04:54 +0200
Subject: EasybytezCom: version increased after
 01af811fe357442d7ae734f5b1c56ffb95e81c71

---
 module/plugins/hoster/EasybytezCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 8cc4b6e8f..98691a641 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -23,7 +23,7 @@ class EasybytezCom(XFileSharingPro):
     __name__ = "EasybytezCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?easybytez.com/(\w+).*"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __description__ = """easybytez.com"""
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
-- 
cgit v1.2.3


From d9cce8bf855160515e9a05504a7f0fe7f53fc71b Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Mon, 8 Jul 2013 20:54:40 +0200
Subject: CloudzerNet: now uses API data. Fixed #185

---
 module/plugins/hoster/CloudzerNet.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py
index 7608b193d..2701752ce 100644
--- a/module/plugins/hoster/CloudzerNet.py
+++ b/module/plugins/hoster/CloudzerNet.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster
 from module.common.json_layer import json_loads
 from module.plugins.ReCaptcha import ReCaptcha
 from module.network.RequestFactory import getURL
+from module.utils import parseFileSize
 
 
 def getInfo(urls):
@@ -12,7 +13,13 @@ def getInfo(urls):
         if 'Location: http://cloudzer.net/404' in header:
             file_info = (url, 0, 1, url)
         else:
-            file_info = parseFileInfo(CloudzerNet, url, getURL(url, decode=True))
+            if url.endswith('/'):
+                api_data = getURL(url + 'status')
+            else:
+                api_data = getURL(url + '/status')
+            name, size = api_data.splitlines()
+            size = parseFileSize(size)
+            file_info = (name, size, 2, url)
         yield file_info
 
 
@@ -20,10 +27,10 @@ class CloudzerNet(SimpleHoster):
     __name__ = "CloudzerNet"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)(?P<ID>\w+).*"
-    __version__ = "0.02"
+    __version__ = "0.03"
     __description__ = """Cloudzer.net hoster plugin"""
-    __author_name__ = ("gs", "z00nx")
-    __author_mail__ = ("I-_-I-_-I@web.de", "z00nx0@gmail.com")
+    __author_name__ = ("gs", "z00nx", "stickell")
+    __author_mail__ = ("I-_-I-_-I@web.de", "z00nx0@gmail.com", "l.stickell@yahoo.it")
 
     FILE_SIZE_PATTERN = '<span class="size">(?P<S>[^<]+)</span>'
     WAIT_PATTERN = '<meta name="wait" content="(\d+)">'
-- 
cgit v1.2.3


From bfb7c6386311761b23502fd404b357b4017a13ad Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Tue, 9 Jul 2013 21:04:17 +0200
Subject: New crypter requested in #186

---
 module/plugins/crypter/BitshareComFolder.py | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 module/plugins/crypter/BitshareComFolder.py

diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py
new file mode 100644
index 000000000..b77ddb9d9
--- /dev/null
+++ b/module/plugins/crypter/BitshareComFolder.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+
+
+class BitshareComFolder(SimpleCrypter):
+    __name__ = "BitshareComFolder"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?bitshare\.com/\?d=\w+"
+    __version__ = "0.01"
+    __description__ = """Bitshare.com Folder Plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>'
+    TITLE_PATTERN = r'View public folder "(?P<title>.+)"</h1>'
-- 
cgit v1.2.3


From 492884419f8d58a561b14767e205724400f93901 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 12 Jul 2013 01:14:18 +0200
Subject: Fixed chunkLimit value

---
 module/plugins/hoster/UnrestrictLi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index e866a9269..084c2beff 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -35,7 +35,7 @@ def secondsToMidnight():
 
 class UnrestrictLi(Hoster):
     __name__ = "UnrestrictLi"
-    __version__ = "0.03"
+    __version__ = "0.04"
     __type__ = "hoster"
     __pattern__ = r"https?://.*(unrestrict|unr)\.li"
     __description__ = """Unrestrict.li hoster plugin"""
@@ -43,7 +43,7 @@ class UnrestrictLi(Hoster):
     __author_mail__ = ("l.stickell@yahoo.it")
 
     def init(self):
-        self.chunkLimit = -1
+        self.chunkLimit = 16
         self.resumeDownload = True
 
     def process(self, pyfile):
-- 
cgit v1.2.3