From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 8 Oct 2014 20:18:13 +0200
Subject: Add __license__ key attribute to plugins

---
 module/plugins/accounts/AlldebridCom.py           | 1 +
 module/plugins/accounts/BayfilesCom.py            | 1 +
 module/plugins/accounts/BillionuploadsCom.py      | 1 +
 module/plugins/accounts/BitshareCom.py            | 1 +
 module/plugins/accounts/CramitIn.py               | 1 +
 module/plugins/accounts/CzshareCom.py             | 1 +
 module/plugins/accounts/DebridItaliaCom.py        | 1 +
 module/plugins/accounts/DepositfilesCom.py        | 1 +
 module/plugins/accounts/EasybytezCom.py           | 1 +
 module/plugins/accounts/EuroshareEu.py            | 1 +
 module/plugins/accounts/FastixRu.py               | 1 +
 module/plugins/accounts/FastshareCz.py            | 1 +
 module/plugins/accounts/File4safeCom.py           | 1 +
 module/plugins/accounts/FileParadoxIn.py          | 1 +
 module/plugins/accounts/FilecloudIo.py            | 1 +
 module/plugins/accounts/FilefactoryCom.py         | 1 +
 module/plugins/accounts/FilejungleCom.py          | 1 +
 module/plugins/accounts/FileomCom.py              | 1 +
 module/plugins/accounts/FilerNet.py               | 1 +
 module/plugins/accounts/FilerioCom.py             | 1 +
 module/plugins/accounts/FilesMailRu.py            | 1 +
 module/plugins/accounts/FileserveCom.py           | 1 +
 module/plugins/accounts/FourSharedCom.py          | 1 +
 module/plugins/accounts/FreakshareCom.py          | 1 +
 module/plugins/accounts/FreeWayMe.py              | 1 +
 module/plugins/accounts/FshareVn.py               | 1 +
 module/plugins/accounts/Ftp.py                    | 1 +
 module/plugins/accounts/HellshareCz.py            | 1 +
 module/plugins/accounts/Http.py                   | 1 +
 module/plugins/accounts/HugefilesNet.py           | 1 +
 module/plugins/accounts/HundredEightyUploadCom.py | 1 +
 module/plugins/accounts/LetitbitNet.py            | 1 +
 module/plugins/accounts/LinksnappyCom.py          | 1 +
 module/plugins/accounts/LomafileCom.py            | 1 +
 module/plugins/accounts/MegaDebridEu.py           | 1 +
 module/plugins/accounts/MegasharesCom.py          | 1 +
 module/plugins/accounts/MovReelCom.py             | 1 +
 module/plugins/accounts/MultishareCz.py           | 1 +
 module/plugins/accounts/MyfastfileCom.py          | 1 +
 module/plugins/accounts/NetloadIn.py              | 1 +
 module/plugins/accounts/NosuploadCom.py           | 1 +
 module/plugins/accounts/NovafileCom.py            | 1 +
 module/plugins/accounts/OboomCom.py               | 1 +
 module/plugins/accounts/OneFichierCom.py          | 1 +
 module/plugins/accounts/OverLoadMe.py             | 1 +
 module/plugins/accounts/PremiumTo.py              | 1 +
 module/plugins/accounts/PremiumizeMe.py           | 1 +
 module/plugins/accounts/QuickshareCz.py           | 1 +
 module/plugins/accounts/RPNetBiz.py               | 1 +
 module/plugins/accounts/RapidgatorNet.py          | 1 +
 module/plugins/accounts/RapidshareCom.py          | 1 +
 module/plugins/accounts/RarefileNet.py            | 1 +
 module/plugins/accounts/RealdebridCom.py          | 1 +
 module/plugins/accounts/RehostTo.py               | 1 +
 module/plugins/accounts/RyushareCom.py            | 1 +
 module/plugins/accounts/SecureUploadEu.py         | 1 +
 module/plugins/accounts/SendmywayCom.py           | 1 +
 module/plugins/accounts/ShareRapidCom.py          | 1 +
 module/plugins/accounts/ShareonlineBiz.py         | 1 +
 module/plugins/accounts/SimplyPremiumCom.py       | 1 +
 module/plugins/accounts/SimplydebridCom.py        | 1 +
 module/plugins/accounts/StahnuTo.py               | 1 +
 module/plugins/accounts/StreamcloudEu.py          | 1 +
 module/plugins/accounts/TurbobitNet.py            | 1 +
 module/plugins/accounts/TusfilesNet.py            | 1 +
 module/plugins/accounts/UlozTo.py                 | 1 +
 module/plugins/accounts/UnrestrictLi.py           | 1 +
 module/plugins/accounts/UploadedTo.py             | 1 +
 module/plugins/accounts/UploadheroCom.py          | 1 +
 module/plugins/accounts/UploadingCom.py           | 1 +
 module/plugins/accounts/UptoboxCom.py             | 1 +
 module/plugins/accounts/VidPlayNet.py             | 1 +
 module/plugins/accounts/YibaishiwuCom.py          | 1 +
 module/plugins/accounts/ZeveraCom.py              | 1 +
 74 files changed, 74 insertions(+)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index 06469847e..3ebdae629 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -17,6 +17,7 @@ class AlldebridCom(Account):
     __version__ = "0.22"
 
     __description__ = """AllDebrid.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Andy Voigt", "spamsales@online.de")]
 
 
diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py
index a678a3523..b1166b83a 100644
--- a/module/plugins/accounts/BayfilesCom.py
+++ b/module/plugins/accounts/BayfilesCom.py
@@ -12,6 +12,7 @@ class BayfilesCom(Account):
     __version__ = "0.03"
 
     __description__ = """Bayfiles.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py
index 440c7889a..54f0db1c6 100644
--- a/module/plugins/accounts/BillionuploadsCom.py
+++ b/module/plugins/accounts/BillionuploadsCom.py
@@ -9,6 +9,7 @@ class BillionuploadsCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Billionuploads.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py
index e5aef16b8..ea1cca53b 100644
--- a/module/plugins/accounts/BitshareCom.py
+++ b/module/plugins/accounts/BitshareCom.py
@@ -9,6 +9,7 @@ class BitshareCom(Account):
     __version__ = "0.12"
 
     __description__ = """Bitshare account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Paul King", None)]
 
 
diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py
index b84e7f8cc..5edc2dac0 100644
--- a/module/plugins/accounts/CramitIn.py
+++ b/module/plugins/accounts/CramitIn.py
@@ -9,6 +9,7 @@ class CramitIn(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """Cramit.in account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index ffe1c8285..c3c1bbcc8 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -12,6 +12,7 @@ class CzshareCom(Account):
     __version__ = "0.14"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index c91a69945..c8bc89159 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -12,6 +12,7 @@ class DebridItaliaCom(Account):
     __version__ = "0.1"
 
     __description__ = """Debriditalia.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index 50499c1b2..e4ef4a578 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -13,6 +13,7 @@ class DepositfilesCom(Account):
     __version__ = "0.3"
 
     __description__ = """Depositfiles.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de"),
                    ("stickell", "l.stickell@yahoo.it"),
                    ("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 1656b4387..00732c12d 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -14,6 +14,7 @@ class EasybytezCom(XFSPAccount):
     __version__ = "0.07"
 
     __description__ = """EasyBytez.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("guidobelix", "guidobelix@hotmail.it")]
 
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index dc64c9d43..984d429f4 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -12,6 +12,7 @@ class EuroshareEu(Account):
     __version__ = "0.01"
 
     __description__ = """Euroshare.eu account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py
index c69f73735..10328b840 100644
--- a/module/plugins/accounts/FastixRu.py
+++ b/module/plugins/accounts/FastixRu.py
@@ -10,6 +10,7 @@ class FastixRu(Account):
     __version__ = "0.02"
 
     __description__ = """Fastix account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index ed68cf500..62ea0ba7b 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -11,6 +11,7 @@ class FastshareCz(Account):
     __version__ = "0.03"
 
     __description__ = """Fastshare.cz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py
index bcf48772f..0a930ed77 100644
--- a/module/plugins/accounts/File4safeCom.py
+++ b/module/plugins/accounts/File4safeCom.py
@@ -9,6 +9,7 @@ class File4safeCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """File4safe.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
index 24c745e6a..6a10e213f 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -9,6 +9,7 @@ class FileParadoxIn(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """FileParadox.in account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index ffc427bcd..364f349da 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -10,6 +10,7 @@ class FilecloudIo(Account):
     __version__ = "0.02"
 
     __description__ = """FilecloudIo account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py
index a116eb7c5..b46706b93 100644
--- a/module/plugins/accounts/FilefactoryCom.py
+++ b/module/plugins/accounts/FilefactoryCom.py
@@ -14,6 +14,7 @@ class FilefactoryCom(Account):
     __version__ = "0.14"
 
     __description__ = """Filefactory.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index e5f7e4235..2db3b1138 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -12,6 +12,7 @@ class FilejungleCom(Account):
     __version__ = "0.11"
 
     __description__ = """Filejungle.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
index 536d40812..45bff8f92 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/module/plugins/accounts/FileomCom.py
@@ -9,6 +9,7 @@ class FileomCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Fileom.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index a26a45690..811d7c8a1 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -13,6 +13,7 @@ class FilerNet(Account):
     __version__ = "0.01"
 
     __description__ = """Filer.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py
index 4a77a66a0..51bf106ed 100644
--- a/module/plugins/accounts/FilerioCom.py
+++ b/module/plugins/accounts/FilerioCom.py
@@ -9,6 +9,7 @@ class FilerioCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """FileRio.in account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index 917fd3c48..93d4ff486 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -9,6 +9,7 @@ class FilesMailRu(Account):
     __version__ = "0.1"
 
     __description__ = """Filesmail.ru account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 4f9d03e3e..603ee3991 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -12,6 +12,7 @@ class FileserveCom(Account):
     __version__ = "0.2"
 
     __description__ = """Fileserve.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index 303185c6d..cd32fbca9 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -9,6 +9,7 @@ class FourSharedCom(Account):
     __type__ = "account"
     __version__ = "0.03"
     __description__ = """FourShared.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 2b093167e..949e5a8ba 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -12,6 +12,7 @@ class FreakshareCom(Account):
     __version__ = "0.1"
 
     __description__ = """Freakshare.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index 3f09f8706..333525d82 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -10,6 +10,7 @@ class FreeWayMe(Account):
     __version__ = "0.11"
 
     __description__ = """FreeWayMe account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Nicolas Giese", "james@free-way.me")]
 
 
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 9e3521a5f..11ad736f6 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -13,6 +13,7 @@ class FshareVn(Account):
     __version__ = "0.07"
 
     __description__ = """Fshare.vn account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py
index d2e040768..698051ede 100644
--- a/module/plugins/accounts/Ftp.py
+++ b/module/plugins/accounts/Ftp.py
@@ -9,6 +9,7 @@ class Ftp(Account):
     __version__ = "0.01"
 
     __description__ = """Ftp dummy account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index fc32bf188..33d4df7d3 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -12,6 +12,7 @@ class HellshareCz(Account):
     __version__ = "0.14"
 
     __description__ = """Hellshare.cz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py
index 09c607c98..c7b03a668 100644
--- a/module/plugins/accounts/Http.py
+++ b/module/plugins/accounts/Http.py
@@ -9,6 +9,7 @@ class Http(Account):
     __version__ = "0.01"
 
     __description__ = """Http dummy account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
index 296780b7c..0adc1e511 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -9,6 +9,7 @@ class HugefilesNet(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Hugefiles.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
index 76e757222..1c78edfa4 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -9,6 +9,7 @@ class HundredEightyUploadCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """180upload.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py
index c0441460b..ca6360068 100644
--- a/module/plugins/accounts/LetitbitNet.py
+++ b/module/plugins/accounts/LetitbitNet.py
@@ -10,6 +10,7 @@ class LetitbitNet(Account):
     __version__ = "0.01"
 
     __description__ = """Letitbit.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py
index 86bd203a4..e9ca91375 100644
--- a/module/plugins/accounts/LinksnappyCom.py
+++ b/module/plugins/accounts/LinksnappyCom.py
@@ -12,6 +12,7 @@ class LinksnappyCom(Account):
     __version__ = "0.02"
 
     __description__ = """Linksnappy.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py
index bddccdadc..c3e75b1d9 100644
--- a/module/plugins/accounts/LomafileCom.py
+++ b/module/plugins/accounts/LomafileCom.py
@@ -9,6 +9,7 @@ class LomafileCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Lomafile.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py
index 59d5be580..e92bb4cb3 100644
--- a/module/plugins/accounts/MegaDebridEu.py
+++ b/module/plugins/accounts/MegaDebridEu.py
@@ -10,6 +10,7 @@ class MegaDebridEu(Account):
     __version__ = "0.2"
 
     __description__ = """mega-debrid.eu account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index 019dbc5b4..f1ef3fdd8 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -12,6 +12,7 @@ class MegasharesCom(Account):
     __version__ = "0.02"
 
     __description__ = """Megashares.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py
index 09e096922..3f641cf72 100644
--- a/module/plugins/accounts/MovReelCom.py
+++ b/module/plugins/accounts/MovReelCom.py
@@ -9,6 +9,7 @@ class MovReelCom(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """Movreel.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 12d4c301b..851599e89 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -13,6 +13,7 @@ class MultishareCz(Account):
     __version__ = "0.02"
 
     __description__ = """Multishare.cz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index ed17ac4f2..06e89c0c1 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -11,6 +11,7 @@ class MyfastfileCom(Account):
     __type__ = "account"
     __version__ = "0.02"
     __description__ = """Myfastfile.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py
index 1edcd3f2b..01d6f4476 100755
--- a/module/plugins/accounts/NetloadIn.py
+++ b/module/plugins/accounts/NetloadIn.py
@@ -12,6 +12,7 @@ class NetloadIn(Account):
     __version__ = "0.22"
 
     __description__ = """Netload.in account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("RaNaN", "RaNaN@pyload.org"),
                    ("CryNickSystems", "webmaster@pcProfil.de")]
 
diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
index a75ca289f..3be5f110d 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -9,6 +9,7 @@ class NosuploadCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Nosupload.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
index 34d3e25b5..823f486c7 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/module/plugins/accounts/NovafileCom.py
@@ -9,6 +9,7 @@ class NovafileCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Novafile.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index ac2079f59..ba71fcbbd 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -14,6 +14,7 @@ class OboomCom(Account):
     __version__ = "0.2"
 
     __description__ = """Oboom.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stanley", "stanley.foerster@gmail.com")]
 
 
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 347aa0297..1e44ae2ca 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -13,6 +13,7 @@ class OneFichierCom(Account):
     __version__ = "0.1"
 
     __description__ = """1fichier.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")]
 
 
diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index e45f0127b..1d0bf3321 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -10,6 +10,7 @@ class OverLoadMe(Account):
     __version__ = "0.01"
 
     __description__ = """Over-Load.me account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("marley", "marley@over-load.me")]
 
 
diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py
index 51dff2cc3..4ab107094 100644
--- a/module/plugins/accounts/PremiumTo.py
+++ b/module/plugins/accounts/PremiumTo.py
@@ -9,6 +9,7 @@ class PremiumTo(Account):
     __version__ = "0.04"
 
     __description__ = """Premium.to account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("RaNaN", "RaNaN@pyload.org"),
                    ("zoidberg", "zoidberg@mujmail.cz"),
                    ("stickell", "l.stickell@yahoo.it")]
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index abc4dd464..1f8790495 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -11,6 +11,7 @@ class PremiumizeMe(Account):
     __version__ = "0.11"
 
     __description__ = """Premiumize.me account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index 4c8050014..0681bab5b 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -11,6 +11,7 @@ class QuickshareCz(Account):
     __version__ = "0.01"
 
     __description__ = """Quickshare.cz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index 83ef72bef..3dcab7d54 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -10,6 +10,7 @@ class RPNetBiz(Account):
     __version__ = "0.1"
 
     __description__ = """RPNet.biz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Dman", "dmanugm@gmail.com")]
 
 
diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index ba7b2e676..ee44d4879 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -10,6 +10,7 @@ class RapidgatorNet(Account):
     __version__ = "0.04"
 
     __description__ = """Rapidgator.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index ce1470c09..c52706fe2 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -9,6 +9,7 @@ class RapidshareCom(Account):
     __version__ = "0.22"
 
     __description__ = """Rapidshare.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py
index 55f95f72d..303c38396 100644
--- a/module/plugins/accounts/RarefileNet.py
+++ b/module/plugins/accounts/RarefileNet.py
@@ -9,6 +9,7 @@ class RarefileNet(XFSPAccount):
     __version__ = "0.03"
 
     __description__ = """RareFile.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py
index b4724999b..b7212c8d3 100644
--- a/module/plugins/accounts/RealdebridCom.py
+++ b/module/plugins/accounts/RealdebridCom.py
@@ -11,6 +11,7 @@ class RealdebridCom(Account):
     __version__ = "0.43"
 
     __description__ = """Real-Debrid.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index ed8147190..b71347a15 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -9,6 +9,7 @@ class RehostTo(Account):
     __version__ = "0.1"
 
     __description__ = """Rehost.to account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("RaNaN", "RaNaN@pyload.org")]
 
 
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index d6f2b2563..e2635277a 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -9,6 +9,7 @@ class RyushareCom(XFSPAccount):
     __version__ = "0.04"
 
     __description__ = """Ryushare.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("trance4us", None)]
 
diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
index a8cf38df2..11a13f383 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -9,6 +9,7 @@ class SecureUploadEu(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """SecureUpload.eu account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
index 9f6021774..fdc8b85d9 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -9,6 +9,7 @@ class SendmywayCom(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Sendmyway.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py
index 306e7a236..62a0067d5 100644
--- a/module/plugins/accounts/ShareRapidCom.py
+++ b/module/plugins/accounts/ShareRapidCom.py
@@ -12,6 +12,7 @@ class ShareRapidCom(Account):
     __version__ = "0.34"
 
     __description__ = """MegaRapid.cz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
                    ("zoidberg", "zoidberg@mujmail.cz")]
 
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index 54e23013b..d96dd2fe6 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -9,6 +9,7 @@ class ShareonlineBiz(Account):
     __version__ = "0.24"
 
     __description__ = """Share-online.biz account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de"),
                    ("zoidberg", "zoidberg@mujmail.cz")]
 
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index fd825a616..8f65fa677 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -10,6 +10,7 @@ class SimplyPremiumCom(Account):
     __version__ = "0.01"
 
     __description__ = """Simply-Premium.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("EvolutionClip", "evolutionclip@live.de")]
 
 
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index 6e3c46dcd..c77df7a52 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -11,6 +11,7 @@ class SimplydebridCom(Account):
     __version__ = "0.1"
 
     __description__ = """Simply-Debrid.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py
index d49c4f7f7..1afb37791 100644
--- a/module/plugins/accounts/StahnuTo.py
+++ b/module/plugins/accounts/StahnuTo.py
@@ -12,6 +12,7 @@ class StahnuTo(Account):
     __version__ = "0.02"
 
     __description__ = """StahnuTo account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
index 4a544b691..9e69a7ae4 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -9,6 +9,7 @@ class StreamcloudEu(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """Streamcloud.eu account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index d66b37da3..2db1bfa14 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -12,6 +12,7 @@ class TurbobitNet(Account):
     __version__ = "0.01"
 
     __description__ = """TurbobitNet account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index eb244e7ea..704f70742 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -14,6 +14,7 @@ class TusfilesNet(XFSPAccount):
     __version__ = "0.02"
 
     __description__ = """ Tusfile.net account plugin """
+    __license__ = "GPLv3"
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index bb7f167e2..3663fb65d 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -11,6 +11,7 @@ class UlozTo(Account):
     __version__ = "0.06"
 
     __description__ = """Uloz.to account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
                    ("pulpe", None)]
 
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index 3a6f36e88..e3da5e913 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -10,6 +10,7 @@ class UnrestrictLi(Account):
     __version__ = "0.03"
 
     __description__ = """Unrestrict.li account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 2ae727447..be4f9f47c 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -12,6 +12,7 @@ class UploadedTo(Account):
     __version__ = "0.26"
 
     __description__ = """Uploaded.to account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index cd8afb621..868e51e98 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -13,6 +13,7 @@ class UploadheroCom(Account):
     __version__ = "0.2"
 
     __description__ = """Uploadhero.co account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mcmyst", "mcmyst@hotmail.fr")]
 
 
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index 04f0a58fb..544391ea3 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -12,6 +12,7 @@ class UploadingCom(Account):
     __version__ = "0.1"
 
     __description__ = """Uploading.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index f9bd0f542..090cc85df 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -9,6 +9,7 @@ class UptoboxCom(XFSPAccount):
     __version__ = "0.03"
 
     __description__ = """DDLStorage.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
index 4c542024e..904041939 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -9,6 +9,7 @@ class VidPlayNet(XFSPAccount):
     __version__ = "0.01"
 
     __description__ = """VidPlay.net account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index 5aabf362c..f7f5d3e7a 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -11,6 +11,7 @@ class YibaishiwuCom(Account):
     __version__ = "0.01"
 
     __description__ = """115.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 83015079b..72c6c7348 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -11,6 +11,7 @@ class ZeveraCom(Account):
     __version__ = "0.21"
 
     __description__ = """Zevera.com account plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-- 
cgit v1.2.3


From 332c248d0860c8c09d804055b6491dfbb654c8d3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 8 Oct 2014 20:25:22 +0200
Subject: Newline cosmetics

---
 module/plugins/accounts/FourSharedCom.py | 3 ++-
 module/plugins/accounts/MyfastfileCom.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index cd32fbca9..39f6fbe75 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Account import Account
 from module.common.json_layer import json_loads
+from module.plugins.Account import Account
 
 
 class FourSharedCom(Account):
     __name__ = "FourSharedCom"
     __type__ = "account"
     __version__ = "0.03"
+
     __description__ = """FourShared.com account plugin"""
     __license__ = "GPLv3"
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 06e89c0c1..965b10e78 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -2,14 +2,15 @@
 
 from time import time
 
-from module.plugins.Account import Account
 from module.common.json_layer import json_loads
+from module.plugins.Account import Account
 
 
 class MyfastfileCom(Account):
     __name__ = "MyfastfileCom"
     __type__ = "account"
     __version__ = "0.02"
+
     __description__ = """Myfastfile.com account plugin"""
     __license__ = "GPLv3"
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
-- 
cgit v1.2.3


From 6632ded30de12bc16644b26de2605ec6b3bdd42a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 9 Oct 2014 13:12:12 +0200
Subject: ShareRapidCom -> MegaRapidCz

---
 module/plugins/accounts/MegaRapidCz.py   | 54 ++++++++++++++++++++++++++++++++
 module/plugins/accounts/ShareRapidCom.py | 54 --------------------------------
 2 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 module/plugins/accounts/MegaRapidCz.py
 delete mode 100644 module/plugins/accounts/ShareRapidCom.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
new file mode 100644
index 000000000..5b7b41e2b
--- /dev/null
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from time import mktime, strptime
+from module.plugins.Account import Account
+
+
+class MegaRapidCz(Account):
+    __name__ = "MegaRapidCz"
+    __type__ = "account"
+    __version__ = "0.34"
+
+    __description__ = """MegaRapid.cz account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
+                   ("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    login_timeout = 60
+
+
+    def loadAccountInfo(self, user, req):
+        src = req.load("http://megarapid.cz/mujucet/", decode=True)
+
+        m = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
+        if m:
+            data = self.getAccountData(user)
+            data['options']['limitDL'] = [int(m.group(1))]
+
+        m = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
+        if m:
+            validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
+            return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
+
+        m = re.search(r'<tr><td>Kredit</td><td>(.*?) GiB', src)
+        if m:
+            trafficleft = float(m.group(1)) * (1 << 20)
+            return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
+
+        return {"premium": False, "trafficleft": None, "validuntil": None}
+
+    def login(self, user, data, req):
+        htm = req.load("http://megarapid.cz/prihlaseni/", cookies=True)
+        if "Heslo:" in htm:
+            start = htm.index('id="inp_hash" name="hash" value="')
+            htm = htm[start + 33:]
+            hashes = htm[0:32]
+            htm = req.load("http://megarapid.cz/prihlaseni/",
+                           post={"hash": hashes,
+                                 "login": user,
+                                 "pass1": data['password'],
+                                 "remember": 0,
+                                 "sbmt": u"Přihlásit"}, cookies=True)
diff --git a/module/plugins/accounts/ShareRapidCom.py b/module/plugins/accounts/ShareRapidCom.py
deleted file mode 100644
index 62a0067d5..000000000
--- a/module/plugins/accounts/ShareRapidCom.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from time import mktime, strptime
-from module.plugins.Account import Account
-
-
-class ShareRapidCom(Account):
-    __name__ = "ShareRapidCom"
-    __type__ = "account"
-    __version__ = "0.34"
-
-    __description__ = """MegaRapid.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
-                   ("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    login_timeout = 60
-
-
-    def loadAccountInfo(self, user, req):
-        src = req.load("http://megarapid.cz/mujucet/", decode=True)
-
-        m = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
-        if m:
-            data = self.getAccountData(user)
-            data['options']['limitDL'] = [int(m.group(1))]
-
-        m = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
-        if m:
-            validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
-            return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
-
-        m = re.search(r'<tr><td>Kredit</td><td>(.*?) GiB', src)
-        if m:
-            trafficleft = float(m.group(1)) * (1 << 20)
-            return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
-
-        return {"premium": False, "trafficleft": None, "validuntil": None}
-
-    def login(self, user, data, req):
-        htm = req.load("http://megarapid.cz/prihlaseni/", cookies=True)
-        if "Heslo:" in htm:
-            start = htm.index('id="inp_hash" name="hash" value="')
-            htm = htm[start + 33:]
-            hashes = htm[0:32]
-            htm = req.load("http://megarapid.cz/prihlaseni/",
-                           post={"hash": hashes,
-                                 "login": user,
-                                 "pass1": data['password'],
-                                 "remember": 0,
-                                 "sbmt": u"Přihlásit"}, cookies=True)
-- 
cgit v1.2.3


From ee5f77de01779850b61561be2f6146e7cdc148ae Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 13:52:11 +0200
Subject: [CatShareNet] Account support

---
 module/plugins/accounts/CatShareNet.py | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 module/plugins/accounts/CatShareNet.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py
new file mode 100644
index 000000000..89c80e2b4
--- /dev/null
+++ b/module/plugins/accounts/CatShareNet.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from time import mktime, strptime
+
+from module.plugins.Account import Account
+
+
+class CatShareNet(Account):
+    __name__ = "CatShareNet"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """CatShareNet account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("prOq", None)]
+
+
+    PREMIUM_PATTERN = r'class="nav-collapse collapse pull-right">[\s\w<>=-."/:]*\sz.</a></li>\s*<li><a href="/premium">.*\s*<span style="color: red">(.*?)</span>[\s\w<>/]*href="/logout"'
+    VALID_UNTIL_PATTERN = r'<div class="span6 pull-right">[\s\w<>=-":;]*<span style="font-size:13px;">.*?<strong>(.*?)</strong></span>'
+
+
+    def loadAccountInfo(self, user, req):
+        premium = False
+        validuntil = -1
+
+        html = req.load("http://catshare.net/", decode=True)
+
+        try:
+            m = re.search(self.PREMIUM_PATTERN, html)
+            if "Premium" in m.group(1):
+                premium = True
+        except:
+            pass
+
+        try:
+            m = re.search(self.VALID_UNTIL_PATTERN, html)
+            expiredate = m.group(1)
+            if "-" not in expiredate:
+                validuntil = mktime(strptime(expiredate, "%d.%m.%Y"))
+        except:
+            pass
+
+        return {'premium': premium, 'trafficleft': -1, 'validuntil': validuntil}
+
+
+    def login(self, user, data, req):
+        html = req.load("http://catshare.net/login",
+                        post={'user_email': user,
+                              'user_password': data['password'],
+                              'remindPassword': 0,
+                              'user[submit]': "Login"})
+
+        if not '<a href="/logout">Wyloguj</a>' in html:
+            self.wrongPassword()
-- 
cgit v1.2.3


From f76e5c2336718dca9da8033ba22cd83c72c7b3b3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:14:28 +0200
Subject: Pattern update 1

---
 module/plugins/accounts/CzshareCom.py    | 2 +-
 module/plugins/accounts/FastshareCz.py   | 2 +-
 module/plugins/accounts/FilejungleCom.py | 2 +-
 module/plugins/accounts/FreakshareCom.py | 2 +-
 module/plugins/accounts/FshareVn.py      | 2 +-
 module/plugins/accounts/HellshareCz.py   | 2 +-
 module/plugins/accounts/MultishareCz.py  | 2 +-
 module/plugins/accounts/TurbobitNet.py   | 2 +-
 module/plugins/accounts/UlozTo.py        | 2 +-
 module/plugins/accounts/UploadheroCom.py | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index c3c1bbcc8..ea24a4e71 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -17,7 +17,7 @@ class CzshareCom(Account):
                    ("stickell", "l.stickell@yahoo.it")]
 
 
