diff --git a/LastFM/local/accountsdb.py b/LastFM/local/accountsdb.py index 7893873..65296ca 100644 --- a/LastFM/local/accountsdb.py +++ b/LastFM/local/accountsdb.py @@ -1,4 +1,4 @@ -# Autogenerated by update-modules.py on Wed Jan 2 19:43:14 2019 - DO NOT EDIT THIS COPY DIRECTLY! +# Autogenerated by update-modules.py on Sat Mar 9 11:14:30 2019 - DO NOT EDIT THIS COPY DIRECTLY! ### # Copyright (c) 2019, James Lu # All rights reserved. @@ -58,7 +58,7 @@ class AccountsDB(): ident@host if they are not logged in. """ - def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE): + def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE, case_sensitive=False): """ Loads the existing database, creating a new one in memory if none exists. @@ -66,6 +66,7 @@ class AccountsDB(): self.db = {} self._plugin_name = plugin_name self.filename = conf.supybot.directories.data.dirize(filename) + self.case_sensitive = case_sensitive self.addressing_mode = addressing_mode @@ -75,6 +76,13 @@ class AccountsDB(): except Exception as e: log.debug('%s: Unable to load database, creating ' 'a new one: %s', self._plugin_name, e) + else: + if not case_sensitive: + for key, val in self.db.copy().items(): + if not key.islower(): + log.debug('%s: case-shifting key %s to %s', self._plugin_name, key, key.lower()) + self.db[key.lower()] = val + del self.db[key] def flush(self): """Exports the database to a file.""" @@ -103,11 +111,18 @@ class AccountsDB(): def set(self, prefix, newId): """Sets a user ID given the user's prefix.""" user = self._get_key(prefix) + + if not self.case_sensitive: + user = user.lower() self.db[user] = newId def get(self, prefix): """Sets a user ID given the user's prefix.""" - user = self._get_key(prefix) + user = self._get_key(prefix) + log.debug('%s: looking up prefix %s; got user %s', self._plugin_name, prefix, user) + + if not self.case_sensitive: + user = user.lower() # Automatically returns None if entry does not exist return self.db.get(user) diff --git a/NuWeather/local/accountsdb.py b/NuWeather/local/accountsdb.py index 7893873..65296ca 100644 --- a/NuWeather/local/accountsdb.py +++ b/NuWeather/local/accountsdb.py @@ -1,4 +1,4 @@ -# Autogenerated by update-modules.py on Wed Jan 2 19:43:14 2019 - DO NOT EDIT THIS COPY DIRECTLY! +# Autogenerated by update-modules.py on Sat Mar 9 11:14:30 2019 - DO NOT EDIT THIS COPY DIRECTLY! ### # Copyright (c) 2019, James Lu # All rights reserved. @@ -58,7 +58,7 @@ class AccountsDB(): ident@host if they are not logged in. """ - def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE): + def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE, case_sensitive=False): """ Loads the existing database, creating a new one in memory if none exists. @@ -66,6 +66,7 @@ class AccountsDB(): self.db = {} self._plugin_name = plugin_name self.filename = conf.supybot.directories.data.dirize(filename) + self.case_sensitive = case_sensitive self.addressing_mode = addressing_mode @@ -75,6 +76,13 @@ class AccountsDB(): except Exception as e: log.debug('%s: Unable to load database, creating ' 'a new one: %s', self._plugin_name, e) + else: + if not case_sensitive: + for key, val in self.db.copy().items(): + if not key.islower(): + log.debug('%s: case-shifting key %s to %s', self._plugin_name, key, key.lower()) + self.db[key.lower()] = val + del self.db[key] def flush(self): """Exports the database to a file.""" @@ -103,11 +111,18 @@ class AccountsDB(): def set(self, prefix, newId): """Sets a user ID given the user's prefix.""" user = self._get_key(prefix) + + if not self.case_sensitive: + user = user.lower() self.db[user] = newId def get(self, prefix): """Sets a user ID given the user's prefix.""" - user = self._get_key(prefix) + user = self._get_key(prefix) + log.debug('%s: looking up prefix %s; got user %s', self._plugin_name, prefix, user) + + if not self.case_sensitive: + user = user.lower() # Automatically returns None if entry does not exist return self.db.get(user) diff --git a/accountsdb.py b/accountsdb.py index 9cb1cec..99442d6 100644 --- a/accountsdb.py +++ b/accountsdb.py @@ -57,7 +57,7 @@ class AccountsDB(): ident@host if they are not logged in. """ - def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE): + def __init__(self, plugin_name, filename, addressing_mode=DEFAULT_MODE, case_sensitive=False): """ Loads the existing database, creating a new one in memory if none exists. @@ -65,6 +65,7 @@ class AccountsDB(): self.db = {} self._plugin_name = plugin_name self.filename = conf.supybot.directories.data.dirize(filename) + self.case_sensitive = case_sensitive self.addressing_mode = addressing_mode @@ -74,6 +75,13 @@ class AccountsDB(): except Exception as e: log.debug('%s: Unable to load database, creating ' 'a new one: %s', self._plugin_name, e) + else: + if not case_sensitive: + for key, val in self.db.copy().items(): + if not key.islower(): + log.debug('%s: case-shifting key %s to %s', self._plugin_name, key, key.lower()) + self.db[key.lower()] = val + del self.db[key] def flush(self): """Exports the database to a file.""" @@ -102,11 +110,18 @@ class AccountsDB(): def set(self, prefix, newId): """Sets a user ID given the user's prefix.""" user = self._get_key(prefix) + + if not self.case_sensitive: + user = user.lower() self.db[user] = newId def get(self, prefix): """Sets a user ID given the user's prefix.""" - user = self._get_key(prefix) + user = self._get_key(prefix) + log.debug('%s: looking up prefix %s; got user %s', self._plugin_name, prefix, user) + + if not self.case_sensitive: + user = user.lower() # Automatically returns None if entry does not exist return self.db.get(user)