From 6eae782f13953dd0ba2bbe1b582cf33fd4d7d90a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 19 Dec 2011 23:10:49 +0100 Subject: configparser v2, warning CONFIG will be DELETED. --- module/config/ConfigParser.py | 251 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 module/config/ConfigParser.py (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py new file mode 100644 index 000000000..01f4268cb --- /dev/null +++ b/module/config/ConfigParser.py @@ -0,0 +1,251 @@ +# -*- coding: utf-8 -*- + +from __future__ import with_statement +from time import sleep +from os.path import exists +from gettext import gettext + +from module.utils import chmod, decode + +CONF_VERSION = 2 + +from converter import from_string +from new_collections import namedtuple, OrderedDict +from default import make_config + +SectionTuple = namedtuple("SectionTuple", "name description long_desc config") +ConfigData = namedtuple("ConfigData", "name type description default") + +class ConfigParser: + """ + Holds and manage the configuration + meta data. + Actually only the values are read from disk, all meta data have to be provided first via addConfigSection. + """ + + CONFIG = "pyload.conf" + PLUGIN = "plugin.conf" + + def __init__(self): + """Constructor""" + + # core config sections from pyload + self.baseSections = [] + + # Meta data information + self.config = OrderedDict() + # The actual config values + self.values = {} + + self.changeCB = None # callback when config value was changed + + self.checkVersion() + + self.loadDefault() + self.parseValues(self.CONFIG) + + def loadDefault(self): + make_config(self) + + def checkVersion(self): + """Determines if config need to be deleted""" + e = None + # workaround conflict, with GUI (which also access the config) so try read in 3 times + for i in range(0, 3): + try: + for conf in (self.CONFIG, self.PLUGIN): + if exists(conf): + f = open(conf, "rb") + v = f.readline() + f.close() + v = v[v.find(":") + 1:].strip() + + if not v or int(v) < CONF_VERSION: + f = open(conf, "wb") + f.write("version: " + str(CONF_VERSION)) + f.close() + print "Old version of %s deleted" % conf + + except Exception, ex: + e = ex + sleep(0.3) + if e: raise e + + + def parseValues(self, filename): + """read config values from file""" + f = open(filename, "rb") + config = f.readlines()[1:] + + # save the current section + section = "" + + for line in config: + line = line.strip() + + # comment line, different variants + if not line or line.startswith("#") or line.startswith("//") or line.startswith(";"): continue + + if line.startswith("["): + section = line.replace("[", "").replace("]", "") + + if section not in self.config: + print "Unrecognzied section", section + section = "" + + else: + name, non, value = line.rpartition("=") + name = name.strip() + value = value.strip() + + if not section: + print "Value without section", name + continue + + if name in self.config[section].config: + self.set(section, name, value) + else: + print "Unrecognized option", section, name + + + def save(self): + """saves config to filename""" + + # seperate pyload and plugin conf + configs = [] + for c in (self.CONFIG, self.PLUGIN): + f = open(c, "wb") + configs.append(f) + chmod(c) + f.write("version: %i\n\n" % CONF_VERSION) + + + # write on 2 files + for section, data in self.config.iteritems(): + f = configs[0] if section in self.baseSections else configs[1] + + f.write("[%s]\n" % section) + + for option, data in data.config.iteritems(): + value = self.get(section, option) + if type(value) == unicode: value = value.encode("utf8") + else: value = str(value) + + f.write('%s = %s\n' % (option, value)) + + f.write("\n") + + [f.close() for f in configs] + + def __getitem__(self, section): + """provides dictonary like access: c['section']['option']""" + return Section(self, section) + + def get(self, section, option): + """get value""" + if option in self.values[section]: + return self.values[section][option] + else: + return self.config[section].config[option].default + + def set(self, section, option, value): + """set value""" + + data = self.config[section].config[option] + value = from_string(value, data.type) + + # only save when different to defaul values + if value != data.default or (option in self.values[section] and value != self.values[section][option]): + self.values[section][option] = value + if self.changeCB: self.changeCB(section, option, value) + self.save() + + def getPlugin(self, *args): + """gets a value for a plugin""" + ret = self.get(*args) + print "Deprecated method getPlugin%s -> %s" % (str(args), ret) + return ret + + def setPlugin(self, *args): + """sets a value for a plugin""" + print "Deprecated method setPlugin%s" % str(args) + self.set(*args) + + def getMetaData(self, section, option): + """ get all config data for an option """ + return self.config[section].config[option] + + def getBaseSections(self): + for section, data in self.config.iteritems(): + if section in self.baseSections: + yield section, data + return + + def getPluginSections(self): + for section, data in self.config.iteritems(): + if section not in self.baseSections: + yield section, data + return + + def addConfigSection(self, section, name, desc, long_desc, config, base=False): + """Adds a section to the config. `config` is a list of config tuples as used in plugin api definied as: + Either (name, type, verbose_name, default_value) or + (name, type, verbose_name, short_description, default_value) + The ordner of the config elements are preserved with OrdererDict + """ + d = OrderedDict() + + for entry in config: + if len(entry) == 5: + conf_name, type, conf_desc, conf_verbose, default = entry + else: # config options without tooltip / description + conf_name, type, conf_desc, default = entry + conf_verbose = "" + + d[conf_name] = ConfigData(gettext(conf_desc), type, gettext(conf_verbose), from_string(default, type)) + + if base: + self.baseSections.append(section) + else: + if section in self.config: + print "Section already exists", section + return + + data = SectionTuple(gettext(name), gettext(desc), gettext(long_desc), d) + self.config[section] = data + + if section not in self.values: + self.values[section] = {} + +class Section: + """provides dictionary like access for configparser""" + + def __init__(self, parser, section): + """Constructor""" + self.parser = parser + self.section = section + + def __getitem__(self, item): + """getitem""" + return self.parser.get(self.section, item) + + def __setitem__(self, item, value): + """setitem""" + self.parser.set(self.section, item, value) + + +if __name__ == "__main__": + pypath = "" + + from time import time + + a = time() + + c = ConfigParser() + + b = time() + + print "sec", b - a + + print c.config + + c.saveConfig(c.config, "user.conf") -- cgit v1.2.3 From c9a359b75905d4910e42127cef8cbe62d4a13657 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 20 Dec 2011 21:35:43 +0100 Subject: some bugfixes --- module/config/ConfigParser.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index 01f4268cb..33b3d26b6 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -102,7 +102,7 @@ class ConfigParser: continue if name in self.config[section].config: - self.set(section, name, value) + self.set(section, name, value, sync=False) else: print "Unrecognized option", section, name @@ -147,7 +147,7 @@ class ConfigParser: else: return self.config[section].config[option].default - def set(self, section, option, value): + def set(self, section, option, value, sync=True): """set value""" data = self.config[section].config[option] @@ -156,8 +156,9 @@ class ConfigParser: # only save when different to defaul values if value != data.default or (option in self.values[section] and value != self.values[section][option]): self.values[section][option] = value - if self.changeCB: self.changeCB(section, option, value) - self.save() + if sync: + if self.changeCB: self.changeCB(section, option, value) + self.save() def getPlugin(self, *args): """gets a value for a plugin""" @@ -204,7 +205,7 @@ class ConfigParser: d[conf_name] = ConfigData(gettext(conf_desc), type, gettext(conf_verbose), from_string(default, type)) if base: - self.baseSections.append(section) + if section not in self.baseSections: self.baseSections.append(section) else: if section in self.config: print "Section already exists", section -- cgit v1.2.3 From 958bf611f5d9d117f19f824990ec6fd6b537e967 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 22 Dec 2011 23:45:38 +0100 Subject: accountmanager v2, delete your accounts.conf and re-enter them in pyload, new nice debug functions, try core.shell() and core.breakpoint() --- module/config/ConfigParser.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index 33b3d26b6..1d3ae87d6 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -206,10 +206,6 @@ class ConfigParser: if base: if section not in self.baseSections: self.baseSections.append(section) - else: - if section in self.config: - print "Section already exists", section - return data = SectionTuple(gettext(name), gettext(desc), gettext(long_desc), d) self.config[section] = data -- cgit v1.2.3 From 00f2d311d806aa3585dbabfc2d66b797be3f2664 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 23 Dec 2011 21:24:34 +0100 Subject: little fixes --- module/config/ConfigParser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index 1d3ae87d6..82c6a9f91 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -5,7 +5,7 @@ from time import sleep from os.path import exists from gettext import gettext -from module.utils import chmod, decode +from module.utils import chmod CONF_VERSION = 2 @@ -206,6 +206,8 @@ class ConfigParser: if base: if section not in self.baseSections: self.baseSections.append(section) + elif section in self.baseSections: + return # would overwrite base section data = SectionTuple(gettext(name), gettext(desc), gettext(long_desc), d) self.config[section] = data -- cgit v1.2.3 From d35c003cc53d4723d1dfe0d81eeb9bea78cee594 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 31 Dec 2011 16:01:24 +0100 Subject: new crypter plugin API, now decrypting possible for now. --- module/config/ConfigParser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index 82c6a9f91..d7ecab5a0 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -5,7 +5,7 @@ from time import sleep from os.path import exists from gettext import gettext -from module.utils import chmod +from module.utils.fs import chmod CONF_VERSION = 2 @@ -64,6 +64,10 @@ class ConfigParser: f.write("version: " + str(CONF_VERSION)) f.close() print "Old version of %s deleted" % conf + else: + f = open(conf, "wb") + f.write("version:" + str(CONF_VERSION)) + f.close() except Exception, ex: e = ex @@ -115,7 +119,7 @@ class ConfigParser: for c in (self.CONFIG, self.PLUGIN): f = open(c, "wb") configs.append(f) - chmod(c) + chmod(c, 0600) f.write("version: %i\n\n" % CONF_VERSION) -- cgit v1.2.3 From 6eaa7bb25e2254c80c43fe46166142d590e86c64 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 7 Jan 2012 23:58:28 +0100 Subject: some cleanups --- module/config/ConfigParser.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index d7ecab5a0..a9e74dd20 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -4,15 +4,14 @@ from __future__ import with_statement from time import sleep from os.path import exists from gettext import gettext +from new_collections import namedtuple, OrderedDict +from module.utils import from_string from module.utils.fs import chmod -CONF_VERSION = 2 - -from converter import from_string -from new_collections import namedtuple, OrderedDict from default import make_config +CONF_VERSION = 2 SectionTuple = namedtuple("SectionTuple", "name description long_desc config") ConfigData = namedtuple("ConfigData", "name type description default") -- cgit v1.2.3 From b40b32ee05f611323a7827fad2a25fa0a28dcb24 Mon Sep 17 00:00:00 2001 From: X3n0m0rph59 Date: Sun, 22 Apr 2012 19:56:17 +0200 Subject: a huge pile of spelling fixes --- module/config/ConfigParser.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index a9e74dd20..9cc9f1fbe 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -17,8 +17,8 @@ ConfigData = namedtuple("ConfigData", "name type description default") class ConfigParser: """ - Holds and manage the configuration + meta data. - Actually only the values are read from disk, all meta data have to be provided first via addConfigSection. + Holds and manages the configuration + meta data. + Actually only the values are read from disk, all meta data has to be provided first via addConfigSection. """ CONFIG = "pyload.conf" @@ -46,9 +46,9 @@ class ConfigParser: make_config(self) def checkVersion(self): - """Determines if config need to be deleted""" + """Determines if config needs to be deleted""" e = None - # workaround conflict, with GUI (which also access the config) so try read in 3 times + # workaround conflict, with GUI (which also accesses the config) so try read in 3 times for i in range(0, 3): try: for conf in (self.CONFIG, self.PLUGIN): @@ -92,7 +92,7 @@ class ConfigParser: section = line.replace("[", "").replace("]", "") if section not in self.config: - print "Unrecognzied section", section + print "Unrecognized section", section section = "" else: @@ -113,7 +113,7 @@ class ConfigParser: def save(self): """saves config to filename""" - # seperate pyload and plugin conf + # separate pyload and plugin conf configs = [] for c in (self.CONFIG, self.PLUGIN): f = open(c, "wb") @@ -140,7 +140,7 @@ class ConfigParser: [f.close() for f in configs] def __getitem__(self, section): - """provides dictonary like access: c['section']['option']""" + """provides dictionary like access: c['section']['option']""" return Section(self, section) def get(self, section, option): @@ -156,7 +156,7 @@ class ConfigParser: data = self.config[section].config[option] value = from_string(value, data.type) - # only save when different to defaul values + # only save when different to default values if value != data.default or (option in self.values[section] and value != self.values[section][option]): self.values[section][option] = value if sync: @@ -191,10 +191,10 @@ class ConfigParser: return def addConfigSection(self, section, name, desc, long_desc, config, base=False): - """Adds a section to the config. `config` is a list of config tuples as used in plugin api definied as: + """Adds a section to the config. `config` is a list of config tuples as used in plugin api defined as: Either (name, type, verbose_name, default_value) or (name, type, verbose_name, short_description, default_value) - The ordner of the config elements are preserved with OrdererDict + The order of the config elements is preserved with OrderedDict """ d = OrderedDict() -- cgit v1.2.3 From 560958b70043ea5b7e0e32d41cb51bd44696d775 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 9 Sep 2012 15:39:50 +0200 Subject: new config api --- module/config/ConfigParser.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/config/ConfigParser.py') diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index 9cc9f1fbe..3cad67bc2 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -17,8 +17,7 @@ ConfigData = namedtuple("ConfigData", "name type description default") class ConfigParser: """ - Holds and manages the configuration + meta data. - Actually only the values are read from disk, all meta data has to be provided first via addConfigSection. + Holds and manages the configuration + meta data for core and every user. """ CONFIG = "pyload.conf" -- cgit v1.2.3