codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-24 18:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Plugins] Replace pkg_resources for abspath and decode path

Browse Source 
- Use a BASE_PATH constant.
 - pkg_resources caches the files in python_egg_cache which is not
   required for plugins and causes issues with non-ascii paths.
This commit is contained in:
Calum Lind 2017-03-17 12:45:25 +00:00
parent bdb3b509ad
commit 85364dc8ab
11 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deluge/plugins/AutoAdd/deluge/plugins/autoadd/common.py
View File

@ -14,10 +14,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.autoadd', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Blocklist/deluge/plugins/blocklist/common.py
View File

@ -9,15 +9,17 @@
from __future__ import unicode_literals
import os.path
from functools import wraps
from os.path import join
from sys import exc_info
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.blocklist', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)
def raises_errors_as(error):

8
deluge/plugins/Execute/deluge/plugins/execute/common.py
View File

@ -9,10 +9,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.execute', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Extractor/deluge/plugins/extractor/common.py
View File

@ -9,10 +9,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.extractor', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Label/deluge/plugins/label/common.py
View File

@ -9,10 +9,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.label', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Notifications/deluge/plugins/notifications/common.py
View File

@ -15,19 +15,21 @@
from __future__ import unicode_literals
import logging
from os.path import join
import os.path
from twisted.internet import defer
from deluge import component
from deluge.common import resource_filename
from deluge.common import decode_bytes
from deluge.event import known_events
log = logging.getLogger(__name__)
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.notifications', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)
class CustomNotifications(object):

8
deluge/plugins/Scheduler/deluge/plugins/scheduler/common.py
View File

@ -13,10 +13,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.scheduler', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Stats/deluge/plugins/stats/common.py
View File

@ -9,10 +9,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.stats', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/Toggle/deluge/plugins/toggle/common.py
View File

@ -14,10 +14,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.toggle', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

8
deluge/plugins/WebUi/deluge/plugins/webui/common.py
View File

@ -13,10 +13,12 @@
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import resource_filename
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
def get_resource(filename):
return resource_filename('deluge.plugins.webui', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)

10
deluge/scripts/create_plugin.py
View File

@ -210,12 +210,16 @@ COMMON = """
from __future__ import unicode_literals
from os.path import join
import os.path
from deluge.common import decode_bytes
BASE_PATH = decode_bytes(os.path.abspath(os.path.dirname(__file__)))
from deluge.common import resource_filename
def get_resource(filename):
return resource_filename('deluge.plugins.%(safe_name)s', join('data', filename))
return os.path.join(BASE_PATH, 'data', filename)
"""
GTKUI = """