-    CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([0-9 ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
+    CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index 62ea0ba7b..eadb9184c 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -16,7 +16,7 @@ class FastshareCz(Account):
                    ("stickell", "l.stickell@yahoo.it")]
 
 
-    CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\d. \w]+)&nbsp;'
+    CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\w.]+)&nbsp;'
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index 2db3b1138..1301b34f2 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -19,7 +19,7 @@ class FilejungleCom(Account):
     login_timeout = 60
 
     URL = "http://filejungle.com/"
-    TRAFFIC_LEFT_PATTERN = r'"/extend_premium\.php">Until (\d+ [A-Za-z]+ \d+)<br'
+    TRAFFIC_LEFT_PATTERN = r'"/extend_premium\.php">Until (\d+ \w+ \d+)<br'
     LOGIN_FAILED_PATTERN = r'<span htmlfor="loginUser(Name|Password)" generated="true" class="fail_info">'
 
 
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 949e5a8ba..904c3ba3e 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -19,7 +19,7 @@ class FreakshareCom(Account):
     def loadAccountInfo(self, user, req):
         page = req.load("http://freakshare.com/")
 
-        validuntil = r"ltig bis:</td>\s*<td><b>([0-9 \-:.]+)</b></td>"
+        validuntil = r"ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>"
         validuntil = re.search(validuntil, page, re.MULTILINE)
         validuntil = validuntil.group(1).strip()
         validuntil = mktime(strptime(validuntil, "%d.%m.%Y - %H:%M"))
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 11ad736f6..b208743e0 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -20,7 +20,7 @@ class FshareVn(Account):
 
     VALID_UNTIL_PATTERN = ur'<dt>Thời hạn dùng:</dt>\s*<dd>([^<]+)</dd>'
     LIFETIME_PATTERN = ur'<dt>Lần đăng nhập trước:</dt>\s*<dd>[^<]+</dd>'
-    TRAFFIC_LEFT_PATTERN = ur'<dt>Tổng Dung Lượng Tài Khoản</dt>\s*<dd[^>]*>([0-9.]+) ([kKMG])B</dd>'
+    TRAFFIC_LEFT_PATTERN = ur'<dt>Tổng Dung Lượng Tài Khoản</dt>\s*<dd[^>]*>([\d.]+) ([kKMG])B</dd>'
     DIRECT_DOWNLOAD_PATTERN = ur'<input type="checkbox"\s*([^=>]*)[^>]*/>Kích hoạt download trực tiếp</dt>'
 
 
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index 33d4df7d3..53c9906c1 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -56,7 +56,7 @@ class HellshareCz(Account):
             #Switch to English
             self.logDebug("Switch lang - URL: %s" % req.lastEffectiveURL)
             json = req.load("%s?do=locRouter-show" % req.lastEffectiveURL)
-            hash = re.search(r"(--[0-9a-f]+-)", json).group(1)
+            hash = re.search(r"(\-\-[0-9a-f]+\-)", json).group(1)
             self.logDebug("Switch lang - HASH: %s" % hash)
             html = req.load('http://www.hellshare.com/%s/' % hash)
 
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 851599e89..6d2f0d64f 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -17,7 +17,7 @@ class MultishareCz(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+)&nbsp;(?P<U>\w+)</strong>'
+    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d,]+)&nbsp;(?P<U>\w+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
 
 
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 2db1bfa14..065668815 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -19,7 +19,7 @@ class TurbobitNet(Account):
     def loadAccountInfo(self, user, req):
         html = req.load("http://turbobit.net")
 
-        m = re.search(r'<u>Turbo Access</u> to ([0-9.]+)', html)
+        m = re.search(r'<u>Turbo Access</u> to ([\d.]+)', html)
         if m:
             premium = True
             validuntil = mktime(strptime(m.group(1), "%d.%m.%Y"))
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 3663fb65d..2298e252b 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -16,7 +16,7 @@ class UlozTo(Account):
                    ("pulpe", None)]
 
 
-    TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([0-9.]+) MB"'
+    TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([\d.]+) MB"'
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index 868e51e98..ec34e425e 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -18,7 +18,7 @@ class UploadheroCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.')
+        premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium.')
 
         data = self.getAccountData(user)
         page = req.load("http://uploadhero.co/my-account")
-- 
cgit v1.2.3


From c5d1a4fd8943877c6d2eb3843e0de725dba5191e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:09:53 +0200
Subject: Pattern update 2

---
 module/plugins/accounts/MultishareCz.py | 2 +-
 module/plugins/accounts/TusfilesNet.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 6d2f0d64f..8e6b72a97 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -17,7 +17,7 @@ class MultishareCz(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d,]+)&nbsp;(?P<U>\w+)</strong>'
+    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>\w+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
 
 
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 704f70742..a1b3613b2 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -21,7 +21,7 @@ class TusfilesNet(XFSPAccount):
     HOSTER_URL = "http://www.tusfiles.net/"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
-    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www.tusfiles.net/i/icon/meter.png" alt=""/></td>\n<td>&nbsp;(?P<S>[^<]+)</td>'
+    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[^<]+)</td>'
 
 
     def loadAccountInfo(self, user, req):
-- 
cgit v1.2.3


From 8939f015a688a07ec7d0bd14b6a3704f6a2cb4a0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:12:40 +0200
Subject: Pattern update 3

---
 module/plugins/accounts/DebridItaliaCom.py | 2 +-
 module/plugins/accounts/FilerNet.py        | 2 +-
 module/plugins/accounts/FreakshareCom.py   | 4 ++--
 module/plugins/accounts/NetloadIn.py       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index c8bc89159..754d3467d 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -16,7 +16,7 @@ class DebridItaliaCom(Account):
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
-    WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|"
+    WALID_UNTIL_PATTERN = r'Premium valid till: (?P<D>[^|]+) \|'
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index 811d7c8a1..a459f88f0 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -18,7 +18,7 @@ class FilerNet(Account):
 
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
-    WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>"
+    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'
 
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 904c3ba3e..86f2b5a3e 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -19,12 +19,12 @@ class FreakshareCom(Account):
     def loadAccountInfo(self, user, req):
         page = req.load("http://freakshare.com/")
 
-        validuntil = r"ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>"
+        validuntil = r'ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>'
         validuntil = re.search(validuntil, page, re.MULTILINE)
         validuntil = validuntil.group(1).strip()
         validuntil = mktime(strptime(validuntil, "%d.%m.%Y - %H:%M"))
 
-        traffic = r"Traffic verbleibend:</td>\s*<td>([^<]+)"
+        traffic = r'Traffic verbleibend:</td>\s*<td>([^<]+)'
         traffic = re.search(traffic, page, re.MULTILINE)
         traffic = traffic.group(1).strip()
         traffic = self.parseTraffic(traffic)
diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py
index 01d6f4476..4bb4c7124 100755
--- a/module/plugins/accounts/NetloadIn.py
+++ b/module/plugins/accounts/NetloadIn.py
@@ -19,7 +19,7 @@ class NetloadIn(Account):
 
     def loadAccountInfo(self, user, req):
         page = req.load("http://netload.in/index.php?id=2&lang=de")
-        left = r">(\d+) (Tag|Tage), (\d+) Stunden<"
+        left = r'>(\d+) (Tag|Tage), (\d+) Stunden<'
         left = re.search(left, page)
         if left:
             validuntil = time() + int(left.group(1)) * 24 * 60 * 60 + int(left.group(3)) * 60 * 60
-- 
cgit v1.2.3


From 6a0fb7fdd4ea2749be44625225d8a235a78f032f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:42:39 +0200
Subject: [accounts] Code cosmetics

---
 module/plugins/accounts/AlldebridCom.py     |  1 +
 module/plugins/accounts/BayfilesCom.py      |  1 +
 module/plugins/accounts/BitshareCom.py      |  1 +
 module/plugins/accounts/CzshareCom.py       |  1 +
 module/plugins/accounts/DebridItaliaCom.py  | 13 ++++++++-----
 module/plugins/accounts/DepositfilesCom.py  |  1 +
 module/plugins/accounts/EuroshareEu.py      |  1 +
 module/plugins/accounts/FastixRu.py         |  1 +
 module/plugins/accounts/FastshareCz.py      |  1 +
 module/plugins/accounts/FilecloudIo.py      |  1 +
 module/plugins/accounts/FilefactoryCom.py   |  1 +
 module/plugins/accounts/FilejungleCom.py    |  1 +
 module/plugins/accounts/FilerNet.py         |  1 +
 module/plugins/accounts/FilesMailRu.py      |  1 +
 module/plugins/accounts/FileserveCom.py     |  1 +
 module/plugins/accounts/FourSharedCom.py    |  1 +
 module/plugins/accounts/FreakshareCom.py    |  1 +
 module/plugins/accounts/FreeWayMe.py        |  1 +
 module/plugins/accounts/FshareVn.py         |  1 +
 module/plugins/accounts/HellshareCz.py      |  1 +
 module/plugins/accounts/LetitbitNet.py      |  1 +
 module/plugins/accounts/LinksnappyCom.py    |  1 +
 module/plugins/accounts/MegaDebridEu.py     |  1 +
 module/plugins/accounts/MegaRapidCz.py      |  1 +
 module/plugins/accounts/MegasharesCom.py    |  1 +
 module/plugins/accounts/MultishareCz.py     |  1 +
 module/plugins/accounts/MyfastfileCom.py    |  1 +
 module/plugins/accounts/NetloadIn.py        |  1 +
 module/plugins/accounts/OneFichierCom.py    |  1 +
 module/plugins/accounts/OverLoadMe.py       |  1 +
 module/plugins/accounts/PremiumTo.py        |  1 +
 module/plugins/accounts/PremiumizeMe.py     |  1 +
 module/plugins/accounts/QuickshareCz.py     |  1 +
 module/plugins/accounts/RPNetBiz.py         |  1 +
 module/plugins/accounts/RapidgatorNet.py    |  1 +
 module/plugins/accounts/RapidshareCom.py    |  1 +
 module/plugins/accounts/RealdebridCom.py    |  1 +
 module/plugins/accounts/RehostTo.py         |  1 +
 module/plugins/accounts/ShareonlineBiz.py   |  1 +
 module/plugins/accounts/SimplyPremiumCom.py |  1 +
 module/plugins/accounts/SimplydebridCom.py  |  1 +
 module/plugins/accounts/StahnuTo.py         |  1 +
 module/plugins/accounts/TurbobitNet.py      |  1 +
 module/plugins/accounts/UlozTo.py           |  1 +
 module/plugins/accounts/UnrestrictLi.py     |  1 +
 module/plugins/accounts/UploadedTo.py       |  1 +
 module/plugins/accounts/UploadheroCom.py    |  1 +
 module/plugins/accounts/UploadingCom.py     |  1 +
 module/plugins/accounts/YibaishiwuCom.py    |  1 +
 module/plugins/accounts/ZeveraCom.py        |  1 +
 50 files changed, 57 insertions(+), 5 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index 3ebdae629..842d4c060 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -44,6 +44,7 @@ class AlldebridCom(Account):
         account_info = {"validuntil": exp_time, "trafficleft": -1}
         return account_info
 
+
     def login(self, user, data, req):
         urlparams = urlencode({'action': 'login', 'login_login': user, 'login_password': data['password']})
         page = req.load("http://www.alldebrid.com/register/?%s" % urlparams)
diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py
index b1166b83a..2b6d45a18 100644
--- a/module/plugins/accounts/BayfilesCom.py
+++ b/module/plugins/accounts/BayfilesCom.py
@@ -28,6 +28,7 @@ class BayfilesCom(Account):
         return {"premium": bool(response['premium']), "trafficleft": -1,
                 "validuntil": response['expires'] if response['expires'] >= int(time()) else -1}
 
+
     def login(self, user, data, req):
         response = json_loads(req.load("http://api.bayfiles.com/v1/account/login/%s/%s" % (user, data['password'])))
         self.logDebug(response)
diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py
index ea1cca53b..910c81b4a 100644
--- a/module/plugins/accounts/BitshareCom.py
+++ b/module/plugins/accounts/BitshareCom.py
@@ -24,6 +24,7 @@ class BitshareCom(Account):
 
         return {"validuntil": -1, "trafficleft": -1, "premium": True}
 
+
     def login(self, user, data, req):
         page = req.load("http://bitshare.com/login.html",
                         post={"user": user, "password": data['password'], "submit": "Login"}, cookies=True)
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index ea24a4e71..153b47073 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -32,6 +32,7 @@ class CzshareCom(Account):
             validuntil = mktime(strptime(m.group(3), '%d.%m.%y %H:%M'))
             return {"validuntil": validuntil, "trafficleft": credits}
 
