KevinMidboe/delugeClient
1
0
Fork 0
mirror of https://github.com/KevinMidboe/delugeClient.git synced 2025-10-29 12:00:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils imported as file not directory. Moved getConfig function up.

Browse Source
This commit is contained in:
Kevin
2018-05-13 20:00:58 +02:00
parent 51461cee5e
commit 7fcb14c2ca
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
deluge_cli.py
View File

@@ -42,7 +42,7 @@ from pprint import pprint
from deluge_client import DelugeRPCClient from deluge_client import DelugeRPCClient
from sshtunnel import SSHTunnelForwarder from sshtunnel import SSHTunnelForwarder
from docopt import docopt from docopt import docopt
from utils import ColorizeFilter, convert from .utils import ColorizeFilter, convert
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -61,13 +61,33 @@ logger.addHandler(ch)
logger.addFilter(ColorizeFilter()) logger.addFilter(ColorizeFilter())
def getConfig():
"""
Read path and get configuartion file with site settings
:return: config settings read from 'config.ini'
:rtype: configparser.ConfigParser
"""
config = configparser.ConfigParser()
config_dir = os.path.join(BASE_DIR, 'config.ini')
config.read(config_dir)
config_values = list(dict(config.items('Deluge')).values())
config_values.extend(list(dict(config.items('ssh')).values()))
if any(value.startswith('YOUR') for value in config_values):
raise ValueError('Please set variables in config.ini file.')
return config
def split_words(string): def split_words(string):
logger.debug('Splitting input: {} (type: {}) with split_words'.format(string, type(string))) logger.debug('Splitting input: {} (type: {}) with split_words'.format(string, type(string)))
return re.findall(r"[\w\d']+", string.lower()) return re.findall(r"[\w\d']+", string.lower())
class Deluge(object): class Deluge(object):
"""docstring for ClassName""" """docstring for ClassName"""
def __init__(self, config=None): def __init__(self):
config = getConfig()
self.host = config['Deluge']['HOST'] self.host = config['Deluge']['HOST']
self.port = int(config['Deluge']['PORT']) self.port = int(config['Deluge']['PORT'])
self.user = config['Deluge']['USER'] self.user = config['Deluge']['USER']
@@ -212,24 +232,6 @@ class Torrent(object):
return "Name: {}, Progress: {}%, ETA: {}, State: {}, Paused: {}".format( return "Name: {}, Progress: {}%, ETA: {}, State: {}, Paused: {}".format(
self.name, self.progress, self.eta, self.state, self.paused) self.name, self.progress, self.eta, self.state, self.paused)
def getConfig():
"""
Read path and get configuartion file with site settings
:return: config settings read from 'config.ini'
:rtype: configparser.ConfigParser
"""
config = configparser.ConfigParser()
config_dir = os.path.join(BASE_DIR, 'config.ini')
config.read(config_dir)
config_values = list(dict(config.items('Deluge')).values())
config_values.extend(list(dict(config.items('ssh')).values()))
if any(value.startswith('YOUR') for value in config_values):
raise ValueError('Please set variables in config.ini file.')
return config
def signal_handler(signal, frame): def signal_handler(signal, frame):
""" """
Handle exit by Keyboardinterrupt Handle exit by Keyboardinterrupt
@@ -257,8 +259,7 @@ def main():
logger.debug(arguments) logger.debug(arguments)
# Get config settings # Get config settings
config_settings = getConfig() deluge = Deluge()
deluge = Deluge(config=config_settings)
_id = arguments['TORRENT'] _id = arguments['TORRENT']
query = arguments['NAME'] query = arguments['NAME']