Skip to content

Commit fcead18

Browse files
vuoltervuolter
committed
Partially revert acc46fc 
1 parent a460b7c commit fcead18

437 files changed

Lines changed: 3174 additions & 3174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pyload/manager/Account.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def getAccountInfos(self, force=True, refresh=False):
176176
if self.accounts[p]:
177177
p = self.getAccountPlugin(p)
178178
if p:
179-
data[p.__name] = p.getAllAccounts(force)
179+
data[p.__name__] = p.getAllAccounts(force)
180180
else: #@NOTE: When an account has been skipped, p is None
181181
data[p] = []
182182
else:

‎pyload/manager/Addon.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ def createIndex(self):
105105

106106
for pluginname in self.core.pluginManager.addonPlugins:
107107
try:
108-
# hookClass = getattr(plugin, plugin.__name)
108+
# hookClass = getattr(plugin, plugin.__name__)
109109
if self.core.config.getPlugin(pluginname, "activated"):
110110
pluginClass = self.core.pluginManager.loadClass("addon", pluginname)
111111
if not pluginClass:
112112
continue
113113

114114
plugin = pluginClass(self.core, self)
115115
plugins.append(plugin)
116-
self.pluginMap[pluginClass.__name] = plugin
116+
self.pluginMap[pluginClass.__name__] = plugin
117117
if plugin.isActivated():
118-
active.append(pluginClass.__name)
118+
active.append(pluginClass.__name__)
119119
else:
120120
deactive.append(pluginname)
121121

@@ -141,7 +141,7 @@ def manageAddon(self, plugin, name, value):
141141
def activateAddon(self, pluginname):
142142
# check if already loaded
143143
for inst in self.plugins:
144-
if inst.__name == pluginname:
144+
if inst.__name__ == pluginname:
145145
return
146146

147147
pluginClass = self.core.pluginManager.loadClass("addon", pluginname)
@@ -153,14 +153,14 @@ def activateAddon(self, pluginname):
153153

154154
addon = pluginClass(self.core, self)
155155
self.plugins.append(addon)
156-
self.pluginMap[pluginClass.__name] = addon
156+
self.pluginMap[pluginClass.__name__] = addon
157157

158158
addon.activate()
159159

160160

161161
def deactivateAddon(self, pluginname):
162162
for plugin in self.plugins:
163-
if plugin.__name == pluginname:
163+
if plugin.__name__ == pluginname:
164164
addon = plugin
165165
break
166166
else:
@@ -174,7 +174,7 @@ def deactivateAddon(self, pluginname):
174174
self.core.log.debug("Removed callback: %s" % self.core.scheduler.removeJob(addon.cb))
175175

176176
self.plugins.remove(addon)
177-
del self.pluginMap[addon.__name]
177+
del self.pluginMap[addon.__name__]
178178

179179

180180
@try_catch

‎pyload/manager/Plugin.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class PluginManager(object):
2020
USERROOT = "userplugins."
2121
TYPES = ["account", "addon", "container", "crypter", "hook", "hoster", "internal", "ocr"]
2222

23-
PATTERN = re.compile(r'__pattern\s*=\s*u?r("|\')([^"\']+)')
24-
VERSION = re.compile(r'__version\s*=\s*("|\')([\d.]+)')
25-
CONFIG = re.compile(r'__config\s*=\s*\[([^\]]+)', re.M)
26-
DESC = re.compile(r'__description\s*=\s*("|"""|\')([^"\']+)')
23+
PATTERN = re.compile(r'__pattern__\s*=\s*u?r("|\')([^"\']+)')
24+
VERSION = re.compile(r'__version__\s*=\s*("|\')([\d.]+)')
25+
CONFIG = re.compile(r'__config__\s*=\s*\[([^\]]+)', re.M)
26+
DESC = re.compile(r'__description__\s*=\s*("|"""|\')([^"\']+)')
2727

2828

2929
def __init__(self, core):

‎pyload/manager/Thread.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def assignJob(self):
266266
job.release()
267267
return
268268

269-
if job.plugin.__type == "hoster":
269+
if job.plugin.__type__ == "hoster":
270270
spaceLeft = freeSpace(self.core.config["general"]["download_folder"]) / 1024 / 1024
271271
if spaceLeft < self.core.config["general"]["min_free_space"]:
272272
self.core.log.warning(_("Not enough space left on device"))

‎pyload/manager/thread/Plugin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def writeDebugReport(self, pyfile):
7272

7373
def getDebugDump(self, pyfile):
7474
dump = "pyLoad %s Debug Report of %s %s \n\nTRACEBACK:\n %s \n\nFRAMESTACK:\n" % (
75-
self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version, format_exc())
75+
self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version__, format_exc())
7676

7777
tb = exc_info()[2]
7878
stack = []