+
     def login(self, user, data, req):
         html = req.load('https://sdilej.cz/index.php', post={
             "Prihlasit": "Prihlasit",
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 754d3467d..48b46cc0b 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -20,18 +20,21 @@ class DebridItaliaCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        if 'Account premium not activated' in self.html:
+        html = req.load("http://debriditalia.com/")
+
+        if 'Account premium not activated' in html:
             return {"premium": False, "validuntil": None, "trafficleft": None}
 
-        m = re.search(self.WALID_UNTIL_PATTERN, self.html)
+        m = re.search(self.WALID_UNTIL_PATTERN, html)
         if m:
             validuntil = int(time.mktime(time.strptime(m.group('D'), "%d/%m/%Y %H:%M")))
             return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
         else:
             self.logError("Unable to retrieve account information - Plugin may be out of date")
 
+
     def login(self, user, data, req):
-        self.html = req.load("http://debriditalia.com/login.php",
-                             get={"u": user, "p": data['password']})
-        if 'NO' in self.html:
+        html = req.load("http://debriditalia.com/login.php",
+                        get={"u": user, "p": data['password']})
+        if 'NO' in html:
             self.wrongPassword()
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index e4ef4a578..80e6c8862 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -27,6 +27,7 @@ class DepositfilesCom(Account):
 
         return {"validuntil": validuntil, "trafficleft": -1}
 
+
     def login(self, user, data, req):
         src = req.load("https://dfiles.eu/de/login.php", get={"return": "/de/gold/payment.php"},
                        post={"login": user, "password": data['password']})
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 984d429f4..bb2f0c8e2 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -29,6 +29,7 @@ class EuroshareEu(Account):
 
         return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
 
+
     def login(self, user, data, req):
 
         html = req.load('http://euroshare.eu/customer-zone/login/', post={
diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py
index 10328b840..8ced61f15 100644
--- a/module/plugins/accounts/FastixRu.py
+++ b/module/plugins/accounts/FastixRu.py
@@ -27,6 +27,7 @@ class FastixRu(Account):
             account_info = {"validuntil": None, "trafficleft": None, "premium": False}
         return account_info
 
+
     def login(self, user, data, req):
         page = req.load("http://fastix.ru/api_v2/?sub=get_apikey&email=%s&password=%s" % (user, data['password']))
         api = json_loads(page)
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index eadb9184c..a199ad36c 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -32,6 +32,7 @@ class FastshareCz(Account):
 
         return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         req.load('http://www.fastshare.cz/login')  # Do not remove or it will not login
         html = req.load('http://www.fastshare.cz/sql.php', post={
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index 364f349da..439491ea9 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -40,6 +40,7 @@ class FilecloudIo(Account):
         else:
             return {"premium": False}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("secure.filecloud.io", "lang", "en")
         html = req.load('https://secure.filecloud.io/user-login.html')
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py
index b46706b93..899c4a604 100644
--- a/module/plugins/accounts/FilefactoryCom.py
+++ b/module/plugins/accounts/FilefactoryCom.py
@@ -36,6 +36,7 @@ class FilefactoryCom(Account):
 
         return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
 
+
     def login(self, user, data, req):
         req.http.c.setopt(REFERER, "http://www.filefactory.com/member/login.php")
 
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index 1301b34f2..9cf380067 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -35,6 +35,7 @@ class FilejungleCom(Account):
 
         return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
 
+
     def login(self, user, data, req):
         html = req.load(self.URL + "login.php", post={
             "loginUserName": user,
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index a459f88f0..8bd66221f 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -40,6 +40,7 @@ class FilerNet(Account):
             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):
         html = req.load("https://filer.net/login")
         token = re.search(self.TOKEN_PATTERN, html).group(1)
diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index 93d4ff486..25343670a 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -16,6 +16,7 @@ class FilesMailRu(Account):
     def loadAccountInfo(self, user, req):
         return {"validuntil": None, "trafficleft": None}
 
+
     def login(self, user, data, req):
         user, domain = user.split("@")
 
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 603ee3991..f82ecfb54 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -29,6 +29,7 @@ class FileserveCom(Account):
         else:
             return {"premium": False, "trafficleft": None, "validuntil": None}
 
+
     def login(self, user, data, req):
         page = req.load("http://app.fileserve.com/api/login/", post={"username": user, "password": data['password'],
                                                                      "submit": "Submit+Query"})
diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index 39f6fbe75..21aff591b 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -19,6 +19,7 @@ class FourSharedCom(Account):
         # Free mode only for now
         return {"premium": False}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("4shared.com", "4langcookie", "en")
         response = req.load('http://www.4shared.com/web/login',
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 86f2b5a3e..2ee7a33ea 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -31,6 +31,7 @@ class FreakshareCom(Account):
 
         return {"validuntil": validuntil, "trafficleft": traffic}
 
+
     def login(self, user, data, req):
         page = req.load("http://freakshare.com/login.html", None,
                         {"submit": "Login", "user": user, "pass": data['password']}, cookies=True)
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index 333525d82..12c24329c 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -35,6 +35,7 @@ class FreeWayMe(Account):
     def getpw(self, user):
         return self.accounts[user]['password']
 
+
     def login(self, user, data, req):
         status = self.getAccountStatus(user, req)
 
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index b208743e0..45ee5a749 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -44,6 +44,7 @@ class FshareVn(Account):
 
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         req.http.c.setopt(REFERER, "https://www.fshare.vn/login.php")
 
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index 53c9906c1..d24a6ae51 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -50,6 +50,7 @@ class HellshareCz(Account):
 
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         html = req.load('http://www.hellshare.com/')
         if req.lastEffectiveURL != 'http://www.hellshare.com/':
diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py
index ca6360068..fba599078 100644
--- a/module/plugins/accounts/LetitbitNet.py
+++ b/module/plugins/accounts/LetitbitNet.py
@@ -28,6 +28,7 @@ class LetitbitNet(Account):
 
         return {"premium": True}
 
+
     def login(self, user, data, req):
         # API_KEY is the username and the PREMIUM_KEY is the password
         self.logInfo("You must use your API KEY as username and the PREMIUM KEY as password.")
diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py
index e9ca91375..adcae001c 100644
--- a/module/plugins/accounts/LinksnappyCom.py
+++ b/module/plugins/accounts/LinksnappyCom.py
@@ -41,6 +41,7 @@ class LinksnappyCom(Account):
 
         return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
 
+
     def login(self, user, data, req):
         r = req.load('http://gen.linksnappy.com/lseAPI.php',
                      get={'act': 'USERDETAILS', 'username': user, 'password': md5(data['password']).hexdigest()})
diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py
index e92bb4cb3..d88be835b 100644
--- a/module/plugins/accounts/MegaDebridEu.py
+++ b/module/plugins/accounts/MegaDebridEu.py
@@ -30,6 +30,7 @@ class MegaDebridEu(Account):
             self.logError(response)
             return {"status": False, "premium": False}
 
+
     def login(self, user, data, req):
         jsonResponse = req.load(self.API_URL,
                                 get={'action': 'connectUser', 'login': user, 'password': data['password']})
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index 5b7b41e2b..3ef98560a 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -40,6 +40,7 @@ class MegaRapidCz(Account):
 
         return {"premium": False, "trafficleft": None, "validuntil": None}
 
+
     def login(self, user, data, req):
         htm = req.load("http://megarapid.cz/prihlaseni/", cookies=True)
         if "Heslo:" in htm:
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index f1ef3fdd8..5ac22222c 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -35,6 +35,7 @@ class MegasharesCom(Account):
 
         return {"validuntil": validuntil, "trafficleft": -1, "premium": premium}
 
+
     def login(self, user, data, req):
         html = req.load('http://d01.megashares.com/myms_login.php', post={
             "httpref": "",
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 8e6b72a97..a9b0a1620 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -34,6 +34,7 @@ class MultishareCz(Account):
 
         return dict(mms_info, **{"validuntil": -1, "trafficleft": trafficleft})
 
+
     def login(self, user, data, req):
         html = req.load('http://www.multishare.cz/html/prihlaseni_process.php', post={
             "akce": "Přihlásit",
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 965b10e78..350974d79 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -23,6 +23,7 @@ class MyfastfileCom(Account):
         else:
             self.logError("Unable to get account information")
 
+
     def login(self, user, data, req):
         # Password to use is the API-Password written in http://myfastfile.com/myaccount
         html = req.load("http://myfastfile.com/api.php",
diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py
index 4bb4c7124..f5bac0368 100755
--- a/module/plugins/accounts/NetloadIn.py
+++ b/module/plugins/accounts/NetloadIn.py
@@ -31,6 +31,7 @@ class NetloadIn(Account):
             trafficleft = None
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         page = req.load("http://netload.in/index.php", None,
                         {"txtuser": user, "txtpass": data['password'], "txtcheck": "login", "txtlogin": "Login"},
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 1e44ae2ca..8e8430f61 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -36,6 +36,7 @@ class OneFichierCom(Account):
 
         return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
 
+
     def login(self, user, data, req):
 
         req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en")
diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index 1d0bf3321..c85feec59 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -26,6 +26,7 @@ class OverLoadMe(Account):
         account_info = {"validuntil": data['expirationunix'], "trafficleft": -1}
         return account_info
 
+
     def login(self, user, data, req):
         jsondata = req.load("https://api.over-load.me/account.php",
                             get={"user": user, "auth": data['password']}).strip()
diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py
index 4ab107094..d13d9b866 100644
--- a/module/plugins/accounts/PremiumTo.py
+++ b/module/plugins/accounts/PremiumTo.py
@@ -22,6 +22,7 @@ class PremiumTo(Account):
 
         return {"trafficleft": int(traffic) / 1024, "validuntil": -1}
 
+
     def login(self, user, data, req):
         self.username = user
         self.password = data['password']
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index 1f8790495..a234a8d93 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -29,6 +29,7 @@ class PremiumizeMe(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
         # Get user data from premiumize.me
         status = self.getAccountStatus(user, req)
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index 0681bab5b..fa0acd06d 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -28,6 +28,7 @@ class QuickshareCz(Account):
 
         return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
 
+
     def login(self, user, data, req):
         html = req.load('http://www.quickshare.cz/html/prihlaseni_process.php', post={
             "akce": u'Přihlásit',
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index 3dcab7d54..e4b873824 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -31,6 +31,7 @@ class RPNetBiz(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
         # Get account information from rpnet.biz
         response = self.getAccountStatus(user, req)
diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index ee44d4879..981f2f90f 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -40,6 +40,7 @@ class RapidgatorNet(Account):
 
         return {"validuntil": None, "trafficleft": None, "premium": False}
 
+
     def login(self, user, data, req):
         try:
             json = req.load('%s/login' % self.API_URL, post={"username": user, "password": data['password']})
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index c52706fe2..d6f4efe8d 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -36,6 +36,7 @@ class RapidshareCom(Account):
 
         return tmp
 
+
     def login(self, user, data, req):
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
         api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user,
diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py
index b7212c8d3..e85a28f02 100644
--- a/module/plugins/accounts/RealdebridCom.py
+++ b/module/plugins/accounts/RealdebridCom.py
@@ -25,6 +25,7 @@ class RealdebridCom(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
         self.pin_code = False
         page = req.load("https://real-debrid.com/ajax/login.php", get={"user": user, "pass": data['password']})
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index b71347a15..e9d9bd243 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -30,6 +30,7 @@ class RehostTo(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
         page = req.load("http://rehost.to/api.php?cmd=login&user=%s&pass=%s" % (user, data['password']))
 
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index d96dd2fe6..76c564032 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -37,6 +37,7 @@ class ShareonlineBiz(Account):
                 "trafficleft": -1,
                 "premium": True if ("dl" in info or "a" in info) and (info['group'] != "Sammler") else False}
 
+
     def login(self, user, data, req):
         src = self.getUserAPI(user, req)
         if "EXCEPTION" in src:
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index 8f65fa677..442aaa9f3 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -31,6 +31,7 @@ class SimplyPremiumCom(Account):
         #return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         return {"premium": True, "validuntil": validuntil}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("simply-premium.com", "lang", "EN")
 
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index c77df7a52..b986985e1 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -24,6 +24,7 @@ class SimplydebridCom(Account):
         else:
             return {"trafficleft": -1, "validuntil": mktime(strptime(str(data[2]), "%d/%m/%Y"))}
 
+
     def login(self, user, data, req):
         self.loginname = user
         self.password = data['password']
diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py
index 1afb37791..7b32ae842 100644
--- a/module/plugins/accounts/StahnuTo.py
+++ b/module/plugins/accounts/StahnuTo.py
@@ -24,6 +24,7 @@ class StahnuTo(Account):
 
         return {"premium": trafficleft > (512 * 1024), "trafficleft": trafficleft, "validuntil": -1}
 
+
     def login(self, user, data, req):
         html = req.load("http://www.stahnu.to/login.php", post={
             "username": user,
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 065668815..7dfea7c3a 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -29,6 +29,7 @@ class TurbobitNet(Account):
 
         return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("turbobit.net", "user_lang", "en")
 
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 2298e252b..dc51b7a80 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -31,6 +31,7 @@ class UlozTo(Account):
 
         return {"validuntil": -1, "trafficleft": trafficleft}
 
+
     def login(self, user, data, req):
         login_page = req.load('http://www.ulozto.net/?do=web-login', decode=True)
         action = re.findall('<form action="(.+?)"', login_page)[1].replace('&amp;', '&')
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index e3da5e913..5a02e04a2 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -27,6 +27,7 @@ class UnrestrictLi(Account):
 
         return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("unrestrict.li", "lang", "EN")
         html = req.load("https://unrestrict.li/sign_in")
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index be4f9f47c..437730a3f 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -42,6 +42,7 @@ class UploadedTo(Account):
         else:
             return {"premium": False, "validuntil": -1}
 
+
     def login(self, user, data, req):
 
         req.load("http://uploaded.net/language/en")
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index ec34e425e..e66f7b9c6 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -32,6 +32,7 @@ class UploadheroCom(Account):
 
         return account_info
 
+
     def login(self, user, data, req):
         page = req.load("http://uploadhero.co/lib/connexion.php",
                         post={"pseudo_login": user, "password_login": data['password']})
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index 544391ea3..5ade435d4 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -30,6 +30,7 @@ class UploadingCom(Account):
 
         return {"validuntil": validuntil, "trafficleft": -1, "premium": True}
 
+
     def login(self, user, data, req):
         req.cj.setCookie("uploading.com", "lang", "1")
         req.cj.setCookie("uploading.com", "language", "1")
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index f7f5d3e7a..81880f575 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -27,6 +27,7 @@ class YibaishiwuCom(Account):
         validuntil = trafficleft = (-1 if m else 0)
         return dict({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium})
 
+
     def login(self, user, data, req):
         html = req.load('http://passport.115.com/?ac=login', post={
             "back": "http://www.115.com/",
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 72c6c7348..7e4fb0ab8 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -27,6 +27,7 @@ class ZeveraCom(Account):
             }
         return account_info
 
+
     def login(self, user, data, req):
         self.loginname = user
         self.password = data['password']
-- 
cgit v1.2.3


From e0c2edca2a55472a5bf15051a093b789627d1d91 Mon Sep 17 00:00:00 2001
From: guidobelix <guidobelix@hotmail.it>
Date: Tue, 14 Oct 2014 13:05:56 +0200
Subject: New plugin JunocloudMe (hoster + account)

---
 module/plugins/accounts/JunocloudMe.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 module/plugins/accounts/JunocloudMe.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py
new file mode 100644
index 000000000..8cd7e8dde
--- /dev/null
+++ b/module/plugins/accounts/JunocloudMe.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class JunocloudMe(XFSPAccount):
+    __name__ = "JunocloudMe"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Junocloud.me account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+
+
+    HOSTER_URL = "http://www.junocloud.me/"
-- 
cgit v1.2.3


From 388a2f6478d42e423f1f8442d8539983f3762f22 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 14 Oct 2014 13:38:49 +0200
Subject: Improve unit detection in size pattern

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index a9b0a1620..ae32b8806 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -17,7 +17,7 @@ class MultishareCz(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>\w+)</strong>'
+    TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
 
 
-- 
cgit v1.2.3


From e7e59f4f7c3211920016bb3e5e063f954a19c92e Mon Sep 17 00:00:00 2001
From: guidobelix <guidobelix@hotmail.it>
Date: Wed, 15 Oct 2014 02:05:25 +0200
Subject: New plugin RapidfileshareNet (account + hoster)

---
 module/plugins/accounts/RapidfileshareNet.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 module/plugins/accounts/RapidfileshareNet.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
new file mode 100644
index 000000000..56ae80cf0
--- /dev/null
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class RapidfileshareNet(XFSPAccount):
+    __name__ = "RapidfileshareNet"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Rapidfileshare.net account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+
+
+    HOSTER_URL = "http://www.rapidfileshare.net/"
+
+    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">(?P<S>.+?)</label></TD></TR>'
-- 
cgit v1.2.3


From 90c4bf19a6b03e28c9be69a20ce6330391dcb839 Mon Sep 17 00:00:00 2001
From: guidobelix <guidobelix@hotmail.it>
Date: Wed, 15 Oct 2014 20:28:28 +0200
Subject: Sinplified after the improvements to XFSPAccount modified:  
 module/plugins/accounts/TusfilesNet.py

---
 module/plugins/accounts/TusfilesNet.py | 36 +---------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index a1b3613b2..775aab9c0 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -11,7 +11,7 @@ from module.utils import parseFileSize
 class TusfilesNet(XFSPAccount):
     __name__ = "TusfilesNet"
     __type__ = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """ Tusfile.net account plugin """
     __license__ = "GPLv3"
@@ -22,37 +22,3 @@ class TusfilesNet(XFSPAccount):
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
     TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[^<]+)</td>'
-
-
-    def loadAccountInfo(self, user, req):
-        html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
-
-        validuntil = None
-        trafficleft = None
-        premium = False
-
-        m = re.search(self.VALID_UNTIL_PATTERN, html)
-        if m:
-            expiredate = m.group(1)
-            self.logDebug("Expire date: " + expiredate)
-
-            try:
-                validuntil = mktime(strptime(expiredate, "%d %B %Y"))
-            except Exception, e:
-                self.logError(e)
-
-            if validuntil > mktime(gmtime()):
-                premium = True
-            else:
-                premium = False
-                validuntil = None
-
-        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
-        if m:
-            trafficleft = m.group(1)
-            if "Unlimited" in trafficleft:
-                trafficleft = -1
-            else:
-                trafficleft = parseFileSize(trafficleft) * 1024
-
-        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
-- 
cgit v1.2.3


From f6d78488cfb56da8afac826a353626b56c942753 Mon Sep 17 00:00:00 2001
From: guidobelix <guidobelix@hotmail.it>
Date: Wed, 15 Oct 2014 23:20:54 +0200
Subject: [RapidfileshareNet]  Improve TRAFFIC_LEFT_PATTERN

 Improved TRAFFIC_LEFT_PATTERN to be able to read Units, regardless of #798.
---
 module/plugins/accounts/RapidfileshareNet.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 56ae80cf0..0b021aea7 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class RapidfileshareNet(XFSPAccount):
     __name__ = "RapidfileshareNet"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Rapidfileshare.net account plugin"""
     __license__ = "GPLv3"
@@ -15,4 +15,5 @@ class RapidfileshareNet(XFSPAccount):
 
     HOSTER_URL = "http://www.rapidfileshare.net/"
 
-    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">(?P<S>.+?)</label></TD></TR>'
+    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+)\s*)?</label></TD></TR>'
+    
-- 
cgit v1.2.3


From 5d26b3f5c3b18d916b2ea24a22770cf62e207a50 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 16 Oct 2014 12:12:14 +0200
Subject: Fix trafficleft size in some account plugins

---
 module/plugins/accounts/EasybytezCom.py     | 2 +-
 module/plugins/accounts/FastshareCz.py      | 2 +-
 module/plugins/accounts/FilerNet.py         | 2 +-
 module/plugins/accounts/MultishareCz.py     | 2 +-
 module/plugins/accounts/OboomCom.py         | 4 ++--
 module/plugins/accounts/PremiumTo.py        | 2 +-
 module/plugins/accounts/PremiumizeMe.py     | 2 +-
 module/plugins/accounts/QuickshareCz.py     | 2 +-
 module/plugins/accounts/RapidgatorNet.py    | 2 +-
 module/plugins/accounts/SimplyPremiumCom.py | 4 ++--
 module/plugins/accounts/UnrestrictLi.py     | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 00732c12d..bb15ea8a2 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -52,6 +52,6 @@ class EasybytezCom(XFSPAccount):
             if "Unlimited" in trafficleft:
                 trafficleft = -1
             else:
-                trafficleft = parseFileSize(trafficleft) / 1024
+                trafficleft = parseFileSize(trafficleft)
 
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index a199ad36c..1f74ea2f9 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -24,7 +24,7 @@ class FastshareCz(Account):
 
         m = re.search(self.CREDIT_PATTERN, html)
         if m:
-            trafficleft = parseFileSize(m.group(1)) / 1024
+            trafficleft = parseFileSize(m.group(1))
             premium = True if trafficleft else False
         else:
             trafficleft = None
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index 8bd66221f..82f78ed0c 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -34,7 +34,7 @@ class FilerNet(Account):
         traffic = re.search(self.TRAFFIC_PATTERN, 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
+            trafficleft = parseFileSize(traffic.group(1))
             return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         else:
             self.logError("Unable to retrieve account information - Plugin may be out of date")
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index ae32b8806..813f36496 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -26,7 +26,7 @@ class MultishareCz(Account):
         html = req.load("http://www.multishare.cz/profil/", decode=True)
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
-        trafficleft = parseFileSize(m.group('S'), m.group('U')) / 1024 if m else 0
+        trafficleft = parseFileSize(m.group('S'), m.group('U')) if m else 0
         self.premium = True if trafficleft else False
 
         html = req.load("http://www.multishare.cz/", decode=True)
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index ba71fcbbd..a0d945342 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -53,8 +53,8 @@ class OboomCom(Account):
 
         return {'premium': premium,
                 'validuntil': validUntil,
-                'trafficleft': trafficLeft / 1024,
-                'maxtraffic': maxTraffic / 1024,
+                'trafficleft': trafficLeft,
+                'maxtraffic': maxTraffic,
                 'session': session}
 
 
diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py
index d13d9b866..7875e5021 100644
--- a/module/plugins/accounts/PremiumTo.py
+++ b/module/plugins/accounts/PremiumTo.py
@@ -20,7 +20,7 @@ class PremiumTo(Account):
                          get={'username': self.username, 'password': self.password})
         traffic = sum(map(int, api_r.split(';')))
 
-        return {"trafficleft": int(traffic) / 1024, "validuntil": -1}
+        return {"trafficleft": int(traffic), "validuntil": -1}
 
 
     def login(self, user, data, req):
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index a234a8d93..e65b9ec4b 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -22,7 +22,7 @@ class PremiumizeMe(Account):
 
         # Parse account info
         account_info = {"validuntil": float(status['result']['expires']),
-                        "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)}
+                        "trafficleft": max(0, status['result']['trafficleft_bytes'])}
 
         if status['result']['type'] == 'free':
             account_info['premium'] = False
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index fa0acd06d..e83f7308d 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -20,7 +20,7 @@ class QuickshareCz(Account):
 
         m = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
         if m:
-            trafficleft = parseFileSize(m.group(1)) / 1024
+            trafficleft = parseFileSize(m.group(1))
             premium = True if trafficleft else False
         else:
             trafficleft = None
diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index 981f2f90f..c6833a0f3 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -31,7 +31,7 @@ class RapidgatorNet(Account):
                     self.scheduleRefresh(user, json['response']['reset_in'])
 
                 return {"validuntil": json['response']['expire_date'],
-                        "trafficleft": int(json['response']['traffic_left']) / 1024,
+                        "trafficleft": int(json['response']['traffic_left']),
                         "premium": True}
             else:
                 self.logError(json['response_details'])
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index 442aaa9f3..2fe41abef 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -25,8 +25,8 @@ class SimplyPremiumCom(Account):
         #Time package
         validuntil = float(json_data['result']['timeend'])
         #Traffic package
-        # {"trafficleft": int(traffic) / 1024, "validuntil": -1}
-        #trafficleft = int(json_data['result']['traffic'] / 1024)
+        # {"trafficleft": int(traffic), "validuntil": -1}
+        #trafficleft = int(json_data['result']['traffic'])
 
         #return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         return {"premium": True, "validuntil": validuntil}
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index 5a02e04a2..f89eab473 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -23,7 +23,7 @@ class UnrestrictLi(Account):
             return {"premium": False}
 
         validuntil = json_data['result']['expires']
-        trafficleft = int(json_data['result']['traffic'] / 1024)
+        trafficleft = int(json_data['result']['traffic'])
 
         return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
 
-- 
cgit v1.2.3


From 18836967d39d0b6e6f2aeea4e6aece605246a2bf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 17 Oct 2014 20:55:00 +0200
Subject: Spare code cosmetics

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 0b021aea7..99a4af98b 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -16,4 +16,4 @@ class RapidfileshareNet(XFSPAccount):
     HOSTER_URL = "http://www.rapidfileshare.net/"
 
     TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+)\s*)?</label></TD></TR>'
-    
+
-- 
cgit v1.2.3


From d76e5b5f8f44cf21fd0b9c3672642bbbb90bad12 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 17 Oct 2014 21:08:49 +0200
Subject: New accounts LinestorageCom and UploadcCom

---
 module/plugins/accounts/LinestorageCom.py | 16 ++++++++++++++++
 module/plugins/accounts/UploadcCom.py     | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 module/plugins/accounts/LinestorageCom.py
 create mode 100644 module/plugins/accounts/UploadcCom.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py
new file mode 100644
index 000000000..f2f93fe74
--- /dev/null
+++ b/module/plugins/accounts/LinestorageCom.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class LinestorageCom(XFSPAccount):
+    __name__ = "LinestorageCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Linestorage.com account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.linestorage.com/"
diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py
new file mode 100644
index 000000000..c55597777
--- /dev/null
+++ b/module/plugins/accounts/UploadcCom.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class UploadcCom(XFSPAccount):
+    __name__ = "UploadcCom"
+    __type__ = "account"
+    __version__ = "0.01"
+
+    __description__ = """Uploadc.com account plugin"""
+    __license__ = "GPLv3"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    HOSTER_URL = "http://www.uploadc.com/"
-- 
cgit v1.2.3


From 6a6373e9b63ce7943f1a6592a641e3d8b3f31e09 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 17 Oct 2014 21:10:40 +0200
Subject: Fix TRAFFIC_LEFT_PATTERN in RapidfileshareNet and TusfilesNet
 accounts

---
 module/plugins/accounts/RapidfileshareNet.py | 5 ++---
 module/plugins/accounts/TusfilesNet.py       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 99a4af98b..4a146f398 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class RapidfileshareNet(XFSPAccount):
     __name__ = "RapidfileshareNet"
     __type__ = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """Rapidfileshare.net account plugin"""
     __license__ = "GPLv3"
@@ -15,5 +15,4 @@ class RapidfileshareNet(XFSPAccount):
 
     HOSTER_URL = "http://www.rapidfileshare.net/"
 
-    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+)\s*)?</label></TD></TR>'
-
+    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</label></TD></TR>'
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 775aab9c0..ab5b57834 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -11,7 +11,7 @@ from module.utils import parseFileSize
 class TusfilesNet(XFSPAccount):
     __name__ = "TusfilesNet"
     __type__ = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """ Tusfile.net account plugin """
     __license__ = "GPLv3"
@@ -21,4 +21,4 @@ class TusfilesNet(XFSPAccount):
     HOSTER_URL = "http://www.tusfiles.net/"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
-    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[^<]+)</td>'
+    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</td>'
-- 
cgit v1.2.3


From c9ef02f1d748738ffaa197aa8a6f94b69a4237b3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 18 Oct 2014 13:49:08 +0200
Subject: New account XFileSharingPro

---
 module/plugins/accounts/XFileSharingPro.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 module/plugins/accounts/XFileSharingPro.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
new file mode 100644
index 000000000..cd09c076d
--- /dev/null
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.XFSPAccount import XFSPAccount
+
+
+class XFileSharingPro(XFSPAccount):
+    __name__ = "XFileSharingPro"
+    __type__ = "crypter"
+    __version__ = "0.01"
+
+    __description__ = """XFileSharingPro dummy account plugin for hook"""
+    __license__ = "GPLv3"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    def init(self):
+        pattern = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+        self.HOSTER_NAME = re.match(pattern, self.pyfile.url).group(1).lower()
-- 
cgit v1.2.3


From 7b3009db0d90cbcd5a754c69399b5e4c6abe180c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 18 Oct 2014 13:52:42 +0200
Subject: Update accounts to use HOSTER_NAME instead HOSTER_URL

---
 module/plugins/accounts/BillionuploadsCom.py      | 2 +-
 module/plugins/accounts/CramitIn.py               | 2 +-
 module/plugins/accounts/EasybytezCom.py           | 2 +-
 module/plugins/accounts/File4safeCom.py           | 2 +-
 module/plugins/accounts/FileParadoxIn.py          | 2 +-
 module/plugins/accounts/FileomCom.py              | 2 +-
 module/plugins/accounts/FilerioCom.py             | 2 +-
 module/plugins/accounts/HugefilesNet.py           | 2 +-
 module/plugins/accounts/HundredEightyUploadCom.py | 2 +-
 module/plugins/accounts/JunocloudMe.py            | 2 +-
 module/plugins/accounts/LinestorageCom.py         | 2 +-
 module/plugins/accounts/LomafileCom.py            | 2 +-
 module/plugins/accounts/MovReelCom.py             | 2 +-
 module/plugins/accounts/NosuploadCom.py           | 2 +-
 module/plugins/accounts/NovafileCom.py            | 2 +-
 module/plugins/accounts/RapidfileshareNet.py      | 2 +-
 module/plugins/accounts/RarefileNet.py            | 2 +-
 module/plugins/accounts/RyushareCom.py            | 2 +-
 module/plugins/accounts/SecureUploadEu.py         | 2 +-
 module/plugins/accounts/SendmywayCom.py           | 2 +-
 module/plugins/accounts/StreamcloudEu.py          | 2 +-
 module/plugins/accounts/TusfilesNet.py            | 2 +-
 module/plugins/accounts/UploadcCom.py             | 2 +-
 module/plugins/accounts/UptoboxCom.py             | 2 +-
 module/plugins/accounts/VidPlayNet.py             | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py
index 54f0db1c6..3e8fd35c2 100644
--- a/module/plugins/accounts/BillionuploadsCom.py
+++ b/module/plugins/accounts/BillionuploadsCom.py
@@ -13,4 +13,4 @@ class BillionuploadsCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.billionuploads.com/"
+    HOSTER_NAME = "billionuploads.com"
diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py
index 5edc2dac0..98e14bb3a 100644
--- a/module/plugins/accounts/CramitIn.py
+++ b/module/plugins/accounts/CramitIn.py
@@ -13,4 +13,4 @@ class CramitIn(XFSPAccount):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_URL = "http://www.cramit.in/"
+    HOSTER_NAME = "cramit.in"
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index bb15ea8a2..f88e9ed4c 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -19,7 +19,7 @@ class EasybytezCom(XFSPAccount):
                    ("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_URL = "http://www.easybytez.com/"
+    HOSTER_NAME = "easybytez.com"
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py
index 0a930ed77..a301f70bc 100644
--- a/module/plugins/accounts/File4safeCom.py
+++ b/module/plugins/accounts/File4safeCom.py
@@ -13,7 +13,7 @@ class File4safeCom(XFSPAccount):
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
-    HOSTER_URL = "http://www.file4safe.com/"
+    HOSTER_NAME = "file4safe.com"
 
     LOGIN_FAIL_PATTERN = r'input_login'
     PREMIUM_PATTERN = r'Extend Premium'
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
index 6a10e213f..6d55f254e 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -13,4 +13,4 @@ class FileParadoxIn(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.fileparadox.in/"
+    HOSTER_NAME = "fileparadox.in"
diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
index 45bff8f92..565acf6ab 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/module/plugins/accounts/FileomCom.py
@@ -13,4 +13,4 @@ class FileomCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.fileom.com/"
+    HOSTER_NAME = "fileom.com"
diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py
index 51bf106ed..d50b70a57 100644
--- a/module/plugins/accounts/FilerioCom.py
+++ b/module/plugins/accounts/FilerioCom.py
@@ -13,4 +13,4 @@ class FilerioCom(XFSPAccount):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_URL = "http://www.filerio.in/"
+    HOSTER_NAME = "filerio.in"
diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
index 0adc1e511..11e0beab9 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -13,4 +13,4 @@ class HugefilesNet(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.hugefiles.net/"
+    HOSTER_NAME = "hugefiles.net"
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
index 1c78edfa4..3bee13ef9 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -13,4 +13,4 @@ class HundredEightyUploadCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.180upload.com/"
+    HOSTER_NAME = "180upload.com"
diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py
index 8cd7e8dde..4fae6c510 100644
--- a/module/plugins/accounts/JunocloudMe.py
+++ b/module/plugins/accounts/JunocloudMe.py
@@ -13,4 +13,4 @@ class JunocloudMe(XFSPAccount):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_URL = "http://www.junocloud.me/"
+    HOSTER_NAME = "junocloud.me"
diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py
index f2f93fe74..656248e88 100644
--- a/module/plugins/accounts/LinestorageCom.py
+++ b/module/plugins/accounts/LinestorageCom.py
@@ -13,4 +13,4 @@ class LinestorageCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.linestorage.com/"
+    HOSTER_NAME = "linestorage.com"
diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py
index c3e75b1d9..f9b99eb3a 100644
--- a/module/plugins/accounts/LomafileCom.py
+++ b/module/plugins/accounts/LomafileCom.py
@@ -13,4 +13,4 @@ class LomafileCom(XFSPAccount):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_URL = "http://www.lomafile.com/"
+    HOSTER_NAME = "lomafile.com"
diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py
index 3f641cf72..764dc2c66 100644
--- a/module/plugins/accounts/MovReelCom.py
+++ b/module/plugins/accounts/MovReelCom.py
@@ -16,4 +16,4 @@ class MovReelCom(XFSPAccount):
     login_timeout = 60
     info_threshold = 30
 
-    HOSTER_URL = "http://www.movreel.com/"
+    HOSTER_NAME = "movreel.com"
diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
index 3be5f110d..f8561d25f 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -13,4 +13,4 @@ class NosuploadCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.nosupload.com/"
+    HOSTER_NAME = "nosupload.com"
diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
index 823f486c7..5b85445e7 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/module/plugins/accounts/NovafileCom.py
@@ -13,4 +13,4 @@ class NovafileCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.novafile.com/"
+    HOSTER_NAME = "novafile.com"
diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 4a146f398..63207acbb 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -13,6 +13,6 @@ class RapidfileshareNet(XFSPAccount):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_URL = "http://www.rapidfileshare.net/"
+    HOSTER_NAME = "rapidfileshare.net"
 
     TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</label></TD></TR>'
diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py
index 303c38396..0bb1920de 100644
--- a/module/plugins/accounts/RarefileNet.py
+++ b/module/plugins/accounts/RarefileNet.py
@@ -13,4 +13,4 @@ class RarefileNet(XFSPAccount):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_URL = "http://www.rarefile.net/"
+    HOSTER_NAME = "rarefile.net"
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index e2635277a..8eec508a3 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -14,7 +14,7 @@ class RyushareCom(XFSPAccount):
                    ("trance4us", None)]
 
 
-    HOSTER_URL = "http://www.ryushare.com/"
+    HOSTER_NAME = "ryushare.com"
 
 
     def login(self, user, data, req):
diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
index 11a13f383..a7d86523c 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -13,4 +13,4 @@ class SecureUploadEu(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.secureupload.eu/"
+    HOSTER_NAME = "secureupload.eu"
diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
index fdc8b85d9..674f5b183 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -13,4 +13,4 @@ class SendmywayCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.sendmyway.com/"
+    HOSTER_NAME = "sendmyway.com"
diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
index 9e69a7ae4..6cdb5efe0 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -13,4 +13,4 @@ class StreamcloudEu(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.streamcloud.eu/"
+    HOSTER_NAME = "streamcloud.eu"
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index ab5b57834..dcb9fa104 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -18,7 +18,7 @@ class TusfilesNet(XFSPAccount):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_URL = "http://www.tusfiles.net/"
+    HOSTER_NAME = "tusfiles.net"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
     TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</td>'
diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py
index c55597777..58ca6c985 100644
--- a/module/plugins/accounts/UploadcCom.py
+++ b/module/plugins/accounts/UploadcCom.py
@@ -13,4 +13,4 @@ class UploadcCom(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.uploadc.com/"
+    HOSTER_NAME = "uploadc.com"
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index 090cc85df..aed769f7d 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -13,6 +13,6 @@ class UptoboxCom(XFSPAccount):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_URL = "http://www.uptobox.com/"
+    HOSTER_NAME = "uptobox.com"
 
     VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)</strong>'
diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
index 904041939..286adfc13 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -13,4 +13,4 @@ class VidPlayNet(XFSPAccount):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_URL = "http://www.vidplay.net/"
+    HOSTER_NAME = "vidplay.net"
-- 
cgit v1.2.3


From 0c35c0f7fe126b87eccdf4f69933b84927956658 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 18 Oct 2014 15:19:59 +0200
Subject: [XFileSharingPro] Fix account __type__

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index cd09c076d..d5a62c3a4 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -7,10 +7,10 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 class XFileSharingPro(XFSPAccount):
     __name__ = "XFileSharingPro"
-    __type__ = "crypter"
-    __version__ = "0.01"
+    __type__ = "account"
+    __version__ = "0.02"
 
-    __description__ = """XFileSharingPro dummy account plugin for hook"""
+    __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
-- 
cgit v1.2.3


From 8edb5481e04da44a227e18c76fc4073297721f4f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 18 Oct 2014 16:29:41 +0200
Subject: [XFileSharingPro] Fixes

---
 module/plugins/accounts/XFileSharingPro.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index d5a62c3a4..5be377c40 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -10,11 +10,21 @@ class XFileSharingPro(XFSPAccount):
     __type__ = "account"
     __version__ = "0.02"
 
-    __description__ = """XFileSharingPro multi-purpose account plugin"""
+    __description__ = """XFileSharingPro dummy account plugin"""
     __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    def init(self):
-        pattern = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-        self.HOSTER_NAME = re.match(pattern, self.pyfile.url).group(1).lower()
+    HOSTER_NAME = None
+
+
+    def loadAccountInfo(self, user, req):
+        if self.HOSTER_NAME:
+            return super(XFileSharingPro, self).loadAccountInfo(user, req)
+        else:
+            return {'validuntil': None, 'trafficleft': None, 'premium': None}
+
+
+    def login(self, user, data, req):
+        if self.HOSTER_NAME:
+            return super(XFileSharingPro, self).login(user, data, req)
-- 
cgit v1.2.3


From 477120dfa8090f808ce17267896456c082714203 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 18 Oct 2014 19:09:49 +0200
Subject: Fixed logging issue with coords values

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index 5be377c40..fba774b21 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -10,7 +10,7 @@ class XFileSharingPro(XFSPAccount):
     __type__ = "account"
     __version__ = "0.02"
 
-    __description__ = """XFileSharingPro dummy account plugin"""
+    __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
-- 
cgit v1.2.3


From 1f48f481740863c7697064bde286a78e977e4a1b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 19 Oct 2014 15:12:06 +0200
Subject: Update other plugins to support self.error

---
 module/plugins/accounts/DebridItaliaCom.py | 2 +-
 module/plugins/accounts/FilerNet.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 48b46cc0b..631a2a316 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -30,7 +30,7 @@ class DebridItaliaCom(Account):
             validuntil = int(time.mktime(time.strptime(m.group('D'), "%d/%m/%Y %H:%M")))
             return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
         else:
-            self.logError("Unable to retrieve account information - Plugin may be out of date")
+            self.logError("Unable to retrieve account information")
 
 
     def login(self, user, data, req):
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index 82f78ed0c..f89d7be2f 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -37,7 +37,7 @@ class FilerNet(Account):
             trafficleft = parseFileSize(traffic.group(1))
             return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         else:
-            self.logError("Unable to retrieve account information - Plugin may be out of date")
+            self.logError("Unable to retrieve account information")
             return {"premium": False, "validuntil": None, "trafficleft": None}
 
 
-- 
cgit v1.2.3


From 3253bc2596edc5d45a64a643d85f154b8f0fd8ce Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 20 Oct 2014 00:33:05 +0200
Subject: Tiny code cosmetics in Ftp and Http accounts

---
 module/plugins/accounts/Ftp.py  | 3 ++-
 module/plugins/accounts/Http.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py
index 698051ede..422573a4a 100644
--- a/module/plugins/accounts/Ftp.py
+++ b/module/plugins/accounts/Ftp.py
@@ -13,4 +13,5 @@ class Ftp(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    login_timeout = info_threshold = 1000000
+    info_threshold = 1000000
+    login_timeout = 1000000
diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py
index c7b03a668..c3170ae85 100644
--- a/module/plugins/accounts/Http.py
+++ b/module/plugins/accounts/Http.py
@@ -13,4 +13,5 @@ class Http(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    login_timeout = info_threshold = 1000000
+    info_threshold = 1000000
+    login_timeout = 1000000
-- 
cgit v1.2.3


From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 22 Oct 2014 19:44:59 +0200
Subject: Two space before function declaration

---
 module/plugins/accounts/EuroshareEu.py    | 1 -
 module/plugins/accounts/FreeWayMe.py      | 2 ++
 module/plugins/accounts/FshareVn.py       | 1 +
 module/plugins/accounts/OneFichierCom.py  | 2 --
 module/plugins/accounts/PremiumizeMe.py   | 1 +
 module/plugins/accounts/RPNetBiz.py       | 1 +
 module/plugins/accounts/ShareonlineBiz.py | 1 +
 module/plugins/accounts/UploadedTo.py     | 2 --
 module/plugins/accounts/ZeveraCom.py      | 1 +
 9 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index bb2f0c8e2..e08cc7e45 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -31,7 +31,6 @@ class EuroshareEu(Account):
 
 
     def login(self, user, data, req):
-
         html = req.load('http://euroshare.eu/customer-zone/login/', post={
             "trvale": "1",
             "login": user,
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index 12c24329c..797748c93 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -32,6 +32,7 @@ class FreeWayMe(Account):
 
         return account_info
 
+
     def getpw(self, user):
         return self.accounts[user]['password']
 
@@ -43,6 +44,7 @@ class FreeWayMe(Account):
         if not status:
             self.wrongPassword()
 
+
     def getAccountStatus(self, user, req):
         answer = req.load("https://www.free-way.me/ajax/jd.php",
                           get={"id": 4, "user": user, "pass": self.accounts[user]['password']})
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 45ee5a749..9e513d6f6 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -57,6 +57,7 @@ class FshareVn(Account):
         if not re.search(r'<img\s+alt="VIP"', html):
             self.wrongPassword()
 
+
     def getTrafficLeft(self):
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         return float(m.group(1)) * 1024 ** {'k': 0, 'K': 0, 'M': 1, 'G': 2}[m.group(2)] if m else 0
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 8e8430f61..71fa550b6 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -21,7 +21,6 @@ class OneFichierCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-
         html = req.load("http://1fichier.com/console/abo.pl")
 
         m = re.search(self.VALID_UNTIL_PATTERN, html)
@@ -38,7 +37,6 @@ class OneFichierCom(Account):
 
 
     def login(self, user, data, req):
-
         req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en")
 
         html = req.load("http://1fichier.com/login.pl?lg=en", post={
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index e65b9ec4b..4a789bfdf 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -38,6 +38,7 @@ class PremiumizeMe(Account):
         if status['status'] != 200:
             self.wrongPassword()
 
+
     def getAccountStatus(self, user, req):
         # Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api)
         # to retrieve account info and return the parsed json answer
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index e4b873824..59349bd7a 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -40,6 +40,7 @@ class RPNetBiz(Account):
         if 'error' in response:
             self.wrongPassword()
 
+
     def getAccountStatus(self, user, req):
         # Using the rpnet API, check if valid premium account
         response = req.load("https://premium.rpnet.biz/client_api.php",
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index 76c564032..c00e4769d 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -18,6 +18,7 @@ class ShareonlineBiz(Account):
         return req.load("http://api.share-online.biz/account.php",
                         {"username": user, "password": self.accounts[user]['password'], "act": "userDetails"})
 
+
     def loadAccountInfo(self, user, req):
         src = self.getUserAPI(user, req)
 
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 437730a3f..147962838 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -17,7 +17,6 @@ class UploadedTo(Account):
 
 
     def loadAccountInfo(self, user, req):
-
         req.load("http://uploaded.net/language/en")
         html = req.load("http://uploaded.net/me")
 
@@ -44,7 +43,6 @@ class UploadedTo(Account):
 
 
     def login(self, user, data, req):
-
         req.load("http://uploaded.net/language/en")
         req.cj.setCookie("uploaded.net", "lang", "en")
 
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 7e4fb0ab8..8ee8610ba 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -34,6 +34,7 @@ class ZeveraCom(Account):
         if self.getAPIData(req) == "No traffic":
             self.wrongPassword()
 
+
     def getAPIData(self, req, just_header=False, **kwargs):
         get_data = {
             'cmd': 'accountinfo',
-- 
cgit v1.2.3


From e41f3d7f9bac5c5923d5e3e4ae4b373f6c90dc16 Mon Sep 17 00:00:00 2001
From: guidobelix <guidobelix@hotmail.it>
Date: Wed, 22 Oct 2014 21:41:11 +0200
Subject: Broken TRAFFIC_LEFT_PATTERN in RapidfileshareNet and TusfilesNet
 account

---
 module/plugins/accounts/RapidfileshareNet.py | 4 ++--
 module/plugins/accounts/TusfilesNet.py       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 63207acbb..5ca05fd91 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class RapidfileshareNet(XFSPAccount):
     __name__ = "RapidfileshareNet"
     __type__ = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """Rapidfileshare.net account plugin"""
     __license__ = "GPLv3"
@@ -15,4 +15,4 @@ class RapidfileshareNet(XFSPAccount):
 
     HOSTER_NAME = "rapidfileshare.net"
 
-    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</label></TD></TR>'
+    TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+))?'
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index dcb9fa104..65f35a8e2 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -11,7 +11,7 @@ from module.utils import parseFileSize
 class TusfilesNet(XFSPAccount):
     __name__ = "TusfilesNet"
     __type__ = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """ Tusfile.net account plugin """
     __license__ = "GPLv3"
@@ -21,4 +21,4 @@ class TusfilesNet(XFSPAccount):
     HOSTER_NAME = "tusfiles.net"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
-    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</td>'
+    TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[\d.,]+)'
-- 
cgit v1.2.3


From 29de13dc5098cc9214f3f8f111da140a22e3e2ff Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 25 Oct 2014 01:15:58 +0200
Subject: Use parseTraffic instead parseFileSize in accounts

---
 module/plugins/accounts/EasybytezCom.py |  5 ++---
 module/plugins/accounts/FastshareCz.py  |  5 ++---
 module/plugins/accounts/FilerNet.py     |  5 ++---
 module/plugins/accounts/MultishareCz.py | 10 ++++------
 module/plugins/accounts/QuickshareCz.py |  6 +++---
 module/plugins/accounts/StahnuTo.py     |  5 ++---
 module/plugins/accounts/TusfilesNet.py  |  1 -
 7 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index f88e9ed4c..74602b696 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -5,13 +5,12 @@ import re
 from time import mktime, strptime, gmtime
 
 from module.plugins.internal.XFSPAccount import XFSPAccount
-from module.utils import parseFileSize
 
 
 class EasybytezCom(XFSPAccount):
     __name__ = "EasybytezCom"
     __type__ = "account"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __description__ = """EasyBytez.com account plugin"""
     __license__ = "GPLv3"
@@ -52,6 +51,6 @@ class EasybytezCom(XFSPAccount):
             if "Unlimited" in trafficleft:
                 trafficleft = -1
             else:
-                trafficleft = parseFileSize(trafficleft)
+                trafficleft = self.parseTraffic(trafficleft)
 
         return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index 1f74ea2f9..7838d9bab 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -2,13 +2,12 @@
 
 import re
 from module.plugins.Account import Account
-from module.utils import parseFileSize
 
 
 class FastshareCz(Account):
     __name__ = "FastshareCz"
     __type__ = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """Fastshare.cz account plugin"""
     __license__ = "GPLv3"
@@ -24,7 +23,7 @@ class FastshareCz(Account):
 
         m = re.search(self.CREDIT_PATTERN, html)
         if m:
-            trafficleft = parseFileSize(m.group(1))
+            trafficleft = self.parseTraffic(m.group(1))
             premium = True if trafficleft else False
         else:
             trafficleft = None
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index f89d7be2f..8dcb20295 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -4,13 +4,12 @@ import re
 import time
 
 from module.plugins.Account import Account
-from module.utils import parseFileSize
 
 
 class FilerNet(Account):
     __name__ = "FilerNet"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Filer.net account plugin"""
     __license__ = "GPLv3"
@@ -34,7 +33,7 @@ class FilerNet(Account):
         traffic = re.search(self.TRAFFIC_PATTERN, 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))
+            trafficleft = self.parseTraffic(traffic.group(1))
             return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         else:
             self.logError("Unable to retrieve account information")
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 813f36496..38bb11ea1 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Account import Account
-#from time import mktime, strptime
-#from pycurl import REFERER
 import re
-from module.utils import parseFileSize
+
+from module.plugins.Account import Account
 
 
 class MultishareCz(Account):
     __name__ = "MultishareCz"
     __type__ = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """Multishare.cz account plugin"""
     __license__ = "GPLv3"
@@ -26,7 +24,7 @@ class MultishareCz(Account):
         html = req.load("http://www.multishare.cz/profil/", decode=True)
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
-        trafficleft = parseFileSize(m.group('S'), m.group('U')) if m else 0
+        trafficleft = self.parseTraffic(m.group('S'), m.group('U')) if m else 0
         self.premium = True if trafficleft else False
 
         html = req.load("http://www.multishare.cz/", decode=True)
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index e83f7308d..adb54c7d0 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.Account import Account
-from module.utils import parseFileSize
 
 
 class QuickshareCz(Account):
     __name__ = "QuickshareCz"
     __type__ = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Quickshare.cz account plugin"""
     __license__ = "GPLv3"
@@ -20,7 +20,7 @@ class QuickshareCz(Account):
 
         m = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
         if m:
-            trafficleft = parseFileSize(m.group(1))
+            trafficleft = self.parseTraffic(m.group(1))
             premium = True if trafficleft else False
         else:
             trafficleft = None
diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py
index 7b32ae842..b254e0fac 100644
--- a/module/plugins/accounts/StahnuTo.py
+++ b/module/plugins/accounts/StahnuTo.py
@@ -3,13 +3,12 @@
 import re
 
 from module.plugins.Account import Account
-from module.utils import parseFileSize
 
 
 class StahnuTo(Account):
     __name__ = "StahnuTo"
     __type__ = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """StahnuTo account plugin"""
     __license__ = "GPLv3"
@@ -20,7 +19,7 @@ class StahnuTo(Account):
         html = req.load("http://www.stahnu.to/")
 
         m = re.search(r'>VIP: (\d+.*)<', html)
-        trafficleft = parseFileSize(m.group(1)) * 1024 if m else 0
+        trafficleft = self.parseTraffic(m.group(1)) * 1024 if m else 0
 
         return {"premium": trafficleft > (512 * 1024), "trafficleft": trafficleft, "validuntil": -1}
 
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 65f35a8e2..d52169fae 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -5,7 +5,6 @@ import re
 from time import mktime, strptime, gmtime
 
 from module.plugins.internal.XFSPAccount import XFSPAccount
-from module.utils import parseFileSize
 
 
 class TusfilesNet(XFSPAccount):
-- 
cgit v1.2.3


From 4da90891eb2544ac15a7d512aba8cb357f68ee5f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 25 Oct 2014 01:11:29 +0200
Subject: Spare code cosmetics

---
 module/plugins/accounts/FreakshareCom.py | 4 ++--
 module/plugins/accounts/UploadedTo.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 2ee7a33ea..c03e2b047 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -20,12 +20,12 @@ class FreakshareCom(Account):
         page = req.load("http://freakshare.com/")
 
         validuntil = r'ltig bis:</td>\s*<td><b>([\d.:-]+)</b></td>'
-        validuntil = re.search(validuntil, page, re.MULTILINE)
+        validuntil = re.search(validuntil, page, re.M)
         validuntil = validuntil.group(1).strip()
         validuntil = mktime(strptime(validuntil, "%d.%m.%Y - %H:%M"))
 
         traffic = r'Traffic verbleibend:</td>\s*<td>([^<]+)'
-        traffic = re.search(traffic, page, re.MULTILINE)
+        traffic = re.search(traffic, page, re.M)
         traffic = traffic.group(1).strip()
         traffic = self.parseTraffic(traffic)
 
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 147962838..55017eb30 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -24,7 +24,7 @@ class UploadedTo(Account):
 
         if premium:
             raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1).replace('.', '')
-            raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.MULTILINE).group(1).strip()
+            raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.M).group(1).strip()
 
             traffic = int(self.parseTraffic(raw_traffic))
 
-- 
cgit v1.2.3


From 1c4bf83881d2a22da3773666a580d51f6b57bfd1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 25 Oct 2014 03:07:21 +0200
Subject: Avoid gettext conflict due variable `_`

---
 module/plugins/accounts/BayfilesCom.py | 2 +-
 module/plugins/accounts/FilecloudIo.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py
index 2b6d45a18..d1cf8ba22 100644
--- a/module/plugins/accounts/BayfilesCom.py
+++ b/module/plugins/accounts/BayfilesCom.py
@@ -17,7 +17,7 @@ class BayfilesCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        for _ in xrange(2):
+        for _i in xrange(2):
             response = json_loads(req.load("http://api.bayfiles.com/v1/account/info"))
             self.logDebug(response)
             if not response['error']:
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index 439491ea9..e1f8c0142 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -17,7 +17,7 @@ class FilecloudIo(Account):
 
     def loadAccountInfo(self, user, req):
         # It looks like the first API request always fails, so we retry 5 times, it should work on the second try
-        for _ in xrange(5):
+        for _i in xrange(5):
             rep = req.load("https://secure.filecloud.io/api-fetch_apikey.api",
                            post={"username": user, "password": self.accounts[user]['password']})
             rep = json_loads(rep)
-- 
cgit v1.2.3


From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 26 Oct 2014 02:31:54 +0200
Subject: Extend translation support in plugins + a lot of code cosmetics and
 typo fixes

---
 module/plugins/accounts/DebridItaliaCom.py | 2 +-
 module/plugins/accounts/FilecloudIo.py     | 2 +-
 module/plugins/accounts/FilerNet.py        | 2 +-
 module/plugins/accounts/HellshareCz.py     | 2 +-
 module/plugins/accounts/LetitbitNet.py     | 2 +-
 module/plugins/accounts/MyfastfileCom.py   | 4 ++--
 module/plugins/accounts/OboomCom.py        | 2 +-
 module/plugins/accounts/RapidshareCom.py   | 2 +-
 module/plugins/accounts/RealdebridCom.py   | 2 +-
 module/plugins/accounts/UnrestrictLi.py    | 2 +-
 module/plugins/accounts/UploadheroCom.py   | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 631a2a316..750e1ecec 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -30,7 +30,7 @@ class DebridItaliaCom(Account):
             validuntil = int(time.mktime(time.strptime(m.group('D'), "%d/%m/%Y %H:%M")))
             return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
         else:
-            self.logError("Unable to retrieve account information")
+            self.logError(_("Unable to retrieve account information"))
 
 
     def login(self, user, data, req):
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index e1f8c0142..c889c9644 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -24,7 +24,7 @@ class FilecloudIo(Account):
             if rep['status'] == 'ok':
                 break
             elif rep['status'] == 'error' and rep['message'] == 'no such user or wrong password':
-                self.logError("Wrong username or password")
+                self.logError(_("Wrong username or password"))
                 return {"valid": False, "premium": False}
         else:
             return {"premium": False}
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index 8dcb20295..f7720adcc 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -36,7 +36,7 @@ class FilerNet(Account):
             trafficleft = self.parseTraffic(traffic.group(1))
             return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft}
         else:
-            self.logError("Unable to retrieve account information")
+            self.logError(_("Unable to retrieve account information"))
             return {"premium": False, "validuntil": None, "trafficleft": None}
 
 
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index d24a6ae51..15e25a7dd 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -44,7 +44,7 @@ class HellshareCz(Account):
                     trafficleft = int(credit) * 1024
                     validuntil = -1
             except Exception, e:
-                self.logError("Unable to parse credit info", e)
+                self.logError(_("Unable to parse credit info"), repr(e))
                 validuntil = -1
                 trafficleft = -1
 
diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py
index fba599078..3ca9e44da 100644
--- a/module/plugins/accounts/LetitbitNet.py
+++ b/module/plugins/accounts/LetitbitNet.py
@@ -31,4 +31,4 @@ class LetitbitNet(Account):
 
     def login(self, user, data, req):
         # API_KEY is the username and the PREMIUM_KEY is the password
-        self.logInfo("You must use your API KEY as username and the PREMIUM KEY as password.")
+        self.logInfo(_("You must use your API KEY as username and the PREMIUM KEY as password"))
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 350974d79..2d60cf939 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -21,7 +21,7 @@ class MyfastfileCom(Account):
             validuntil = int(time() + self.json_data['days_left'] * 24 * 60 * 60)
             return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
         else:
-            self.logError("Unable to get account information")
+            self.logError(_("Unable to get account information"))
 
 
     def login(self, user, data, req):
@@ -31,5 +31,5 @@ class MyfastfileCom(Account):
         self.logDebug("JSON data: " + html)
         self.json_data = json_loads(html)
         if self.json_data['status'] != 'ok':
-            self.logError('Invalid login. The password to use is the API-Password you find in your "My Account" page')
+            self.logError(_('Invalid login. The password to use is the API-Password you find in your "My Account" page'))
             self.wrongPassword()
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index a0d945342..cf9329e1f 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -24,7 +24,7 @@ class OboomCom(Account):
         pbkdf2 = PBKDF2(passwd, salt, 1000).hexread(16)
         result = json_loads(req.load("https://www.oboom.com/1/login", get={"auth": user, "pass": pbkdf2}))
         if not result[0] == 200:
-            self.logWarning("Failed to log in: %s" % result[1])
+            self.logWarning(_("Failed to log in: %s") % result[1])
             self.wrongPassword()
         return result[1]
 
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index d6f4efe8d..864873d5d 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -43,7 +43,7 @@ class RapidshareCom(Account):
                           "password": data['password'], "withcookie": 1}
         src = req.load(api_url_base, cookies=False, get=api_param_prem)
         if src.startswith("ERROR"):
-            raise Exception(src + "### Note you have to use your account number for login, instead of name.")
+            raise Exception(src + "### Note you have to use your account number for login, instead of name")
         fields = src.split("\n")
         info = {}
         for t in fields:
diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py
index e85a28f02..4c3c3bc2b 100644
--- a/module/plugins/accounts/RealdebridCom.py
+++ b/module/plugins/accounts/RealdebridCom.py
@@ -32,5 +32,5 @@ class RealdebridCom(Account):
         if "Your login informations are incorrect" in page:
             self.wrongPassword()
         elif "PIN Code required" in page:
-            self.logWarning("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com.")
+            self.logWarning(_("PIN code required. Please login to https://real-debrid.com using the PIN or disable the double authentication in your control panel on https://real-debrid.com"))
             self.pin_code = True
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index f89eab473..27abb3f51 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -33,7 +33,7 @@ class UnrestrictLi(Account):
         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")
+            self.logError(_("A Captcha is required. Go to http://unrestrict.li/sign_in and login, then retry"))
             return
 
         post_data = {"username": user, "password": data['password'],
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index e66f7b9c6..771940dbd 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -18,7 +18,7 @@ class UploadheroCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium.')
+        premium_pattern = re.compile('Il vous reste <span class="bleu">(\d+)</span> jours premium')
 
         data = self.getAccountData(user)
         page = req.load("http://uploadhero.co/my-account")
-- 
cgit v1.2.3


From e92919794e2c7e49e015fee8dfc906404fa0e541 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 26 Oct 2014 19:35:43 +0100
Subject: [XFSPAccount] Improve VALID_UNTIL_PATTERN

---
 module/plugins/accounts/UptoboxCom.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index aed769f7d..0fda7cd5e 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class UptoboxCom(XFSPAccount):
     __name__ = "UptoboxCom"
     __type__ = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """DDLStorage.com account plugin"""
     __license__ = "GPLv3"
@@ -14,5 +14,3 @@ class UptoboxCom(XFSPAccount):
 
 
     HOSTER_NAME = "uptobox.com"
-
-    VALID_UNTIL_PATTERN = r'>Premium.[Aa]ccount expire: ([^<]+)</strong>'
-- 
cgit v1.2.3


From b20ffc3f6e6b34db2a22b6db6f751ee4a4d58a44 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 26 Oct 2014 19:39:20 +0100
Subject: Assign in-line regex to PATTERN variable in a couple of accounts

---
 module/plugins/accounts/MegaRapidCz.py  | 10 +++++++---
 module/plugins/accounts/QuickshareCz.py |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index 3ef98560a..04abf8c8a 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -18,22 +18,26 @@ class MegaRapidCz(Account):
 
 
     login_timeout = 60
+    
+    LIMITDL_PATTERN = ur'<td>Max. počet paralelních stahování: </td><td>(\d+)'
+    VALID_UNTIL_PATTERN = ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>'
+    TRAFFIC_LEFT_PATTERN = r'<tr><td>Kredit</td><td>(.*?) GiB'
 
 
     def loadAccountInfo(self, user, req):
         src = req.load("http://megarapid.cz/mujucet/", decode=True)
 
-        m = re.search(ur'<td>Max. počet paralelních stahování: </td><td>(\d+)', src)
+        m = re.search(self.LIMITDL_PATTERN, src)
         if m:
             data = self.getAccountData(user)
             data['options']['limitDL'] = [int(m.group(1))]
 
-        m = re.search(ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>', src)
+        m = re.search(self.VALID_UNTIL_PATTERN, src)
         if m:
             validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
             return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
 
-        m = re.search(r'<tr><td>Kredit</td><td>(.*?) GiB', src)
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, src)
         if m:
             trafficleft = float(m.group(1)) * (1 << 20)
             return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index adb54c7d0..f8ba3e7ff 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -15,10 +15,13 @@ class QuickshareCz(Account):
     __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
+    TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
+    
+    
     def loadAccountInfo(self, user, req):
         html = req.load("http://www.quickshare.cz/premium", decode=True)
 
-        m = re.search(r'Stav kreditu: <strong>(.+?)</strong>', html)
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         if m:
             trafficleft = self.parseTraffic(m.group(1))
             premium = True if trafficleft else False
-- 
cgit v1.2.3


From 146fe1e309c33ab149bfaf58ad86c0dd4fb9b156 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 27 Oct 2014 01:18:45 +0100
Subject: Spare code cosmetics

---
 module/plugins/accounts/HellshareCz.py  | 2 +-
 module/plugins/accounts/MegaRapidCz.py  | 2 +-
 module/plugins/accounts/QuickshareCz.py | 4 ++--
 module/plugins/accounts/UploadedTo.py   | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index 15e25a7dd..cbe6b9654 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -44,7 +44,7 @@ class HellshareCz(Account):
                     trafficleft = int(credit) * 1024
                     validuntil = -1
             except Exception, e:
-                self.logError(_("Unable to parse credit info"), repr(e))
+                self.logError(_("Unable to parse credit info"), str(e))
                 validuntil = -1
                 trafficleft = -1
 
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index 04abf8c8a..c458210f8 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -18,7 +18,7 @@ class MegaRapidCz(Account):
 
 
     login_timeout = 60
-    
+
     LIMITDL_PATTERN = ur'<td>Max. počet paralelních stahování: </td><td>(\d+)'
     VALID_UNTIL_PATTERN = ur'<td>Paušální stahování aktivní. Vyprší </td><td><strong>(.*?)</strong>'
     TRAFFIC_LEFT_PATTERN = r'<tr><td>Kredit</td><td>(.*?) GiB'
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index f8ba3e7ff..e01058644 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -16,8 +16,8 @@ class QuickshareCz(Account):
 
 
     TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
-    
-    
+
+
     def loadAccountInfo(self, user, req):
         html = req.load("http://www.quickshare.cz/premium", decode=True)
 
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 55017eb30..8a4e14665 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -31,11 +31,10 @@ class UploadedTo(Account):
             if raw_valid == "unlimited":
                 validuntil = -1
             else:
-                raw_valid = re.findall(r"(\d+) (Week|weeks|days|day|hours|hour)", raw_valid)
+                raw_valid = re.findall(r"(\d+) (Week|weeks|day|hour)", raw_valid)
                 validuntil = time()
                 for n, u in raw_valid:
-                    validuntil += int(n) * 60 * 60 * {"Week": 168, "weeks": 168, "days": 24,
-                                                      "day": 24, "hours": 1, "hour": 1}[u]
+                    validuntil += int(n) * 60 * 60 * {"Week": 168, "weeks": 168, "day": 24, "hour": 1}[u]
 
             return {"validuntil": validuntil, "trafficleft": traffic, "maxtraffic": 50 * 1024 * 1024}
         else:
-- 
cgit v1.2.3


From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 16:52:10 +0100
Subject: Code cosmetics: plugin class attributes

---
 module/plugins/accounts/AlldebridCom.py           |  8 ++++----
 module/plugins/accounts/BayfilesCom.py            |  8 ++++----
 module/plugins/accounts/BillionuploadsCom.py      |  8 ++++----
 module/plugins/accounts/BitshareCom.py            |  8 ++++----
 module/plugins/accounts/CatShareNet.py            |  8 ++++----
 module/plugins/accounts/CramitIn.py               |  8 ++++----
 module/plugins/accounts/CzshareCom.py             | 10 +++++-----
 module/plugins/accounts/DebridItaliaCom.py        |  8 ++++----
 module/plugins/accounts/DepositfilesCom.py        | 12 ++++++------
 module/plugins/accounts/EasybytezCom.py           | 10 +++++-----
 module/plugins/accounts/EuroshareEu.py            |  8 ++++----
 module/plugins/accounts/FastixRu.py               |  8 ++++----
 module/plugins/accounts/FastshareCz.py            | 10 +++++-----
 module/plugins/accounts/File4safeCom.py           |  8 ++++----
 module/plugins/accounts/FileParadoxIn.py          |  8 ++++----
 module/plugins/accounts/FilecloudIo.py            | 10 +++++-----
 module/plugins/accounts/FilefactoryCom.py         | 10 +++++-----
 module/plugins/accounts/FilejungleCom.py          |  8 ++++----
 module/plugins/accounts/FileomCom.py              |  8 ++++----
 module/plugins/accounts/FilerNet.py               |  8 ++++----
 module/plugins/accounts/FilerioCom.py             |  8 ++++----
 module/plugins/accounts/FilesMailRu.py            |  8 ++++----
 module/plugins/accounts/FileserveCom.py           |  8 ++++----
 module/plugins/accounts/FourSharedCom.py          | 10 +++++-----
 module/plugins/accounts/FreakshareCom.py          |  8 ++++----
 module/plugins/accounts/FreeWayMe.py              |  8 ++++----
 module/plugins/accounts/FshareVn.py               | 10 +++++-----
 module/plugins/accounts/Ftp.py                    |  8 ++++----
 module/plugins/accounts/HellshareCz.py            |  8 ++++----
 module/plugins/accounts/Http.py                   |  8 ++++----
 module/plugins/accounts/HugefilesNet.py           |  8 ++++----
 module/plugins/accounts/HundredEightyUploadCom.py |  8 ++++----
 module/plugins/accounts/JunocloudMe.py            |  8 ++++----
 module/plugins/accounts/LetitbitNet.py            |  8 ++++----
 module/plugins/accounts/LinestorageCom.py         |  8 ++++----
 module/plugins/accounts/LinksnappyCom.py          |  8 ++++----
 module/plugins/accounts/LomafileCom.py            |  8 ++++----
 module/plugins/accounts/MegaDebridEu.py           |  8 ++++----
 module/plugins/accounts/MegaRapidCz.py            | 10 +++++-----
 module/plugins/accounts/MegasharesCom.py          |  8 ++++----
 module/plugins/accounts/MovReelCom.py             |  8 ++++----
 module/plugins/accounts/MultishareCz.py           |  8 ++++----
 module/plugins/accounts/MyfastfileCom.py          |  8 ++++----
 module/plugins/accounts/NetloadIn.py              | 10 +++++-----
 module/plugins/accounts/NosuploadCom.py           |  8 ++++----
 module/plugins/accounts/NovafileCom.py            |  8 ++++----
 module/plugins/accounts/OboomCom.py               |  8 ++++----
 module/plugins/accounts/OneFichierCom.py          |  8 ++++----
 module/plugins/accounts/OverLoadMe.py             |  8 ++++----
 module/plugins/accounts/PremiumTo.py              | 12 ++++++------
 module/plugins/accounts/PremiumizeMe.py           |  8 ++++----
 module/plugins/accounts/QuickshareCz.py           |  8 ++++----
 module/plugins/accounts/RPNetBiz.py               |  8 ++++----
 module/plugins/accounts/RapidfileshareNet.py      |  8 ++++----
 module/plugins/accounts/RapidgatorNet.py          |  8 ++++----
 module/plugins/accounts/RapidshareCom.py          |  8 ++++----
 module/plugins/accounts/RarefileNet.py            |  8 ++++----
 module/plugins/accounts/RealdebridCom.py          |  8 ++++----
 module/plugins/accounts/RehostTo.py               |  8 ++++----
 module/plugins/accounts/RyushareCom.py            | 10 +++++-----
 module/plugins/accounts/SecureUploadEu.py         |  8 ++++----
 module/plugins/accounts/SendmywayCom.py           |  8 ++++----
 module/plugins/accounts/ShareonlineBiz.py         | 10 +++++-----
 module/plugins/accounts/SimplyPremiumCom.py       |  8 ++++----
 module/plugins/accounts/SimplydebridCom.py        |  8 ++++----
 module/plugins/accounts/StahnuTo.py               |  8 ++++----
 module/plugins/accounts/StreamcloudEu.py          |  8 ++++----
 module/plugins/accounts/TurbobitNet.py            |  8 ++++----
 module/plugins/accounts/TusfilesNet.py            |  8 ++++----
 module/plugins/accounts/UlozTo.py                 | 10 +++++-----
 module/plugins/accounts/UnrestrictLi.py           |  8 ++++----
 module/plugins/accounts/UploadcCom.py             |  8 ++++----
 module/plugins/accounts/UploadedTo.py             |  8 ++++----
 module/plugins/accounts/UploadheroCom.py          |  8 ++++----
 module/plugins/accounts/UploadingCom.py           |  8 ++++----
 module/plugins/accounts/UptoboxCom.py             |  8 ++++----
 module/plugins/accounts/VidPlayNet.py             |  8 ++++----
 module/plugins/accounts/XFileSharingPro.py        |  8 ++++----
 module/plugins/accounts/YibaishiwuCom.py          |  8 ++++----
 module/plugins/accounts/ZeveraCom.py              |  8 ++++----
 80 files changed, 336 insertions(+), 336 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index 842d4c060..344b54e4f 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -12,13 +12,13 @@ from module.plugins.Account import Account
 
 
 class AlldebridCom(Account):
-    __name__ = "AlldebridCom"
-    __type__ = "account"
+    __name__    = "AlldebridCom"
+    __type__    = "account"
     __version__ = "0.22"
 
     __description__ = """AllDebrid.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Andy Voigt", "spamsales@online.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py
index d1cf8ba22..b32003688 100644
--- a/module/plugins/accounts/BayfilesCom.py
+++ b/module/plugins/accounts/BayfilesCom.py
@@ -7,13 +7,13 @@ from module.common.json_layer import json_loads
 
 
 class BayfilesCom(Account):
-    __name__ = "BayfilesCom"
-    __type__ = "account"
+    __name__    = "BayfilesCom"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """Bayfiles.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py
index 3e8fd35c2..51c0c5acf 100644
--- a/module/plugins/accounts/BillionuploadsCom.py
+++ b/module/plugins/accounts/BillionuploadsCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class BillionuploadsCom(XFSPAccount):
-    __name__ = "BillionuploadsCom"
-    __type__ = "account"
+    __name__    = "BillionuploadsCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Billionuploads.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "billionuploads.com"
diff --git a/module/plugins/accounts/BitshareCom.py b/module/plugins/accounts/BitshareCom.py
index 910c81b4a..8da3764ff 100644
--- a/module/plugins/accounts/BitshareCom.py
+++ b/module/plugins/accounts/BitshareCom.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class BitshareCom(Account):
-    __name__ = "BitshareCom"
-    __type__ = "account"
+    __name__    = "BitshareCom"
+    __type__    = "account"
     __version__ = "0.12"
 
     __description__ = """Bitshare account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Paul King", None)]
+    __license__     = "GPLv3"
+    __authors__     = [("Paul King", None)]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/CatShareNet.py b/module/plugins/accounts/CatShareNet.py
index 89c80e2b4..c33219685 100644
--- a/module/plugins/accounts/CatShareNet.py
+++ b/module/plugins/accounts/CatShareNet.py
@@ -8,13 +8,13 @@ from module.plugins.Account import Account
 
 
 class CatShareNet(Account):
-    __name__ = "CatShareNet"
-    __type__ = "account"
+    __name__    = "CatShareNet"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """CatShareNet account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("prOq", None)]
+    __license__     = "GPLv3"
+    __authors__     = [("prOq", None)]
 
 
     PREMIUM_PATTERN = r'class="nav-collapse collapse pull-right">[\s\w<>=-."/:]*\sz.</a></li>\s*<li><a href="/premium">.*\s*<span style="color: red">(.*?)</span>[\s\w<>/]*href="/logout"'
diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py
index 98e14bb3a..a6a0d5338 100644
--- a/module/plugins/accounts/CramitIn.py
+++ b/module/plugins/accounts/CramitIn.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class CramitIn(XFSPAccount):
-    __name__ = "CramitIn"
-    __type__ = "account"
+    __name__    = "CramitIn"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Cramit.in account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_NAME = "cramit.in"
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py
index 153b47073..844ec9999 100644
--- a/module/plugins/accounts/CzshareCom.py
+++ b/module/plugins/accounts/CzshareCom.py
@@ -7,14 +7,14 @@ from module.plugins.Account import Account
 
 
 class CzshareCom(Account):
-    __name__ = "CzshareCom"
-    __type__ = "account"
+    __name__    = "CzshareCom"
+    __type__    = "account"
     __version__ = "0.14"
 
     __description__ = """Czshare.com account plugin, now Sdilej.cz"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
index 750e1ecec..f5a536004 100644
--- a/module/plugins/accounts/DebridItaliaCom.py
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class DebridItaliaCom(Account):
-    __name__ = "DebridItaliaCom"
-    __type__ = "account"
+    __name__    = "DebridItaliaCom"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Debriditalia.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     WALID_UNTIL_PATTERN = r'Premium valid till: (?P<D>[^|]+) \|'
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index 80e6c8862..cb4396d02 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -8,15 +8,15 @@ from module.plugins.Account import Account
 
 
 class DepositfilesCom(Account):
-    __name__ = "DepositfilesCom"
-    __type__ = "account"
+    __name__    = "DepositfilesCom"
+    __type__    = "account"
     __version__ = "0.3"
 
     __description__ = """Depositfiles.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de"),
-                   ("stickell", "l.stickell@yahoo.it"),
-                   ("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de"),
+                       ("stickell", "l.stickell@yahoo.it"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 74602b696..6dd16e012 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -8,14 +8,14 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class EasybytezCom(XFSPAccount):
-    __name__ = "EasybytezCom"
-    __type__ = "account"
+    __name__    = "EasybytezCom"
+    __type__    = "account"
     __version__ = "0.08"
 
     __description__ = """EasyBytez.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("guidobelix", "guidobelix@hotmail.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_NAME = "easybytez.com"
diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index e08cc7e45..c75f8ee33 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class EuroshareEu(Account):
-    __name__ = "EuroshareEu"
-    __type__ = "account"
+    __name__    = "EuroshareEu"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Euroshare.eu account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FastixRu.py b/module/plugins/accounts/FastixRu.py
index 8ced61f15..049ee9f77 100644
--- a/module/plugins/accounts/FastixRu.py
+++ b/module/plugins/accounts/FastixRu.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class FastixRu(Account):
-    __name__ = "FastixRu"
-    __type__ = "account"
+    __name__    = "FastixRu"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Fastix account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __license__     = "GPLv3"
+    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index 7838d9bab..247838c23 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -5,14 +5,14 @@ from module.plugins.Account import Account
 
 
 class FastshareCz(Account):
-    __name__ = "FastshareCz"
-    __type__ = "account"
+    __name__    = "FastshareCz"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """Fastshare.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\w.]+)&nbsp;'
diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py
index a301f70bc..4ddd84e24 100644
--- a/module/plugins/accounts/File4safeCom.py
+++ b/module/plugins/accounts/File4safeCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class File4safeCom(XFSPAccount):
-    __name__ = "File4safeCom"
-    __type__ = "account"
+    __name__    = "File4safeCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """File4safe.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     HOSTER_NAME = "file4safe.com"
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
index 6d55f254e..2d306e251 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class FileParadoxIn(XFSPAccount):
-    __name__ = "FileParadoxIn"
-    __type__ = "account"
+    __name__    = "FileParadoxIn"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """FileParadox.in account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "fileparadox.in"
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index c889c9644..c001d4513 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -5,14 +5,14 @@ from module.common.json_layer import json_loads
 
 
 class FilecloudIo(Account):
-    __name__ = "FilecloudIo"
-    __type__ = "account"
+    __name__    = "FilecloudIo"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """FilecloudIo account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FilefactoryCom.py b/module/plugins/accounts/FilefactoryCom.py
index 899c4a604..a61db30c8 100644
--- a/module/plugins/accounts/FilefactoryCom.py
+++ b/module/plugins/accounts/FilefactoryCom.py
@@ -9,14 +9,14 @@ from module.plugins.Account import Account
 
 
 class FilefactoryCom(Account):
-    __name__ = "FilefactoryCom"
-    __type__ = "account"
+    __name__    = "FilefactoryCom"
+    __type__    = "account"
     __version__ = "0.14"
 
     __description__ = """Filefactory.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     VALID_UNTIL_PATTERN = r'Premium valid until: <strong>(?P<d>\d{1,2})\w{1,2} (?P<m>\w{3}), (?P<y>\d{4})</strong>'
diff --git a/module/plugins/accounts/FilejungleCom.py b/module/plugins/accounts/FilejungleCom.py
index 9cf380067..a3ec7af64 100644
--- a/module/plugins/accounts/FilejungleCom.py
+++ b/module/plugins/accounts/FilejungleCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class FilejungleCom(Account):
-    __name__ = "FilejungleCom"
-    __type__ = "account"
+    __name__    = "FilejungleCom"
+    __type__    = "account"
     __version__ = "0.11"
 
     __description__ = """Filejungle.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = 60
diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
index 565acf6ab..32530449d 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/module/plugins/accounts/FileomCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class FileomCom(XFSPAccount):
-    __name__ = "FileomCom"
-    __type__ = "account"
+    __name__    = "FileomCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Fileom.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "fileom.com"
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py
index f7720adcc..cb913a27e 100644
--- a/module/plugins/accounts/FilerNet.py
+++ b/module/plugins/accounts/FilerNet.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class FilerNet(Account):
-    __name__ = "FilerNet"
-    __type__ = "account"
+    __name__    = "FilerNet"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Filer.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py
index d50b70a57..e7c971bd6 100644
--- a/module/plugins/accounts/FilerioCom.py
+++ b/module/plugins/accounts/FilerioCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class FilerioCom(XFSPAccount):
-    __name__ = "FilerioCom"
-    __type__ = "account"
+    __name__    = "FilerioCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """FileRio.in account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_NAME = "filerio.in"
diff --git a/module/plugins/accounts/FilesMailRu.py b/module/plugins/accounts/FilesMailRu.py
index 25343670a..365fa86dc 100644
--- a/module/plugins/accounts/FilesMailRu.py
+++ b/module/plugins/accounts/FilesMailRu.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class FilesMailRu(Account):
-    __name__ = "FilesMailRu"
-    __type__ = "account"
+    __name__    = "FilesMailRu"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Filesmail.ru account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index f82ecfb54..411ba85b1 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -7,13 +7,13 @@ from module.common.json_layer import json_loads
 
 
 class FileserveCom(Account):
-    __name__ = "FileserveCom"
-    __type__ = "account"
+    __name__    = "FileserveCom"
+    __type__    = "account"
     __version__ = "0.2"
 
     __description__ = """Fileserve.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index 21aff591b..fe25ccc0e 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -5,14 +5,14 @@ from module.plugins.Account import Account
 
 
 class FourSharedCom(Account):
-    __name__ = "FourSharedCom"
-    __type__ = "account"
+    __name__    = "FourSharedCom"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """FourShared.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index c03e2b047..84ebf6751 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class FreakshareCom(Account):
-    __name__ = "FreakshareCom"
-    __type__ = "account"
+    __name__    = "FreakshareCom"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Freakshare.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index 797748c93..cfba1ba06 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class FreeWayMe(Account):
-    __name__ = "FreeWayMe"
-    __type__ = "account"
+    __name__    = "FreeWayMe"
+    __type__    = "account"
     __version__ = "0.11"
 
     __description__ = """FreeWayMe account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Nicolas Giese", "james@free-way.me")]
+    __license__     = "GPLv3"
+    __authors__     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py
index 9e513d6f6..d1b05209c 100644
--- a/module/plugins/accounts/FshareVn.py
+++ b/module/plugins/accounts/FshareVn.py
@@ -8,14 +8,14 @@ from module.plugins.Account import Account
 
 
 class FshareVn(Account):
-    __name__ = "FshareVn"
-    __type__ = "account"
+    __name__    = "FshareVn"
+    __type__    = "account"
     __version__ = "0.07"
 
     __description__ = """Fshare.vn account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     VALID_UNTIL_PATTERN = ur'<dt>Thời hạn dùng:</dt>\s*<dd>([^<]+)</dd>'
diff --git a/module/plugins/accounts/Ftp.py b/module/plugins/accounts/Ftp.py
index 422573a4a..f978d2fa0 100644
--- a/module/plugins/accounts/Ftp.py
+++ b/module/plugins/accounts/Ftp.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class Ftp(Account):
-    __name__ = "Ftp"
-    __type__ = "account"
+    __name__    = "Ftp"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Ftp dummy account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     info_threshold = 1000000
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index cbe6b9654..f0692ca5c 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class HellshareCz(Account):
-    __name__ = "HellshareCz"
-    __type__ = "account"
+    __name__    = "HellshareCz"
+    __type__    = "account"
     __version__ = "0.14"
 
     __description__ = """Hellshare.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
diff --git a/module/plugins/accounts/Http.py b/module/plugins/accounts/Http.py
index c3170ae85..07e46eb07 100644
--- a/module/plugins/accounts/Http.py
+++ b/module/plugins/accounts/Http.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class Http(Account):
-    __name__ = "Http"
-    __type__ = "account"
+    __name__    = "Http"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Http dummy account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     info_threshold = 1000000
diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
index 11e0beab9..c13022b1e 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class HugefilesNet(XFSPAccount):
-    __name__ = "HugefilesNet"
-    __type__ = "account"
+    __name__    = "HugefilesNet"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Hugefiles.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "hugefiles.net"
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
index 3bee13ef9..183cf8093 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class HundredEightyUploadCom(XFSPAccount):
-    __name__ = "HundredEightyUploadCom"
-    __type__ = "account"
+    __name__    = "HundredEightyUploadCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """180upload.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "180upload.com"
diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py
index 4fae6c510..5a022d03f 100644
--- a/module/plugins/accounts/JunocloudMe.py
+++ b/module/plugins/accounts/JunocloudMe.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class JunocloudMe(XFSPAccount):
-    __name__ = "JunocloudMe"
-    __type__ = "account"
+    __name__    = "JunocloudMe"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Junocloud.me account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_NAME = "junocloud.me"
diff --git a/module/plugins/accounts/LetitbitNet.py b/module/plugins/accounts/LetitbitNet.py
index 3ca9e44da..b8244a06d 100644
--- a/module/plugins/accounts/LetitbitNet.py
+++ b/module/plugins/accounts/LetitbitNet.py
@@ -5,13 +5,13 @@ from module.plugins.Account import Account
 
 
 class LetitbitNet(Account):
-    __name__ = "LetitbitNet"
-    __type__ = "account"
+    __name__    = "LetitbitNet"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Letitbit.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py
index 656248e88..ea89c7085 100644
--- a/module/plugins/accounts/LinestorageCom.py
+++ b/module/plugins/accounts/LinestorageCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class LinestorageCom(XFSPAccount):
-    __name__ = "LinestorageCom"
-    __type__ = "account"
+    __name__    = "LinestorageCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Linestorage.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "linestorage.com"
diff --git a/module/plugins/accounts/LinksnappyCom.py b/module/plugins/accounts/LinksnappyCom.py
index adcae001c..9fcdac9c7 100644
--- a/module/plugins/accounts/LinksnappyCom.py
+++ b/module/plugins/accounts/LinksnappyCom.py
@@ -7,13 +7,13 @@ from module.common.json_layer import json_loads
 
 
 class LinksnappyCom(Account):
-    __name__ = "LinksnappyCom"
-    __type__ = "account"
+    __name__    = "LinksnappyCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Linksnappy.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py
index f9b99eb3a..a97ccefc6 100644
--- a/module/plugins/accounts/LomafileCom.py
+++ b/module/plugins/accounts/LomafileCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class LomafileCom(XFSPAccount):
-    __name__ = "LomafileCom"
-    __type__ = "account"
+    __name__    = "LomafileCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Lomafile.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_NAME = "lomafile.com"
diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py
index d88be835b..b1b3368a6 100644
--- a/module/plugins/accounts/MegaDebridEu.py
+++ b/module/plugins/accounts/MegaDebridEu.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class MegaDebridEu(Account):
-    __name__ = "MegaDebridEu"
-    __type__ = "account"
+    __name__    = "MegaDebridEu"
+    __type__    = "account"
     __version__ = "0.2"
 
     __description__ = """mega-debrid.eu account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __license__     = "GPLv3"
+    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     # Define the base URL of MegaDebrid api
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index c458210f8..83b1bf86b 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -7,14 +7,14 @@ from module.plugins.Account import Account
 
 
 class MegaRapidCz(Account):
-    __name__ = "MegaRapidCz"
-    __type__ = "account"
+    __name__    = "MegaRapidCz"
+    __type__    = "account"
     __version__ = "0.34"
 
     __description__ = """MegaRapid.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("MikyWoW", "mikywow@seznam.cz"),
-                   ("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("MikyWoW", "mikywow@seznam.cz"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = 60
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index 5ac22222c..6e0a4358e 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class MegasharesCom(Account):
-    __name__ = "MegasharesCom"
-    __type__ = "account"
+    __name__    = "MegasharesCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Megashares.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py
index 764dc2c66..11fa01300 100644
--- a/module/plugins/accounts/MovReelCom.py
+++ b/module/plugins/accounts/MovReelCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class MovReelCom(XFSPAccount):
-    __name__ = "MovReelCom"
-    __type__ = "account"
+    __name__    = "MovReelCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Movreel.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __license__     = "GPLv3"
+    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
     login_timeout = 60
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 38bb11ea1..9eb0b50b2 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class MultishareCz(Account):
-    __name__ = "MultishareCz"
-    __type__ = "account"
+    __name__    = "MultishareCz"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """Multishare.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
diff --git a/module/plugins/accounts/MyfastfileCom.py b/module/plugins/accounts/MyfastfileCom.py
index 2d60cf939..65bb33854 100644
--- a/module/plugins/accounts/MyfastfileCom.py
+++ b/module/plugins/accounts/MyfastfileCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class MyfastfileCom(Account):
-    __name__ = "MyfastfileCom"
-    __type__ = "account"
+    __name__    = "MyfastfileCom"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Myfastfile.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/NetloadIn.py b/module/plugins/accounts/NetloadIn.py
index f5bac0368..be0b8632c 100755
--- a/module/plugins/accounts/NetloadIn.py
+++ b/module/plugins/accounts/NetloadIn.py
@@ -7,14 +7,14 @@ from module.plugins.Account import Account
 
 
 class NetloadIn(Account):
-    __name__ = "NetloadIn"
-    __type__ = "account"
+    __name__    = "NetloadIn"
+    __type__    = "account"
     __version__ = "0.22"
 
     __description__ = """Netload.in account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
-                   ("CryNickSystems", "webmaster@pcProfil.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("CryNickSystems", "webmaster@pcProfil.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
index f8561d25f..2b3b9e381 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class NosuploadCom(XFSPAccount):
-    __name__ = "NosuploadCom"
-    __type__ = "account"
+    __name__    = "NosuploadCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Nosupload.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "nosupload.com"
diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
index 5b85445e7..56179dfc6 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/module/plugins/accounts/NovafileCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class NovafileCom(XFSPAccount):
-    __name__ = "NovafileCom"
-    __type__ = "account"
+    __name__    = "NovafileCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Novafile.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "novafile.com"
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index cf9329e1f..067edc92a 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -9,13 +9,13 @@ from module.plugins.Account import Account
 
 
 class OboomCom(Account):
-    __name__ = "OboomCom"
-    __type__ = "account"
+    __name__    = "OboomCom"
+    __type__    = "account"
     __version__ = "0.2"
 
     __description__ = """Oboom.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stanley", "stanley.foerster@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("stanley", "stanley.foerster@gmail.com")]
 
 
     def loadAccountData(self, user, req):
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index 71fa550b6..a95e4df34 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -8,13 +8,13 @@ from module.plugins.Account import Account
 
 
 class OneFichierCom(Account):
-    __name__ = "OneFichierCom"
-    __type__ = "account"
+    __name__    = "OneFichierCom"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """1fichier.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")]
 
 
     VALID_UNTIL_PATTERN = r'You are a premium user until (?P<d>\d{2})/(?P<m>\d{2})/(?P<y>\d{4})'
diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index c85feec59..7df4c9aef 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class OverLoadMe(Account):
-    __name__ = "OverLoadMe"
-    __type__ = "account"
+    __name__    = "OverLoadMe"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Over-Load.me account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("marley", "marley@over-load.me")]
+    __license__     = "GPLv3"
+    __authors__     = [("marley", "marley@over-load.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/PremiumTo.py b/module/plugins/accounts/PremiumTo.py
index 7875e5021..fed95d4ce 100644
--- a/module/plugins/accounts/PremiumTo.py
+++ b/module/plugins/accounts/PremiumTo.py
@@ -4,15 +4,15 @@ from module.plugins.Account import Account
 
 
 class PremiumTo(Account):
-    __name__ = "PremiumTo"
-    __type__ = "account"
+    __name__    = "PremiumTo"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """Premium.to account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
-                   ("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index 4a789bfdf..951c340e1 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -6,13 +6,13 @@ from module.common.json_layer import json_loads
 
 
 class PremiumizeMe(Account):
-    __name__ = "PremiumizeMe"
-    __type__ = "account"
+    __name__    = "PremiumizeMe"
+    __type__    = "account"
     __version__ = "0.11"
 
     __description__ = """Premiumize.me account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/QuickshareCz.py b/module/plugins/accounts/QuickshareCz.py
index e01058644..18af5f736 100644
--- a/module/plugins/accounts/QuickshareCz.py
+++ b/module/plugins/accounts/QuickshareCz.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class QuickshareCz(Account):
-    __name__ = "QuickshareCz"
-    __type__ = "account"
+    __name__    = "QuickshareCz"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """Quickshare.cz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index 59349bd7a..35ad58d2d 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class RPNetBiz(Account):
-    __name__ = "RPNetBiz"
-    __type__ = "account"
+    __name__    = "RPNetBiz"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """RPNet.biz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Dman", "dmanugm@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Dman", "dmanugm@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 5ca05fd91..665ae5431 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class RapidfileshareNet(XFSPAccount):
-    __name__ = "RapidfileshareNet"
-    __type__ = "account"
+    __name__    = "RapidfileshareNet"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """Rapidfileshare.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_NAME = "rapidfileshare.net"
diff --git a/module/plugins/accounts/RapidgatorNet.py b/module/plugins/accounts/RapidgatorNet.py
index c6833a0f3..9a0edbfa4 100644
--- a/module/plugins/accounts/RapidgatorNet.py
+++ b/module/plugins/accounts/RapidgatorNet.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class RapidgatorNet(Account):
-    __name__ = "RapidgatorNet"
-    __type__ = "account"
+    __name__    = "RapidgatorNet"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """Rapidgator.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     API_URL = 'http://rapidgator.net/api/user'
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index 864873d5d..c14a56f7d 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class RapidshareCom(Account):
-    __name__ = "RapidshareCom"
-    __type__ = "account"
+    __name__    = "RapidshareCom"
+    __type__    = "account"
     __version__ = "0.22"
 
     __description__ = """Rapidshare.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py
index 0bb1920de..9defc7cb7 100644
--- a/module/plugins/accounts/RarefileNet.py
+++ b/module/plugins/accounts/RarefileNet.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class RarefileNet(XFSPAccount):
-    __name__ = "RarefileNet"
-    __type__ = "account"
+    __name__    = "RarefileNet"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """RareFile.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_NAME = "rarefile.net"
diff --git a/module/plugins/accounts/RealdebridCom.py b/module/plugins/accounts/RealdebridCom.py
index 4c3c3bc2b..eeba34665 100644
--- a/module/plugins/accounts/RealdebridCom.py
+++ b/module/plugins/accounts/RealdebridCom.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class RealdebridCom(Account):
-    __name__ = "RealdebridCom"
-    __type__ = "account"
+    __name__    = "RealdebridCom"
+    __type__    = "account"
     __version__ = "0.43"
 
     __description__ = """Real-Debrid.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index e9d9bd243..8046f84c0 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -4,13 +4,13 @@ from module.plugins.Account import Account
 
 
 class RehostTo(Account):
-    __name__ = "RehostTo"
-    __type__ = "account"
+    __name__    = "RehostTo"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Rehost.to account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index 8eec508a3..071f7348d 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -4,14 +4,14 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class RyushareCom(XFSPAccount):
-    __name__ = "RyushareCom"
-    __type__ = "account"
+    __name__    = "RyushareCom"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """Ryushare.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("trance4us", None)]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("trance4us", None)]
 
 
     HOSTER_NAME = "ryushare.com"
diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
index a7d86523c..1bf0106fa 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class SecureUploadEu(XFSPAccount):
-    __name__ = "SecureUploadEu"
-    __type__ = "account"
+    __name__    = "SecureUploadEu"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """SecureUpload.eu account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "secureupload.eu"
diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
index 674f5b183..1ccfc7734 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class SendmywayCom(XFSPAccount):
-    __name__ = "SendmywayCom"
-    __type__ = "account"
+    __name__    = "SendmywayCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Sendmyway.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "sendmyway.com"
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index c00e4769d..b0833f7af 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -4,14 +4,14 @@ from module.plugins.Account import Account
 
 
 class ShareonlineBiz(Account):
-    __name__ = "ShareonlineBiz"
-    __type__ = "account"
+    __name__    = "ShareonlineBiz"
+    __type__    = "account"
     __version__ = "0.24"
 
     __description__ = """Share-online.biz account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de"),
-                   ("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def getUserAPI(self, user, req):
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index 2fe41abef..979ce73aa 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -5,13 +5,13 @@ from module.plugins.Account import Account
 
 
 class SimplyPremiumCom(Account):
-    __name__ = "SimplyPremiumCom"
-    __type__ = "account"
+    __name__    = "SimplyPremiumCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Simply-Premium.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("EvolutionClip", "evolutionclip@live.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index b986985e1..784a90ae3 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class SimplydebridCom(Account):
-    __name__ = "SimplydebridCom"
-    __type__ = "account"
+    __name__    = "SimplydebridCom"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Simply-Debrid.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __license__     = "GPLv3"
+    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/StahnuTo.py b/module/plugins/accounts/StahnuTo.py
index b254e0fac..44884f835 100644
--- a/module/plugins/accounts/StahnuTo.py
+++ b/module/plugins/accounts/StahnuTo.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class StahnuTo(Account):
-    __name__ = "StahnuTo"
-    __type__ = "account"
+    __name__    = "StahnuTo"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """StahnuTo account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
index 6cdb5efe0..b90a7d29f 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class StreamcloudEu(XFSPAccount):
-    __name__ = "StreamcloudEu"
-    __type__ = "account"
+    __name__    = "StreamcloudEu"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Streamcloud.eu account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "streamcloud.eu"
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 7dfea7c3a..f87d234a7 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class TurbobitNet(Account):
-    __name__ = "TurbobitNet"
-    __type__ = "account"
+    __name__    = "TurbobitNet"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """TurbobitNet account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index d52169fae..8f41930a5 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -8,13 +8,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class TusfilesNet(XFSPAccount):
-    __name__ = "TusfilesNet"
-    __type__ = "account"
+    __name__    = "TusfilesNet"
+    __type__    = "account"
     __version__ = "0.05"
 
     __description__ = """ Tusfile.net account plugin """
-    __license__ = "GPLv3"
-    __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_NAME = "tusfiles.net"
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index dc51b7a80..178d9a47d 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -6,14 +6,14 @@ from module.plugins.Account import Account
 
 
 class UlozTo(Account):
-    __name__ = "UlozTo"
-    __type__ = "account"
+    __name__    = "UlozTo"
+    __type__    = "account"
     __version__ = "0.06"
 
     __description__ = """Uloz.to account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("pulpe", None)]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("pulpe", None)]
 
 
     TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([\d.]+) MB"'
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index 27abb3f51..e43d6bbd7 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -5,13 +5,13 @@ from module.common.json_layer import json_loads
 
 
 class UnrestrictLi(Account):
-    __name__ = "UnrestrictLi"
-    __type__ = "account"
+    __name__    = "UnrestrictLi"
+    __type__    = "account"
     __version__ = "0.03"
 
     __description__ = """Unrestrict.li account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py
index 58ca6c985..d31b44e6b 100644
--- a/module/plugins/accounts/UploadcCom.py
+++ b/module/plugins/accounts/UploadcCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class UploadcCom(XFSPAccount):
-    __name__ = "UploadcCom"
-    __type__ = "account"
+    __name__    = "UploadcCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """Uploadc.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "uploadc.com"
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 8a4e14665..719f0c0e4 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class UploadedTo(Account):
-    __name__ = "UploadedTo"
-    __type__ = "account"
+    __name__    = "UploadedTo"
+    __type__    = "account"
     __version__ = "0.26"
 
     __description__ = """Uploaded.to account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/UploadheroCom.py b/module/plugins/accounts/UploadheroCom.py
index 771940dbd..be1dfe981 100644
--- a/module/plugins/accounts/UploadheroCom.py
+++ b/module/plugins/accounts/UploadheroCom.py
@@ -8,13 +8,13 @@ from module.plugins.Account import Account
 
 
 class UploadheroCom(Account):
-    __name__ = "UploadheroCom"
-    __type__ = "account"
+    __name__    = "UploadheroCom"
+    __type__    = "account"
     __version__ = "0.2"
 
     __description__ = """Uploadhero.co account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mcmyst", "mcmyst@hotmail.fr")]
+    __license__     = "GPLv3"
+    __authors__     = [("mcmyst", "mcmyst@hotmail.fr")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index 5ade435d4..77229ef8d 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -7,13 +7,13 @@ from module.plugins.Account import Account
 
 
 class UploadingCom(Account):
-    __name__ = "UploadingCom"
-    __type__ = "account"
+    __name__    = "UploadingCom"
+    __type__    = "account"
     __version__ = "0.1"
 
     __description__ = """Uploading.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("mkaay", "mkaay@mkaay.de")]
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index 0fda7cd5e..894169555 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class UptoboxCom(XFSPAccount):
-    __name__ = "UptoboxCom"
-    __type__ = "account"
+    __name__    = "UptoboxCom"
+    __type__    = "account"
     __version__ = "0.04"
 
     __description__ = """DDLStorage.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_NAME = "uptobox.com"
diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
index 286adfc13..b182c8589 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -4,13 +4,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class VidPlayNet(XFSPAccount):
-    __name__ = "VidPlayNet"
-    __type__ = "account"
+    __name__    = "VidPlayNet"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """VidPlay.net account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = "vidplay.net"
diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index fba774b21..17f46e102 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -6,13 +6,13 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class XFileSharingPro(XFSPAccount):
-    __name__ = "XFileSharingPro"
-    __type__ = "account"
+    __name__    = "XFileSharingPro"
+    __type__    = "account"
     __version__ = "0.02"
 
     __description__ = """XFileSharingPro multi-purpose account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_NAME = None
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index 81880f575..92a6bfedf 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class YibaishiwuCom(Account):
-    __name__ = "YibaishiwuCom"
-    __type__ = "account"
+    __name__    = "YibaishiwuCom"
+    __type__    = "account"
     __version__ = "0.01"
 
     __description__ = """115.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 8ee8610ba..01f9ef692 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -6,13 +6,13 @@ from module.plugins.Account import Account
 
 
 class ZeveraCom(Account):
-    __name__ = "ZeveraCom"
-    __type__ = "account"
+    __name__    = "ZeveraCom"
+    __type__    = "account"
     __version__ = "0.21"
 
     __description__ = """Zevera.com account plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
-- 
cgit v1.2.3


From 40da8e6d30e25faa8a5d48780b56c7bf305d57eb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 21:53:13 +0100
Subject: [UptoboxCom] Try to fix premium account recognition

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index 894169555..7bec088bd 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class UptoboxCom(XFSPAccount):
     __name__    = "UptoboxCom"
     __type__    = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """DDLStorage.com account plugin"""
     __license__     = "GPLv3"
@@ -14,3 +14,5 @@ class UptoboxCom(XFSPAccount):
 
 
     HOSTER_NAME = "uptobox.com"
+
+    PREMIUM_PATTERN = r'class="premium_time"'
-- 
cgit v1.2.3


From 8f2d17cb3c16c21da01315599864bdde20595bee Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 21:54:07 +0100
Subject: [EasybytezCom] Remove unnecessary loadAccountInfo method

---
 module/plugins/accounts/EasybytezCom.py | 35 ---------------------------------
 1 file changed, 35 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 6dd16e012..d9d453b85 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -19,38 +19,3 @@ class EasybytezCom(XFSPAccount):
 
 
     HOSTER_NAME = "easybytez.com"
-
-
-    def loadAccountInfo(self, user, req):
-        html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
-
-        validuntil = None
-        trafficleft = None
-        premium = False
-
-        m = re.search(self.VALID_UNTIL_PATTERN, html)
-        if m:
-            expiredate = m.group(1)
-            self.logDebug("Expire date: " + expiredate)
-
-            try:
-                validuntil = mktime(strptime(expiredate, "%d %B %Y"))
-            except Exception, e:
-                self.logError(e)
-
-            if validuntil > mktime(gmtime()):
-                premium = True
-                trafficleft = -1
-            else:
-                premium = False
-                validuntil = -1
-
-        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
-        if m:
-            trafficleft = m.group(1)
-            if "Unlimited" in trafficleft:
-                trafficleft = -1
-            else:
-                trafficleft = self.parseTraffic(trafficleft)
-
-        return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
-- 
cgit v1.2.3


From 227a0eb5157875e75a385118ec3485b044ccdb8a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 21:55:21 +0100
Subject: Improve loadAccountInfo stuff

---
 module/plugins/accounts/EasybytezCom.py    | 2 +-
 module/plugins/accounts/XFileSharingPro.py | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index d9d453b85..55d413e04 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class EasybytezCom(XFSPAccount):
     __name__    = "EasybytezCom"
     __type__    = "account"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """EasyBytez.com account plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index 17f46e102..16d1ccfda 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
 class XFileSharingPro(XFSPAccount):
     __name__    = "XFileSharingPro"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__     = "GPLv3"
@@ -19,10 +19,7 @@ class XFileSharingPro(XFSPAccount):
 
 
     def loadAccountInfo(self, user, req):
-        if self.HOSTER_NAME:
-            return super(XFileSharingPro, self).loadAccountInfo(user, req)
-        else:
-            return {'validuntil': None, 'trafficleft': None, 'premium': None}
+        return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req)
 
 
     def login(self, user, data, req):
-- 
cgit v1.2.3


From bdb8d48e0030474a616ec2e7e6d5f19132bb18e7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 30 Oct 2014 17:12:50 +0100
Subject: [XFileSharingPro] Fix account init

---
 module/plugins/accounts/XFileSharingPro.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index 16d1ccfda..c6baad4f8 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from module.plugins.internal.XFSPAccount import XFSPAccount
 
 
 class XFileSharingPro(XFSPAccount):
     __name__    = "XFileSharingPro"
     __type__    = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__     = "GPLv3"
@@ -18,6 +16,11 @@ class XFileSharingPro(XFSPAccount):
     HOSTER_NAME = None
 
 
+    def init(self):
+        if self.HOSTER_NAME:
+            return super(XFileSharingPro, self).init()
+
+
     def loadAccountInfo(self, user, req):
         return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req)
 
-- 
cgit v1.2.3


From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 2 Nov 2014 22:47:07 +0100
Subject: Update all other plugins

---
 module/plugins/accounts/BillionuploadsCom.py      |  8 ++++----
 module/plugins/accounts/CramitIn.py               |  8 ++++----
 module/plugins/accounts/EasybytezCom.py           |  8 ++++----
 module/plugins/accounts/File4safeCom.py           |  8 ++++----
 module/plugins/accounts/FileParadoxIn.py          |  8 ++++----
 module/plugins/accounts/FileomCom.py              |  8 ++++----
 module/plugins/accounts/FilerioCom.py             |  8 ++++----
 module/plugins/accounts/HugefilesNet.py           |  8 ++++----
 module/plugins/accounts/HundredEightyUploadCom.py |  8 ++++----
 module/plugins/accounts/JunocloudMe.py            |  8 ++++----
 module/plugins/accounts/LinestorageCom.py         |  8 ++++----
 module/plugins/accounts/LomafileCom.py            |  8 ++++----
 module/plugins/accounts/MovReelCom.py             |  8 ++++----
 module/plugins/accounts/NosuploadCom.py           |  8 ++++----
 module/plugins/accounts/NovafileCom.py            |  8 ++++----
 module/plugins/accounts/RapidfileshareNet.py      |  8 ++++----
 module/plugins/accounts/RarefileNet.py            |  8 ++++----
 module/plugins/accounts/RyushareCom.py            |  8 ++++----
 module/plugins/accounts/SecureUploadEu.py         |  8 ++++----
 module/plugins/accounts/SendmywayCom.py           |  8 ++++----
 module/plugins/accounts/StreamcloudEu.py          |  8 ++++----
 module/plugins/accounts/TusfilesNet.py            |  8 ++++----
 module/plugins/accounts/UploadcCom.py             |  8 ++++----
 module/plugins/accounts/UptoboxCom.py             | 10 ++++------
 module/plugins/accounts/VidPlayNet.py             |  8 ++++----
 module/plugins/accounts/XFileSharingPro.py        | 14 +++++++-------
 26 files changed, 107 insertions(+), 109 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/BillionuploadsCom.py b/module/plugins/accounts/BillionuploadsCom.py
index 51c0c5acf..11af36591 100644
--- a/module/plugins/accounts/BillionuploadsCom.py
+++ b/module/plugins/accounts/BillionuploadsCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class BillionuploadsCom(XFSPAccount):
+class BillionuploadsCom(XFSAccount):
     __name__    = "BillionuploadsCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Billionuploads.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "billionuploads.com"
+    HOSTER_DOMAIN = "billionuploads.com"
diff --git a/module/plugins/accounts/CramitIn.py b/module/plugins/accounts/CramitIn.py
index a6a0d5338..a9e2274a2 100644
--- a/module/plugins/accounts/CramitIn.py
+++ b/module/plugins/accounts/CramitIn.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class CramitIn(XFSPAccount):
+class CramitIn(XFSAccount):
     __name__    = "CramitIn"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """Cramit.in account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_NAME = "cramit.in"
+    HOSTER_DOMAIN = "cramit.in"
diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
index 55d413e04..87f1df6dd 100644
--- a/module/plugins/accounts/EasybytezCom.py
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -4,13 +4,13 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class EasybytezCom(XFSPAccount):
+class EasybytezCom(XFSAccount):
     __name__    = "EasybytezCom"
     __type__    = "account"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __description__ = """EasyBytez.com account plugin"""
     __license__     = "GPLv3"
@@ -18,4 +18,4 @@ class EasybytezCom(XFSPAccount):
                        ("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "easybytez.com"
+    HOSTER_DOMAIN = "easybytez.com"
diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py
index 4ddd84e24..76446f791 100644
--- a/module/plugins/accounts/File4safeCom.py
+++ b/module/plugins/accounts/File4safeCom.py
@@ -1,19 +1,19 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class File4safeCom(XFSPAccount):
+class File4safeCom(XFSAccount):
     __name__    = "File4safeCom"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """File4safe.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    HOSTER_NAME = "file4safe.com"
+    HOSTER_DOMAIN = "file4safe.com"
 
     LOGIN_FAIL_PATTERN = r'input_login'
     PREMIUM_PATTERN = r'Extend Premium'
diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
index 2d306e251..c12d99d6a 100644
--- a/module/plugins/accounts/FileParadoxIn.py
+++ b/module/plugins/accounts/FileParadoxIn.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class FileParadoxIn(XFSPAccount):
+class FileParadoxIn(XFSAccount):
     __name__    = "FileParadoxIn"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """FileParadox.in account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "fileparadox.in"
+    HOSTER_DOMAIN = "fileparadox.in"
diff --git a/module/plugins/accounts/FileomCom.py b/module/plugins/accounts/FileomCom.py
index 32530449d..7c743f56a 100644
--- a/module/plugins/accounts/FileomCom.py
+++ b/module/plugins/accounts/FileomCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class FileomCom(XFSPAccount):
+class FileomCom(XFSAccount):
     __name__    = "FileomCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Fileom.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "fileom.com"
+    HOSTER_DOMAIN = "fileom.com"
diff --git a/module/plugins/accounts/FilerioCom.py b/module/plugins/accounts/FilerioCom.py
index e7c971bd6..4c6755293 100644
--- a/module/plugins/accounts/FilerioCom.py
+++ b/module/plugins/accounts/FilerioCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class FilerioCom(XFSPAccount):
+class FilerioCom(XFSAccount):
     __name__    = "FilerioCom"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """FileRio.in account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_NAME = "filerio.in"
+    HOSTER_DOMAIN = "filerio.in"
diff --git a/module/plugins/accounts/HugefilesNet.py b/module/plugins/accounts/HugefilesNet.py
index c13022b1e..5da3bbc37 100644
--- a/module/plugins/accounts/HugefilesNet.py
+++ b/module/plugins/accounts/HugefilesNet.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class HugefilesNet(XFSPAccount):
+class HugefilesNet(XFSAccount):
     __name__    = "HugefilesNet"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Hugefiles.net account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "hugefiles.net"
+    HOSTER_DOMAIN = "hugefiles.net"
diff --git a/module/plugins/accounts/HundredEightyUploadCom.py b/module/plugins/accounts/HundredEightyUploadCom.py
index 183cf8093..39f91a8af 100644
--- a/module/plugins/accounts/HundredEightyUploadCom.py
+++ b/module/plugins/accounts/HundredEightyUploadCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class HundredEightyUploadCom(XFSPAccount):
+class HundredEightyUploadCom(XFSAccount):
     __name__    = "HundredEightyUploadCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """180upload.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "180upload.com"
+    HOSTER_DOMAIN = "180upload.com"
diff --git a/module/plugins/accounts/JunocloudMe.py b/module/plugins/accounts/JunocloudMe.py
index 5a022d03f..b0fc160f3 100644
--- a/module/plugins/accounts/JunocloudMe.py
+++ b/module/plugins/accounts/JunocloudMe.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class JunocloudMe(XFSPAccount):
+class JunocloudMe(XFSAccount):
     __name__    = "JunocloudMe"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Junocloud.me account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "junocloud.me"
+    HOSTER_DOMAIN = "junocloud.me"
diff --git a/module/plugins/accounts/LinestorageCom.py b/module/plugins/accounts/LinestorageCom.py
index ea89c7085..cf8dd3f3e 100644
--- a/module/plugins/accounts/LinestorageCom.py
+++ b/module/plugins/accounts/LinestorageCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class LinestorageCom(XFSPAccount):
+class LinestorageCom(XFSAccount):
     __name__    = "LinestorageCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Linestorage.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "linestorage.com"
+    HOSTER_DOMAIN = "linestorage.com"
diff --git a/module/plugins/accounts/LomafileCom.py b/module/plugins/accounts/LomafileCom.py
index a97ccefc6..cfd21679c 100644
--- a/module/plugins/accounts/LomafileCom.py
+++ b/module/plugins/accounts/LomafileCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class LomafileCom(XFSPAccount):
+class LomafileCom(XFSAccount):
     __name__    = "LomafileCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Lomafile.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "lomafile.com"
+    HOSTER_DOMAIN = "lomafile.com"
diff --git a/module/plugins/accounts/MovReelCom.py b/module/plugins/accounts/MovReelCom.py
index 11fa01300..6128cddc8 100644
--- a/module/plugins/accounts/MovReelCom.py
+++ b/module/plugins/accounts/MovReelCom.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class MovReelCom(XFSPAccount):
+class MovReelCom(XFSAccount):
     __name__    = "MovReelCom"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """Movreel.com account plugin"""
     __license__     = "GPLv3"
@@ -16,4 +16,4 @@ class MovReelCom(XFSPAccount):
     login_timeout = 60
     info_threshold = 30
 
-    HOSTER_NAME = "movreel.com"
+    HOSTER_DOMAIN = "movreel.com"
diff --git a/module/plugins/accounts/NosuploadCom.py b/module/plugins/accounts/NosuploadCom.py
index 2b3b9e381..e523ee2f4 100644
--- a/module/plugins/accounts/NosuploadCom.py
+++ b/module/plugins/accounts/NosuploadCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class NosuploadCom(XFSPAccount):
+class NosuploadCom(XFSAccount):
     __name__    = "NosuploadCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Nosupload.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "nosupload.com"
+    HOSTER_DOMAIN = "nosupload.com"
diff --git a/module/plugins/accounts/NovafileCom.py b/module/plugins/accounts/NovafileCom.py
index 56179dfc6..ab61bf0fc 100644
--- a/module/plugins/accounts/NovafileCom.py
+++ b/module/plugins/accounts/NovafileCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class NovafileCom(XFSPAccount):
+class NovafileCom(XFSAccount):
     __name__    = "NovafileCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Novafile.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "novafile.com"
+    HOSTER_DOMAIN = "novafile.com"
diff --git a/module/plugins/accounts/RapidfileshareNet.py b/module/plugins/accounts/RapidfileshareNet.py
index 665ae5431..c0dd7eaee 100644
--- a/module/plugins/accounts/RapidfileshareNet.py
+++ b/module/plugins/accounts/RapidfileshareNet.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class RapidfileshareNet(XFSPAccount):
+class RapidfileshareNet(XFSAccount):
     __name__    = "RapidfileshareNet"
     __type__    = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """Rapidfileshare.net account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "rapidfileshare.net"
+    HOSTER_DOMAIN = "rapidfileshare.net"
 
     TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><label for="name">\s*(?P<S>[\d.,]+)\s*(?:(?P<U>[\w^_]+))?'
diff --git a/module/plugins/accounts/RarefileNet.py b/module/plugins/accounts/RarefileNet.py
index 9defc7cb7..577a6c8f6 100644
--- a/module/plugins/accounts/RarefileNet.py
+++ b/module/plugins/accounts/RarefileNet.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class RarefileNet(XFSPAccount):
+class RarefileNet(XFSAccount):
     __name__    = "RarefileNet"
     __type__    = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """RareFile.net account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_NAME = "rarefile.net"
+    HOSTER_DOMAIN = "rarefile.net"
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index 071f7348d..ca476366b 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class RyushareCom(XFSPAccount):
+class RyushareCom(XFSAccount):
     __name__    = "RyushareCom"
     __type__    = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """Ryushare.com account plugin"""
     __license__     = "GPLv3"
@@ -14,7 +14,7 @@ class RyushareCom(XFSPAccount):
                        ("trance4us", None)]
 
 
-    HOSTER_NAME = "ryushare.com"
+    HOSTER_DOMAIN = "ryushare.com"
 
 
     def login(self, user, data, req):
diff --git a/module/plugins/accounts/SecureUploadEu.py b/module/plugins/accounts/SecureUploadEu.py
index 1bf0106fa..b335c94da 100644
--- a/module/plugins/accounts/SecureUploadEu.py
+++ b/module/plugins/accounts/SecureUploadEu.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class SecureUploadEu(XFSPAccount):
+class SecureUploadEu(XFSAccount):
     __name__    = "SecureUploadEu"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """SecureUpload.eu account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "secureupload.eu"
+    HOSTER_DOMAIN = "secureupload.eu"
diff --git a/module/plugins/accounts/SendmywayCom.py b/module/plugins/accounts/SendmywayCom.py
index 1ccfc7734..4fcbe0b7a 100644
--- a/module/plugins/accounts/SendmywayCom.py
+++ b/module/plugins/accounts/SendmywayCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class SendmywayCom(XFSPAccount):
+class SendmywayCom(XFSAccount):
     __name__    = "SendmywayCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Sendmyway.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "sendmyway.com"
+    HOSTER_DOMAIN = "sendmyway.com"
diff --git a/module/plugins/accounts/StreamcloudEu.py b/module/plugins/accounts/StreamcloudEu.py
index b90a7d29f..aa1eafcbd 100644
--- a/module/plugins/accounts/StreamcloudEu.py
+++ b/module/plugins/accounts/StreamcloudEu.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class StreamcloudEu(XFSPAccount):
+class StreamcloudEu(XFSAccount):
     __name__    = "StreamcloudEu"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Streamcloud.eu account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "streamcloud.eu"
+    HOSTER_DOMAIN = "streamcloud.eu"
diff --git a/module/plugins/accounts/TusfilesNet.py b/module/plugins/accounts/TusfilesNet.py
index 8f41930a5..279dfd00a 100644
--- a/module/plugins/accounts/TusfilesNet.py
+++ b/module/plugins/accounts/TusfilesNet.py
@@ -4,20 +4,20 @@ import re
 
 from time import mktime, strptime, gmtime
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class TusfilesNet(XFSPAccount):
+class TusfilesNet(XFSAccount):
     __name__    = "TusfilesNet"
     __type__    = "account"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """ Tusfile.net account plugin """
     __license__     = "GPLv3"
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "tusfiles.net"
+    HOSTER_DOMAIN = "tusfiles.net"
 
     VALID_UNTIL_PATTERN = r'<span class="label label-default">([^<]+)</span>'
     TRAFFIC_LEFT_PATTERN = r'<td><img src="//www\.tusfiles\.net/i/icon/meter\.png" alt=""/></td>\n<td>&nbsp;(?P<S>[\d.,]+)'
diff --git a/module/plugins/accounts/UploadcCom.py b/module/plugins/accounts/UploadcCom.py
index d31b44e6b..d1e1a2ead 100644
--- a/module/plugins/accounts/UploadcCom.py
+++ b/module/plugins/accounts/UploadcCom.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class UploadcCom(XFSPAccount):
+class UploadcCom(XFSAccount):
     __name__    = "UploadcCom"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Uploadc.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "uploadc.com"
+    HOSTER_DOMAIN = "uploadc.com"
diff --git a/module/plugins/accounts/UptoboxCom.py b/module/plugins/accounts/UptoboxCom.py
index 7bec088bd..d3fb4e559 100644
--- a/module/plugins/accounts/UptoboxCom.py
+++ b/module/plugins/accounts/UptoboxCom.py
@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class UptoboxCom(XFSPAccount):
+class UptoboxCom(XFSAccount):
     __name__    = "UptoboxCom"
     __type__    = "account"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """DDLStorage.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    HOSTER_NAME = "uptobox.com"
-
-    PREMIUM_PATTERN = r'class="premium_time"'
+    HOSTER_DOMAIN = "uptobox.com"
diff --git a/module/plugins/accounts/VidPlayNet.py b/module/plugins/accounts/VidPlayNet.py
index b182c8589..5bfc24963 100644
--- a/module/plugins/accounts/VidPlayNet.py
+++ b/module/plugins/accounts/VidPlayNet.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class VidPlayNet(XFSPAccount):
+class VidPlayNet(XFSAccount):
     __name__    = "VidPlayNet"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """VidPlay.net account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = "vidplay.net"
+    HOSTER_DOMAIN = "vidplay.net"
diff --git a/module/plugins/accounts/XFileSharingPro.py b/module/plugins/accounts/XFileSharingPro.py
index c6baad4f8..fb77ab23f 100644
--- a/module/plugins/accounts/XFileSharingPro.py
+++ b/module/plugins/accounts/XFileSharingPro.py
@@ -1,30 +1,30 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.XFSAccount import XFSAccount
 
 
-class XFileSharingPro(XFSPAccount):
+class XFileSharingPro(XFSAccount):
     __name__    = "XFileSharingPro"
     __type__    = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """XFileSharingPro multi-purpose account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    HOSTER_NAME = None
+    HOSTER_DOMAIN = None
 
 
     def init(self):
-        if self.HOSTER_NAME:
+        if self.HOSTER_DOMAIN:
             return super(XFileSharingPro, self).init()
 
 
     def loadAccountInfo(self, user, req):
-        return super(XFileSharingPro if self.HOSTER_NAME else XFSPAccount, self).loadAccountInfo(user, req)
+        return super(XFileSharingPro if self.HOSTER_DOMAIN else XFSAccount, self).loadAccountInfo(user, req)
 
 
     def login(self, user, data, req):
-        if self.HOSTER_NAME:
+        if self.HOSTER_DOMAIN:
             return super(XFileSharingPro, self).login(user, data, req)
-- 
cgit v1.2.3


From e8d1f1e6083dd7caa30dce97eeb5c6005c9f79f9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 13:03:24 +0100
Subject: [OneFichierCom] Fixed account plugin

---
 module/plugins/accounts/OneFichierCom.py | 43 +++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index a95e4df34..dae892c05 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import strptime, mktime
+
 from pycurl import REFERER
 
 from module.plugins.Account import Account
@@ -10,39 +12,44 @@ from module.plugins.Account import Account
 class OneFichierCom(Account):
     __name__    = "OneFichierCom"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.11"
 
     __description__ = """1fichier.com account plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")]
+    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    VALID_UNTIL_PATTERN = r'You are a premium user until (?P<d>\d{2})/(?P<m>\d{2})/(?P<y>\d{4})'
+    VALID_UNTIL_PATTERN = r'Your Premium Status will end the (\d+/\d+/\d+)'
 
 
     def loadAccountInfo(self, user, req):
-        html = req.load("http://1fichier.com/console/abo.pl")
+        validuntil = None
+        trafficleft = -1
+        premium = None
 
-        m = re.search(self.VALID_UNTIL_PATTERN, html)
+        html = req.load("https://1fichier.com/console/abo.pl")
 
+        m = re.search(self.VALID_UNTIL_PATTERN, html)
         if m:
-            premium = True
-            validuntil = re.sub(self.VALID_UNTIL_PATTERN, '\g<d>/\g<m>/\g<y>', m.group(0))
-            validuntil = int(mktime(strptime(validuntil, "%d/%m/%Y")))
-        else:
-            premium = False
-            validuntil = -1
+            expiredate = m.group(1)
+            self.logDebug("Expire date: " + expiredate)
+
+            try:
+                validuntil = mktime(strptime(expiredate, "%d/%m/%Y"))
+            except Exception, e:
+                self.logError(str(e))
+            else:
+                premium = True
 
-        return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium or False}
 
 
     def login(self, user, data, req):
-        req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en")
+        req.http.c.setopt(REFERER, "https://1fichier.com/login.pl?lg=en")
 
-        html = req.load("http://1fichier.com/login.pl?lg=en", post={
-            "mail": user,
-            "pass": data['password'],
-            "Login": "Login"})
+        html = req.load("https://1fichier.com/login.pl?lg=en",
+                        post={'mail': user, 'pass': data['password'], 'It': "on", 'purge': "off", 'valider': "Send"})
 
-        if r'<div class="error_message">Invalid username or password.</div>' in html:
+        if '>Invalid email address' in html or '>Invalid password' in html:
             self.wrongPassword()
-- 
cgit v1.2.3


From 77269c8c78fcf7bd7a8ddbdbfc972043263fea46 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 6 Nov 2014 03:33:31 +0100
Subject: Code cosmetics

---
 module/plugins/accounts/File4safeCom.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/File4safeCom.py b/module/plugins/accounts/File4safeCom.py
index 76446f791..20053d895 100644
--- a/module/plugins/accounts/File4safeCom.py
+++ b/module/plugins/accounts/File4safeCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSAccount import XFSAccount
 class File4safeCom(XFSAccount):
     __name__    = "File4safeCom"
     __type__    = "account"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """File4safe.com account plugin"""
     __license__     = "GPLv3"
@@ -16,4 +16,3 @@ class File4safeCom(XFSAccount):
     HOSTER_DOMAIN = "file4safe.com"
 
     LOGIN_FAIL_PATTERN = r'input_login'
-    PREMIUM_PATTERN = r'Extend Premium'
-- 
cgit v1.2.3


From 59f72bfc5ed721c80c821bd0ca1bc8daf0d49880 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 9 Nov 2014 03:12:41 +0100
Subject: Code cosmetics

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index 83b1bf86b..440eba8da 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -46,7 +46,7 @@ class MegaRapidCz(Account):
 
 
     def login(self, user, data, req):
-        htm = req.load("http://megarapid.cz/prihlaseni/", cookies=True)
+        htm = req.load("http://megarapid.cz/prihlaseni/")
         if "Heslo:" in htm:
             start = htm.index('id="inp_hash" name="hash" value="')
             htm = htm[start + 33:]
@@ -56,4 +56,4 @@ class MegaRapidCz(Account):
                                  "login": user,
                                  "pass1": data['password'],
                                  "remember": 0,
-                                 "sbmt": u"Přihlásit"}, cookies=True)
+                                 "sbmt": u"Přihlásit"})
-- 
cgit v1.2.3


From 2680006e2819803031405fc1a7b41fe50be2bd55 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 9 Nov 2014 03:29:41 +0100
Subject: [UploadingCom] Update account

---
 module/plugins/accounts/UploadingCom.py | 54 +++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 16 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index 77229ef8d..e9e233a95 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -1,41 +1,63 @@
 # -*- coding: utf-8 -*-
 
-from time import time, strptime, mktime
 import re
 
+from time import time, strptime, mktime
+
 from module.plugins.Account import Account
+from module.plugins.internal.SimpleHoster import set_cookies
 
 
 class UploadingCom(Account):
     __name__    = "UploadingCom"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.11"
 
     __description__ = """Uploading.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
+    PREMIUM_PATTERN = r'UPGRADE TO PREMIUM'
+    VALID_UNTIL_PATTERN = r'Valid Until:(.+?)<'
+
+
     def loadAccountInfo(self, user, req):
-        src = req.load("http://uploading.com/")
-        premium = True
-        if "UPGRADE TO PREMIUM" in src:
-            return {"validuntil": -1, "trafficleft": -1, "premium": False}
+        validuntil  = None
+        trafficleft = None
+        premium     = None
+
+        html = req.load("http://uploading.com/")
 
-        m = re.search("Valid Until:(.*?)<", src)
+        premium = False if re.search(self.PREMIUM_PATTERN, html) else True
+
+        m = re.search(self.VALID_UNTIL_PATTERN, html)
         if m:
-            validuntil = int(mktime(strptime(m.group(1).strip(), "%b %d, %Y")))
-        else:
-            validuntil = -1
+            expiredate = m.group(1).strip()
+            self.logDebug("Expire date: " + expiredate)
+
+            try:
+                validuntil = mktime(strptime(expiredate, "%b %d, %Y"))
+
+            except Exception, e:
+                self.logError(str(e))
 
-        return {"validuntil": validuntil, "trafficleft": -1, "premium": True}
+            else:
+                if validuntil > mktime(gmtime()):
+                    premium = True
+                else:
+                    premium = False
+                    validuntil = None
+
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("uploading.com", "lang", "1")
-        req.cj.setCookie("uploading.com", "language", "1")
-        req.cj.setCookie("uploading.com", "setlang", "en")
-        req.cj.setCookie("uploading.com", "_lang", "en")
+        set_cookies([("uploading.com", "lang", "1"),
+                     ("uploading.com", "language", "1"),
+                     ("uploading.com", "setlang", "en"),
+                     ("uploading.com", "_lang", "en")]
+
         req.load("http://uploading.com/")
         req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time() * 1000),
-                 post={"email": user, "password": data['password'], "remember": "on"})
+                 post={'email': user, 'password': data['password'], 'remember': "on"})
-- 
cgit v1.2.3


From 78dba80cb8ceb7bc877f86aba54cc229e85f5449 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 9 Nov 2014 03:30:07 +0100
Subject: [UploadedTo] Update account

---
 module/plugins/accounts/UploadedTo.py | 47 +++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 719f0c0e4..6cb09e44b 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -9,43 +9,52 @@ from module.plugins.Account import Account
 class UploadedTo(Account):
     __name__    = "UploadedTo"
     __type__    = "account"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __description__ = """Uploaded.to account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
+    PREMIUM_PATTERN = r'<em>Premium</em>'
+    VALID_UNTIL_PATTERN = r'<td>Duration:</td>\s*<th>([^<]+)'
+    TRAFFIC_LEFT_PATTERN = r'<th colspan="2"><b class="cB">([^<]+)'
+
+
     def loadAccountInfo(self, user, req):
-        req.load("http://uploaded.net/language/en")
-        html = req.load("http://uploaded.net/me")
+        validuntil  = None
+        trafficleft = None
+        premium     = None
 
-        premium = '<a href="register"><em>Premium</em>' in html or '<em>Premium</em></th>' in html
+        html = req.load("http://uploaded.net/me")
 
-        if premium:
-            raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1).replace('.', '')
-            raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.M).group(1).strip()
+        premium = True if re.search(self.PREMIUM_PATTERN, html) else False
 
-            traffic = int(self.parseTraffic(raw_traffic))
+        m = re.search(self.VALID_UNTIL_PATTERN, html, re.M)
+        if m:
+            expiredate = m.group(1).strip()
 
-            if raw_valid == "unlimited":
+            if expiredate == "unlimited":
                 validuntil = -1
             else:
-                raw_valid = re.findall(r"(\d+) (Week|weeks|day|hour)", raw_valid)
-                validuntil = time()
-                for n, u in raw_valid:
-                    validuntil += int(n) * 60 * 60 * {"Week": 168, "weeks": 168, "day": 24, "hour": 1}[u]
+                m = re.findall(r'(\d+) (Week|weeks|day|hour)', expiredate)
+                if m:
+                    validuntil = time()
+                    for n, u in m:
+                        validuntil += int(n) * 60 * 60 * {'Week': 168, 'weeks': 168, 'day': 24, 'hour': 1}[u]
+
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+        if m:
+            trafficleft = self.parseTraffic(m.group(1).replace('.', ''))
 
-            return {"validuntil": validuntil, "trafficleft": traffic, "maxtraffic": 50 * 1024 * 1024}
-        else:
-            return {"premium": False, "validuntil": -1}
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
 
     def login(self, user, data, req):
-        req.load("http://uploaded.net/language/en")
         req.cj.setCookie("uploaded.net", "lang", "en")
 
-        page = req.load("http://uploaded.net/io/login", post={"id": user, "pw": data['password'], "_": ""})
+        page = req.load("http://uploaded.net/io/login",
+                        post={'id': user, 'pw': data['password'], '_': ""})
 
-        if "User and password do not match!" in page:
+        if "User and password do not match" in page:
             self.wrongPassword()
-- 
cgit v1.2.3


From f1f4531ce644e6bb4dd2af71ca38586e864aa19e Mon Sep 17 00:00:00 2001
From: aeronaut <aeronaut@pianoguy.de>
Date: Sun, 9 Nov 2014 22:20:05 +0100
Subject: [Keep2shareCc] Account plugin

---
 module/plugins/accounts/Keep2shareCc.py | 69 +++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 module/plugins/accounts/Keep2shareCc.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/Keep2shareCc.py b/module/plugins/accounts/Keep2shareCc.py
new file mode 100644
index 000000000..fa0c9d2e7
--- /dev/null
+++ b/module/plugins/accounts/Keep2shareCc.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from time import gmtime, mktime, strptime
+
+from module.plugins.Account import Account
+
+
+class Keep2shareCc(Account):
+    __name__    = "Keep2shareCC"
+    __type__    = "account"
+    __version__ = "0.01"
+
+    __description__ = """Keep2share.cc account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("aeronaut", "aeronaut@pianoguy.de")]
+
+
+    VALID_UNTIL_PATTERN  = r'Premium expires: <b>(.+?)</b>'
+    TRAFFIC_LEFT_PATTERN = r'Available traffic \(today\):<b><a href="/user/statistic.html">(.+?)</a>'
+
+    LOGIN_FAIL_PATTERN = r'Please fix the following input errors'
+
+
+    def loadAccountInfo(self, user, req):
+        validuntil  = None
+        trafficleft = None
+        premium     = None
+
+        html = req.load("http://keep2share.cc/site/profile.html", decode=True)
+
+        m = re.search(self.VALID_UNTIL_PATTERN, html)
+        if m:
+            expiredate = m.group(1).strip()
+            self.logDebug("Expire date: " + expiredate)
+
+            try:
+                validuntil = mktime(strptime(expiredate, "%Y.%m.%d"))
+
+            except Exception, e:
+                self.logError(str(e))
+
+            else:
+                if validuntil > mktime(gmtime()):
+                    premium = True
+                else:
+                    premium = False
+                    validuntil = None
+
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
+        if m:
+            try:
+                trafficleft = self.parseTraffic(m.group(1))
+
+            except Exception, e:
+                self.logError(str(e))
+
+        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
+
+
+    def login(self, user, data, req):
+        req.cj.setCookie(".keep2share.cc", "lang", "en")
+
+        html = req.load("http://keep2share.cc/login.html",
+                        post={'LoginForm[username]': user, 'LoginForm[password]': data["password"]})
+
+        if re.search(self.LOGIN_FAIL_PATTERN, html):
+            self.wrongPassword()
-- 
cgit v1.2.3


From 0516e8553608950db9f4ca13138ee1c3557ddc16 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 9 Nov 2014 22:55:25 +0100
Subject: [Keep2shareCc] Fix account __name__

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/Keep2shareCc.py b/module/plugins/accounts/Keep2shareCc.py
index fa0c9d2e7..22682e247 100644
--- a/module/plugins/accounts/Keep2shareCc.py
+++ b/module/plugins/accounts/Keep2shareCc.py
@@ -8,9 +8,9 @@ from module.plugins.Account import Account
 
 
 class Keep2shareCc(Account):
-    __name__    = "Keep2shareCC"
+    __name__    = "Keep2shareCc"
     __type__    = "account"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __description__ = """Keep2share.cc account plugin"""
     __license__     = "GPLv3"
@@ -63,7 +63,7 @@ class Keep2shareCc(Account):
         req.cj.setCookie(".keep2share.cc", "lang", "en")
 
         html = req.load("http://keep2share.cc/login.html",
-                        post={'LoginForm[username]': user, 'LoginForm[password]': data["password"]})
+                        post={'LoginForm[username]': user, 'LoginForm[password]': data['password']})
 
         if re.search(self.LOGIN_FAIL_PATTERN, html):
             self.wrongPassword()
-- 
cgit v1.2.3


From c9e31d875d32de31e54959b82bc35eff2b3e0f3f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 10 Nov 2014 00:19:51 +0100
Subject: Code cosmetics

---
 module/plugins/accounts/BayfilesCom.py      | 20 ++++++++++----------
 module/plugins/accounts/DepositfilesCom.py  | 10 +++++-----
 module/plugins/accounts/FilecloudIo.py      |  2 +-
 module/plugins/accounts/FourSharedCom.py    | 18 +++++++++---------
 module/plugins/accounts/HellshareCz.py      |  2 +-
 module/plugins/accounts/Keep2shareCc.py     |  4 ++--
 module/plugins/accounts/MegaDebridEu.py     | 12 ++++++------
 module/plugins/accounts/MegaRapidCz.py      |  8 ++++----
 module/plugins/accounts/OneFichierCom.py    |  2 +-
 module/plugins/accounts/RPNetBiz.py         | 18 +++++++++---------
 module/plugins/accounts/RapidshareCom.py    | 18 +++++++++---------
 module/plugins/accounts/ShareonlineBiz.py   | 12 ++++++------
 module/plugins/accounts/SimplyPremiumCom.py |  2 +-
 module/plugins/accounts/SimplydebridCom.py  |  8 ++++----
 module/plugins/accounts/TurbobitNet.py      |  2 +-
 module/plugins/accounts/UlozTo.py           |  2 +-
 module/plugins/accounts/UnrestrictLi.py     |  2 +-
 module/plugins/accounts/UploadedTo.py       |  2 +-
 module/plugins/accounts/UploadingCom.py     | 10 +++++-----
 module/plugins/accounts/ZeveraCom.py        | 12 ++++++------
 20 files changed, 83 insertions(+), 83 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/BayfilesCom.py b/module/plugins/accounts/BayfilesCom.py
index b32003688..b2295c3f1 100644
--- a/module/plugins/accounts/BayfilesCom.py
+++ b/module/plugins/accounts/BayfilesCom.py
@@ -18,20 +18,20 @@ class BayfilesCom(Account):
 
     def loadAccountInfo(self, user, req):
         for _i in xrange(2):
-            response = json_loads(req.load("http://api.bayfiles.com/v1/account/info"))
-            self.logDebug(response)
-            if not response['error']:
+            res = json_loads(req.load("http://api.bayfiles.com/v1/account/info"))
+            self.logDebug(res)
+            if not res['error']:
                 break
-            self.logWarning(response['error'])
+            self.logWarning(res['error'])
             self.relogin(user)
 
-        return {"premium": bool(response['premium']), "trafficleft": -1,
-                "validuntil": response['expires'] if response['expires'] >= int(time()) else -1}
+        return {"premium": bool(res['premium']), "trafficleft": -1,
+                "validuntil": res['expires'] if res['expires'] >= int(time()) else -1}
 
 
     def login(self, user, data, req):
-        response = json_loads(req.load("http://api.bayfiles.com/v1/account/login/%s/%s" % (user, data['password'])))
-        self.logDebug(response)
-        if response['error']:
-            self.logError(response['error'])
+        res = json_loads(req.load("http://api.bayfiles.com/v1/account/login/%s/%s" % (user, data['password'])))
+        self.logDebug(res)
+        if res['error']:
+            self.logError(res['error'])
             self.wrongPassword()
diff --git a/module/plugins/accounts/DepositfilesCom.py b/module/plugins/accounts/DepositfilesCom.py
index cb4396d02..437265c3f 100644
--- a/module/plugins/accounts/DepositfilesCom.py
+++ b/module/plugins/accounts/DepositfilesCom.py
@@ -20,8 +20,8 @@ class DepositfilesCom(Account):
 
 
     def loadAccountInfo(self, user, req):
-        src = req.load("https://dfiles.eu/de/gold/")
-        validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", src).group(1)
+        html = req.load("https://dfiles.eu/de/gold/")
+        validuntil = re.search(r"Sie haben Gold Zugang bis: <b>(.*?)</b></div>", html).group(1)
 
         validuntil = int(mktime(strptime(validuntil, "%Y-%m-%d %H:%M:%S")))
 
@@ -29,7 +29,7 @@ class DepositfilesCom(Account):
 
 
     def login(self, user, data, req):
-        src = req.load("https://dfiles.eu/de/login.php", get={"return": "/de/gold/payment.php"},
-                       post={"login": user, "password": data['password']})
-        if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in src:
+        html = req.load("https://dfiles.eu/de/login.php", get={"return": "/de/gold/payment.php"},
+                        post={"login": user, "password": data['password']})
+        if r'<div class="error_message">Sie haben eine falsche Benutzername-Passwort-Kombination verwendet.</div>' in html:
             self.wrongPassword()
diff --git a/module/plugins/accounts/FilecloudIo.py b/module/plugins/accounts/FilecloudIo.py
index c001d4513..f62d95301 100644
--- a/module/plugins/accounts/FilecloudIo.py
+++ b/module/plugins/accounts/FilecloudIo.py
@@ -42,7 +42,7 @@ class FilecloudIo(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("secure.filecloud.io", "lang", "en")
+        req.cj.setCookie(".secure.filecloud.io", "lang", "en")
         html = req.load('https://secure.filecloud.io/user-login.html')
 
         if not hasattr(self, "form_data"):
diff --git a/module/plugins/accounts/FourSharedCom.py b/module/plugins/accounts/FourSharedCom.py
index fe25ccc0e..565a00cf2 100644
--- a/module/plugins/accounts/FourSharedCom.py
+++ b/module/plugins/accounts/FourSharedCom.py
@@ -21,13 +21,13 @@ class FourSharedCom(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("4shared.com", "4langcookie", "en")
-        response = req.load('http://www.4shared.com/web/login',
-                            post={"login": user,
-                                  "password": data['password'],
-                                  "remember": "on",
-                                  "_remember": "on",
-                                  "returnTo": "http://www.4shared.com/account/home.jsp"})
-
-        if 'Please log in to access your 4shared account' in response:
+        req.cj.setCookie(".4shared.com", "4langcookie", "en")
+        res = req.load('http://www.4shared.com/web/login',
+                       post={'login': user,
+                             'password': data['password'],
+                             'remember': "on",
+                             '_remember': "on",
+                             'returnTo': "http://www.4shared.com/account/home.jsp"})
+
+        if 'Please log in to access your 4shared account' in res:
             self.wrongPassword()
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index f0692ca5c..685740a5c 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -44,7 +44,7 @@ class HellshareCz(Account):
                     trafficleft = int(credit) * 1024
                     validuntil = -1
             except Exception, e:
-                self.logError(_("Unable to parse credit info"), str(e))
+                self.logError(_("Unable to parse credit info"), e)
                 validuntil = -1
                 trafficleft = -1
 
diff --git a/module/plugins/accounts/Keep2shareCc.py b/module/plugins/accounts/Keep2shareCc.py
index 22682e247..de9b9b5d8 100644
--- a/module/plugins/accounts/Keep2shareCc.py
+++ b/module/plugins/accounts/Keep2shareCc.py
@@ -39,7 +39,7 @@ class Keep2shareCc(Account):
                 validuntil = mktime(strptime(expiredate, "%Y.%m.%d"))
 
             except Exception, e:
-                self.logError(str(e))
+                self.logError(e)
 
             else:
                 if validuntil > mktime(gmtime()):
@@ -54,7 +54,7 @@ class Keep2shareCc(Account):
                 trafficleft = self.parseTraffic(m.group(1))
 
             except Exception, e:
-                self.logError(str(e))
+                self.logError(e)
 
         return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
diff --git a/module/plugins/accounts/MegaDebridEu.py b/module/plugins/accounts/MegaDebridEu.py
index b1b3368a6..e7e22048b 100644
--- a/module/plugins/accounts/MegaDebridEu.py
+++ b/module/plugins/accounts/MegaDebridEu.py
@@ -22,18 +22,18 @@ class MegaDebridEu(Account):
         data = self.getAccountData(user)
         jsonResponse = req.load(self.API_URL,
                                 get={'action': 'connectUser', 'login': user, 'password': data['password']})
-        response = json_loads(jsonResponse)
+        res = json_loads(jsonResponse)
 
-        if response['response_code'] == "ok":
-            return {"premium": True, "validuntil": float(response['vip_end']), "status": True}
+        if res['response_code'] == "ok":
+            return {"premium": True, "validuntil": float(res['vip_end']), "status": True}
         else:
-            self.logError(response)
+            self.logError(res)
             return {"status": False, "premium": False}
 
 
     def login(self, user, data, req):
         jsonResponse = req.load(self.API_URL,
                                 get={'action': 'connectUser', 'login': user, 'password': data['password']})
-        response = json_loads(jsonResponse)
-        if response['response_code'] != "ok":
+        res = json_loads(jsonResponse)
+        if res['response_code'] != "ok":
             self.wrongPassword()
diff --git a/module/plugins/accounts/MegaRapidCz.py b/module/plugins/accounts/MegaRapidCz.py
index 440eba8da..41da7ac73 100644
--- a/module/plugins/accounts/MegaRapidCz.py
+++ b/module/plugins/accounts/MegaRapidCz.py
@@ -25,19 +25,19 @@ class MegaRapidCz(Account):
 
 
     def loadAccountInfo(self, user, req):
-        src = req.load("http://megarapid.cz/mujucet/", decode=True)
+        html = req.load("http://megarapid.cz/mujucet/", decode=True)
 
-        m = re.search(self.LIMITDL_PATTERN, src)
+        m = re.search(self.LIMITDL_PATTERN, html)
         if m:
             data = self.getAccountData(user)
             data['options']['limitDL'] = [int(m.group(1))]
 
-        m = re.search(self.VALID_UNTIL_PATTERN, src)
+        m = re.search(self.VALID_UNTIL_PATTERN, html)
         if m:
             validuntil = mktime(strptime(m.group(1), "%d.%m.%Y - %H:%M"))
             return {"premium": True, "trafficleft": -1, "validuntil": validuntil}
 
-        m = re.search(self.TRAFFIC_LEFT_PATTERN, src)
+        m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         if m:
             trafficleft = float(m.group(1)) * (1 << 20)
             return {"premium": True, "trafficleft": trafficleft, "validuntil": -1}
diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py
index dae892c05..2f1c914c1 100644
--- a/module/plugins/accounts/OneFichierCom.py
+++ b/module/plugins/accounts/OneFichierCom.py
@@ -38,7 +38,7 @@ class OneFichierCom(Account):
             try:
                 validuntil = mktime(strptime(expiredate, "%d/%m/%Y"))
             except Exception, e:
-                self.logError(str(e))
+                self.logError(e)
             else:
                 premium = True
 
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py
index 35ad58d2d..4daa56a75 100644
--- a/module/plugins/accounts/RPNetBiz.py
+++ b/module/plugins/accounts/RPNetBiz.py
@@ -16,11 +16,11 @@ class RPNetBiz(Account):
 
     def loadAccountInfo(self, user, req):
         # Get account information from rpnet.biz
-        response = self.getAccountStatus(user, req)
+        res = self.getAccountStatus(user, req)
         try:
-            if response['accountInfo']['isPremium']:
+            if res['accountInfo']['isPremium']:
                 # Parse account info. Change the trafficleft later to support per host info.
-                account_info = {"validuntil": int(response['accountInfo']['premiumExpiry']),
+                account_info = {"validuntil": int(res['accountInfo']['premiumExpiry']),
                                 "trafficleft": -1, "premium": True}
             else:
                 account_info = {"validuntil": None, "trafficleft": None, "premium": False}
@@ -34,18 +34,18 @@ class RPNetBiz(Account):
 
     def login(self, user, data, req):
         # Get account information from rpnet.biz
-        response = self.getAccountStatus(user, req)
+        res = self.getAccountStatus(user, req)
 
-        # If we have an error in the response, we have wrong login information
-        if 'error' in response:
+        # If we have an error in the res, we have wrong login information
+        if 'error' in res:
             self.wrongPassword()
 
 
     def getAccountStatus(self, user, req):
         # Using the rpnet API, check if valid premium account
-        response = req.load("https://premium.rpnet.biz/client_api.php",
+        res = req.load("https://premium.rpnet.biz/client_api.php",
                             get={"username": user, "password": self.accounts[user]['password'],
                                  "action": "showAccountInformation"})
-        self.logDebug("JSON data: %s" % response)
+        self.logDebug("JSON data: %s" % res)
 
-        return json_loads(response)
+        return json_loads(res)
diff --git a/module/plugins/accounts/RapidshareCom.py b/module/plugins/accounts/RapidshareCom.py
index c14a56f7d..5c2ce66f5 100644
--- a/module/plugins/accounts/RapidshareCom.py
+++ b/module/plugins/accounts/RapidshareCom.py
@@ -18,10 +18,10 @@ class RapidshareCom(Account):
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
         api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user,
                           "password": data['password'], "withcookie": 1}
-        src = req.load(api_url_base, cookies=False, get=api_param_prem)
-        if src.startswith("ERROR"):
-            raise Exception(src)
-        fields = src.split("\n")
+        html = req.load(api_url_base, cookies=False, get=api_param_prem)
+        if html.startswith("ERROR"):
+            raise Exception(html)
+        fields = html.split("\n")
         info = {}
         for t in fields:
             if not t.strip():
@@ -41,10 +41,10 @@ class RapidshareCom(Account):
         api_url_base = "http://api.rapidshare.com/cgi-bin/rsapi.cgi"
         api_param_prem = {"sub": "getaccountdetails", "type": "prem", "login": user,
                           "password": data['password'], "withcookie": 1}
-        src = req.load(api_url_base, cookies=False, get=api_param_prem)
-        if src.startswith("ERROR"):
-            raise Exception(src + "### Note you have to use your account number for login, instead of name")
-        fields = src.split("\n")
+        html = req.load(api_url_base, cookies=False, get=api_param_prem)
+        if html.startswith("ERROR"):
+            raise Exception(html + "### Note you have to use your account number for login, instead of name")
+        fields = html.split("\n")
         info = {}
         for t in fields:
             if not t.strip():
@@ -52,4 +52,4 @@ class RapidshareCom(Account):
             k, v = t.split("=")
             info[k] = v
         cj = self.getAccountCookies(user)
-        cj.setCookie("rapidshare.com", "enc", info['cookie'])
+        cj.setCookie(".rapidshare.com", "enc", info['cookie'])
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py
index b0833f7af..331bb9f74 100644
--- a/module/plugins/accounts/ShareonlineBiz.py
+++ b/module/plugins/accounts/ShareonlineBiz.py
@@ -20,19 +20,19 @@ class ShareonlineBiz(Account):
 
 
     def loadAccountInfo(self, user, req):
-        src = self.getUserAPI(user, req)
+        html = self.getUserAPI(user, req)
 
         info = {}
-        for line in src.splitlines():
+        for line in html.splitlines():
             if "=" in line:
                 key, value = line.split("=")
                 info[key] = value
         self.logDebug(info)
 
         if "dl" in info and info['dl'].lower() != "not_available":
-            req.cj.setCookie("share-online.biz", "dl", info['dl'])
+            req.cj.setCookie(".share-online.biz", "dl", info['dl'])
         if "a" in info and info['a'].lower() != "not_available":
-            req.cj.setCookie("share-online.biz", "a", info['a'])
+            req.cj.setCookie(".share-online.biz", "a", info['a'])
 
         return {"validuntil": int(info['expire_date']) if "expire_date" in info else -1,
                 "trafficleft": -1,
@@ -40,6 +40,6 @@ class ShareonlineBiz(Account):
 
 
     def login(self, user, data, req):
-        src = self.getUserAPI(user, req)
-        if "EXCEPTION" in src:
+        html = self.getUserAPI(user, req)
+        if "EXCEPTION" in html:
             self.wrongPassword()
diff --git a/module/plugins/accounts/SimplyPremiumCom.py b/module/plugins/accounts/SimplyPremiumCom.py
index 979ce73aa..ab9474955 100644
--- a/module/plugins/accounts/SimplyPremiumCom.py
+++ b/module/plugins/accounts/SimplyPremiumCom.py
@@ -33,7 +33,7 @@ class SimplyPremiumCom(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("simply-premium.com", "lang", "EN")
+        req.cj.setCookie(".simply-premium.com", "lang", "EN")
 
         if data['password'] == '' or data['password'] == '0':
             post_data = {"key": user}
diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index 784a90ae3..7979fd5d5 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -17,8 +17,8 @@ class SimplydebridCom(Account):
 
     def loadAccountInfo(self, user, req):
         get_data = {'login': 2, 'u': self.loginname, 'p': self.password}
-        response = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
-        data = [x.strip() for x in response.split(";")]
+        res = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
+        data = [x.strip() for x in res.split(";")]
         if str(data[0]) != "1":
             return {"premium": False}
         else:
@@ -29,6 +29,6 @@ class SimplydebridCom(Account):
         self.loginname = user
         self.password = data['password']
         get_data = {'login': 1, 'u': self.loginname, 'p': self.password}
-        response = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
-        if response != "02: loggin success":
+        res = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
+        if res != "02: loggin success":
             self.wrongPassword()
diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index f87d234a7..b26cad1af 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -31,7 +31,7 @@ class TurbobitNet(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("turbobit.net", "user_lang", "en")
+        req.cj.setCookie(".turbobit.net", "user_lang", "en")
 
         html = req.load("http://turbobit.net/user/login", post={
             "user[login]": user,
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 178d9a47d..2632d2535 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -23,7 +23,7 @@ class UlozTo(Account):
         #this cookie gets lost somehow after each request
         self.phpsessid = req.cj.getCookie("ULOSESSID")
         html = req.load("http://www.ulozto.net/", decode=True)
-        req.cj.setCookie("www.ulozto.net", "ULOSESSID", self.phpsessid)
+        req.cj.setCookie(".ulozto.net", "ULOSESSID", self.phpsessid)
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         trafficleft = int(float(m.group(1).replace(' ', '').replace(',', '.')) * 1000 * 1.048) if m else 0
diff --git a/module/plugins/accounts/UnrestrictLi.py b/module/plugins/accounts/UnrestrictLi.py
index e43d6bbd7..60e501d2e 100644
--- a/module/plugins/accounts/UnrestrictLi.py
+++ b/module/plugins/accounts/UnrestrictLi.py
@@ -29,7 +29,7 @@ class UnrestrictLi(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("unrestrict.li", "lang", "EN")
+        req.cj.setCookie(".unrestrict.li", "lang", "EN")
         html = req.load("https://unrestrict.li/sign_in")
 
         if 'solvemedia' in html:
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index 6cb09e44b..2d9d268c9 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -51,7 +51,7 @@ class UploadedTo(Account):
 
 
     def login(self, user, data, req):
-        req.cj.setCookie("uploaded.net", "lang", "en")
+        req.cj.setCookie(".uploaded.net", "lang", "en")
 
         page = req.load("http://uploaded.net/io/login",
                         post={'id': user, 'pw': data['password'], '_': ""})
diff --git a/module/plugins/accounts/UploadingCom.py b/module/plugins/accounts/UploadingCom.py
index e9e233a95..8747af133 100644
--- a/module/plugins/accounts/UploadingCom.py
+++ b/module/plugins/accounts/UploadingCom.py
@@ -40,7 +40,7 @@ class UploadingCom(Account):
                 validuntil = mktime(strptime(expiredate, "%b %d, %Y"))
 
             except Exception, e:
-                self.logError(str(e))
+                self.logError(e)
 
             else:
                 if validuntil > mktime(gmtime()):
@@ -53,10 +53,10 @@ class UploadingCom(Account):
 
 
     def login(self, user, data, req):
-        set_cookies([("uploading.com", "lang", "1"),
-                     ("uploading.com", "language", "1"),
-                     ("uploading.com", "setlang", "en"),
-                     ("uploading.com", "_lang", "en")]
+        set_cookies([(".uploading.com", "lang", "1"),
+                     (".uploading.com", "language", "1"),
+                     (".uploading.com", "setlang", "en"),
+                     (".uploading.com", "_lang", "en")]
 
         req.load("http://uploading.com/")
         req.load("http://uploading.com/general/login_form/?JsHttpRequest=%s-xml" % long(time() * 1000),
diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 01f9ef692..dbec6984d 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -43,14 +43,14 @@ class ZeveraCom(Account):
         }
         get_data.update(kwargs)
 
-        response = req.load("http://www.zevera.com/jDownloader.ashx", get=get_data,
+        res = req.load("http://www.zevera.com/jDownloader.ashx", get=get_data,
                             decode=True, just_header=just_header)
-        self.logDebug(response)
+        self.logDebug(res)
 
-        if ':' in response:
+        if ':' in res:
             if not just_header:
-                response = response.replace(',', '\n')
+                res = res.replace(',', '\n')
             return dict((y.strip().lower(), z.strip()) for (y, z) in
-                        [x.split(':', 1) for x in response.splitlines() if ':' in x])
+                        [x.split(':', 1) for x in res.splitlines() if ':' in x])
         else:
-            return response
+            return res
-- 
cgit v1.2.3


From 1bf311d182ac02d46de2ac082ff5c120670ec9bb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 10 Nov 2014 21:30:23 +0100
Subject: [FastshareCz] Fix account

---
 module/plugins/accounts/FastshareCz.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index 247838c23..ff437c101 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -7,7 +7,7 @@ from module.plugins.Account import Account
 class FastshareCz(Account):
     __name__    = "FastshareCz"
     __type__    = "account"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """Fastshare.cz account plugin"""
     __license__     = "GPLv3"
@@ -15,29 +15,37 @@ class FastshareCz(Account):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    CREDIT_PATTERN = r'(?:Kredit|Credit)\s*</td>\s*<td[^>]*>([\w.]+)&nbsp;'
+    CREDIT_PATTERN = r'My account\s*\((.+?)\)'
 
 
     def loadAccountInfo(self, user, req):
+        validuntil  = None
+        trafficleft = None
+        premium     = None
+
         html = req.load("http://www.fastshare.cz/user", decode=True)
 
         m = re.search(self.CREDIT_PATTERN, html)
         if m:
             trafficleft = self.parseTraffic(m.group(1))
-            premium = True if trafficleft else False
+
+        if trafficleft:
+            premium = True
+            validuntil = -1
         else:
-            trafficleft = None
             premium = False
 
-        return {"validuntil": -1, "trafficleft": trafficleft, "premium": premium}
+        return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
 
 
     def login(self, user, data, req):
+        req.cj.setCookie(".fastshare.cz", "lang", "en")
+
         req.load('http://www.fastshare.cz/login')  # Do not remove or it will not login
-        html = req.load('http://www.fastshare.cz/sql.php', post={
-            "heslo": data['password'],
-            "login": user
-        }, decode=True)
 
-        if u'>Špatné uživatelské jméno nebo heslo.<' in html:
+        html = req.load("http://www.fastshare.cz/sql.php",
+                        post={'login': user, 'heslo': data['password']},
+                        decode=True)
+
+        if ">Wrong username or password" in html:
             self.wrongPassword()
-- 
cgit v1.2.3


From 619caad59f17f292184aaef0358640191191babf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 10 Nov 2014 21:31:08 +0100
Subject: [FreakshareCom] Improve account

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

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 84ebf6751..6f895edd2 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -9,7 +9,7 @@ from module.plugins.Account import Account
 class FreakshareCom(Account):
     __name__    = "FreakshareCom"
     __type__    = "account"
-    __version__ = "0.1"
+    __version__ = "0.11"
 
     __description__ = """Freakshare.com account plugin"""
     __license__     = "GPLv3"
@@ -33,8 +33,10 @@ class FreakshareCom(Account):
 
 
     def login(self, user, data, req):
+        req.load("http://freakshare.com/index.php?language=EN")
+
         page = req.load("http://freakshare.com/login.html", None,
                         {"submit": "Login", "user": user, "pass": data['password']}, cookies=True)
 
-        if "Falsche Logindaten!" in page or "Wrong Username or Password!" in page:
+        if ">Wrong Username or Password" in page:
             self.wrongPassword()
-- 
cgit v1.2.3


From dbc915d1559a3d80787e3f79f976d15b9204fd8e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 10 Nov 2014 22:20:53 +0100
Subject: [NowVideoAt] Premium support

---
 module/plugins/accounts/FastshareCz.py   |  1 +
 module/plugins/accounts/FreakshareCom.py |  1 +
 module/plugins/accounts/NowVideoAt.py    | 56 ++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 module/plugins/accounts/NowVideoAt.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FastshareCz.py b/module/plugins/accounts/FastshareCz.py
index ff437c101..c6dc7070b 100644
--- a/module/plugins/accounts/FastshareCz.py
+++ b/module/plugins/accounts/FastshareCz.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.Account import Account
 
 
diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py
index 6f895edd2..27e1e3a0a 100644
--- a/module/plugins/accounts/FreakshareCom.py
+++ b/module/plugins/accounts/FreakshareCom.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import strptime, mktime
 
 from module.plugins.Account import Account
diff --git a/module/plugins/accounts/NowVideoAt.py b/module/plugins/accounts/NowVideoAt.py
new file mode 100644
index 000000000..234984b6b
--- /dev/null
+++ b/module/plugins/accounts/NowVideoAt.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from time import gmtime, mktime, strptime
+
+from module.plugins.Account import Account
+
+
+class NowVideoAt(Account):
+    __name__    = "NowVideoAt"
+    __type__    = "account"
+    __version__ = "0.01"
+
+    __description__ = """NowVideo.at account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    VALID_UNTIL_PATTERN = r'>Your premium membership expires on: (.+?)<'
+
+
+    def loadAccountInfo(self, user, req):
+        validuntil  = None
+        trafficleft = -1
+        premium     = None
+
+        html = req.load("http://www.nowvideo.at/premium.php")
+
+        m = re.search(self.VALID_UNTIL_PATTERN, html)
+        if m:
+            expiredate = m.group(1).strip()
+            self.logDebug("Expire date: " + expiredate)
+
+            try:
+                validuntil = mktime(strptime(expiredate, "%Y-%b-%d"))
+
+            except Exception, e:
+                self.logError(e)
+
+            else:
+                if validuntil > mktime(gmtime()):
+                    premium = True
+                else:
+                    premium = False
+                    validuntil = -1
+
+        return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}
+
+
+    def login(self, user, data, req):
+        html = req.load("http://www.nowvideo.at/login.php",
+                        post={'user': user, 'pass': data['password']})
+
+        if ">Invalid login details" is html:
+            self.wrongPassword()
-- 
cgit v1.2.3