‎pyload/plugin/Account.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ class Account(Base):
1919
Just overwrite `login` and cookies will be stored and account becomes accessible in\
2020
associated hoster plugin. Plugin should also provide `loadAccountInfo`
2121
"""
22-
__name = "Account"
23-
__type = "account"
24-
__version = "0.03"
22+
__name__ = "Account"
23+
__type__ = "account"
24+
__version__ = "0.03"
2525

26-
__description = """Base account plugin"""
27-
__license = "GPLv3"
28-
__authors = [("mkaay", "mkaay@mkaay.de")]
26+
__description__ = """Base account plugin"""
27+
__license__ = "GPLv3"
28+
__authors__ = [("mkaay", "mkaay@mkaay.de")]
2929

3030

3131
#: after that time (in minutes) pyload will relogin the account
@@ -197,7 +197,7 @@ def loadAccountInfo(self, name, req=None):
197197
"maxtraffic" : None,
198198
"premium" : None,
199199
"timestamp" : 0, #: time this info was retrieved
200-
"type" : self.__name}
200+
"type" : self.__name__}
201201

202202

203203
def getAllAccounts(self, force=False):
@@ -210,7 +210,7 @@ def getAccountRequest(self, user=None):
210210
if not user:
211211
return None
212212

213-
req = self.core.requestFactory.getRequest(self.__name, user)
213+
req = self.core.requestFactory.getRequest(self.__name__, user)
214214
return req
215215

216216

@@ -220,7 +220,7 @@ def getAccountCookies(self, user=None):
220220
if not user:
221221
return None
222222

223-
cj = self.core.requestFactory.getCookieJar(self.__name, user)
223+
cj = self.core.requestFactory.getCookieJar(self.__name__, user)
224224
return cj
225225

226226

‎pyload/plugin/Addon.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ class Addon(Base):
2626
"""
2727
Base class for addon plugins.
2828
"""
29-
__name = "Addon"
30-
__type = "addon"
31-
__version = "0.03"
29+
__name__ = "Addon"
30+
__type__ = "addon"
31+
__version__ = "0.03"
3232

33-
__config = [] #: [("name", "type", "desc", "default")]
33+
__config__ = [] #: [("name", "type", "desc", "default")]
3434

35-
__description = """Base addon/hook plugin"""
36-
__license = "GPLv3"
37-
__authors = [("mkaay", "mkaay@mkaay.de"),
35+
__description__ = """Base addon/hook plugin"""
36+
__license__ = "GPLv3"
37+
__authors__ = [("mkaay", "mkaay@mkaay.de"),
3838
("RaNaN", "RaNaN@pyload.org")]
3939

4040

@@ -103,7 +103,7 @@ def _periodical(self, threaded):
103103

104104

105105
def __repr__(self):
106-
return "<Addon %s>" % self.__name
106+
return "<Addon %s>" % self.__name__
107107

108108

109109
def setup(self):
@@ -122,7 +122,7 @@ def unload(self): # Deprecated, use method deactivate() instead
122122

123123
def isActivated(self):
124124
""" checks if addon is activated"""
125-
return self.core.config.getPlugin(self.__name, "activated")
125+
return self.core.config.getPlugin(self.__name__, "activated")
126126

127127

128128
# Event methods - overwrite these if needed

‎pyload/plugin/Captcha.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77

88
class Captcha(Plugin):
9-
__name = "Captcha"
10-
__type = "captcha"
11-
__version = "0.14"
9+
__name__ = "Captcha"
10+
__type__ = "captcha"
11+
__version__ = "0.14"
1212

13-
__description = """Base captcha service plugin"""
14-
__license = "GPLv3"
15-
__authors = [("pyLoad Team", "admin@pyload.org")]
13+
__description__ = """Base captcha service plugin"""
14+
__license__ = "GPLv3"
15+
__authors__ = [("pyLoad Team", "admin@pyload.org")]
1616

1717

1818
KEY_PATTERN = None
@@ -29,17 +29,17 @@ def detect_key(self, html=None):
2929
if hasattr(self.plugin, "html") and self.plugin.html:
3030
html = self.plugin.html
3131
else:
32-
errmsg = _("%s html not found") % self.__name
32+
errmsg = _("%s html not found") % self.__name__
3333
self.plugin.error(errmsg)
3434
raise TypeError(errmsg)
3535

3636
m = re.search(self.KEY_PATTERN, html)
3737
if m:
3838
self.key = m.group("KEY")
39-
self.plugin.logDebug("%s key: %s" % (self.__name, self.key))
39+
self.plugin.logDebug("%s key: %s" % (self.__name__, self.key))
4040
return self.key
4141
else:
42-
self.plugin.logDebug("%s key not found" % self.__name)
42+
self.plugin.logDebug("%s key not found" % self.__name__)
4343
return None
4444

4545

‎pyload/plugin/Container.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212

1313

1414
class Container(Crypter):
15-
__name = "Container"
16-
__type = "container"
17-
__version = "0.01"
15+
__name__ = "Container"
16+
__type__ = "container"
17+
__version__ = "0.01"
1818

19-
__pattern = r'^unmatchable$'
20-
__config = [] #: [("name", "type", "desc", "default")]
19+
__pattern__ = r'^unmatchable$'
20+
__config__ = [] #: [("name", "type", "desc", "default")]
2121

22-
__description = """Base container decrypter plugin"""
23-
__license = "GPLv3"
24-
__authors = [("mkaay", "mkaay@mkaay.de")]
22+
__description__ = """Base container decrypter plugin"""
23+
__license__ = "GPLv3"
24+
__authors__ = [("mkaay", "mkaay@mkaay.de")]
2525

2626

2727
def preprocessing(self, thread):

‎pyload/plugin/Crypter.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77

88

99
class Crypter(Plugin):
10-
__name = "Crypter"
11-
__type = "crypter"
12-
__version = "0.05"
10+
__name__ = "Crypter"
11+
__type__ = "crypter"
12+
__version__ = "0.05"
1313

14-
__pattern = r'^unmatchable$'
15-
__config = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package']
14+
__pattern__ = r'^unmatchable$'
15+
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package']
1616
("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
1717

18-
__description = """Base decrypter plugin"""
19-
__license = "GPLv3"
20-
__authors = [("Walter Purcaro", "vuolter@gmail.com")]
18+
__description__ = """Base decrypter plugin"""
19+
__license__ = "GPLv3"
20+
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
2121

2222

2323
html = None #: last html loaded

0 commit comments

Comments
 (0)