deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 06:59:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

reinstate namespace

Browse Source
This commit is contained in:
deathbybandaid 2019-06-07 19:39:01 -04:00
parent 84d202a779
commit e338543a4d
1 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sopel_modules/SpiceBot/Database.py
View File

@ -45,7 +45,7 @@ class NickValues(BASE):
""" """
__tablename__ = 'spice_nick_values' __tablename__ = 'spice_nick_values'
nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'), primary_key=True) nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'), primary_key=True)
# namespace = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True)
value = Column(Text()) value = Column(Text())
@ -56,7 +56,7 @@ class ChannelValues(BASE):
""" """
__tablename__ = 'spice_channel_values' __tablename__ = 'spice_channel_values'
channel = Column(String(255), primary_key=True) channel = Column(String(255), primary_key=True)
# namespace = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True)
value = Column(Text()) value = Column(Text())
@ -67,7 +67,7 @@ class PluginValues(BASE):
""" """
__tablename__ = 'spice_plugin_values' __tablename__ = 'spice_plugin_values'
plugin = Column(String(255), primary_key=True) plugin = Column(String(255), primary_key=True)
# namespace = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True)
value = Column(Text()) value = Column(Text())
@ -83,10 +83,9 @@ class SpiceDB(object):
nick_id = self.get_nick_id(nick) nick_id = self.get_nick_id(nick)
session = self.ssession() session = self.ssession()
try: try:
# .filter(NickValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(NickValues) \ result = session.query(NickValues) \
.filter(NickValues.nick_id == nick_id) \ .filter(NickValues.nick_id == nick_id) \
.filter(NickValues.namespace == namespace)\
.filter(NickValues.key == key) \ .filter(NickValues.key == key) \
.one_or_none() .one_or_none()
# NickValue exists, update # NickValue exists, update
@ -95,7 +94,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_nickvalue = NickValues(nick_id=nick_id, key=key, value=value) new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=value)
session.add(new_nickvalue) session.add(new_nickvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -109,11 +108,10 @@ class SpiceDB(object):
nick = Identifier(nick) nick = Identifier(nick)
session = self.ssession() session = self.ssession()
try: try:
# .filter(NickValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(NickValues) \ result = session.query(NickValues) \
.filter(Nicknames.nick_id == NickValues.nick_id) \ .filter(Nicknames.nick_id == NickValues.nick_id) \
.filter(Nicknames.slug == nick.lower()) \ .filter(Nicknames.slug == nick.lower()) \
.filter(NickValues.namespace == namespace)\
.filter(NickValues.key == key) \ .filter(NickValues.key == key) \
.one_or_none() .one_or_none()
if result is not None: if result is not None:
@ -131,10 +129,9 @@ class SpiceDB(object):
nick_id = self.get_nick_id(nick) nick_id = self.get_nick_id(nick)
session = self.ssession() session = self.ssession()
try: try:
# .filter(NickValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(NickValues) \ result = session.query(NickValues) \
.filter(NickValues.nick_id == nick_id) \ .filter(NickValues.nick_id == nick_id) \
.filter(NickValues.namespace == namespace)\
.filter(NickValues.key == key) \ .filter(NickValues.key == key) \
.one_or_none() .one_or_none()
# NickValue exists, delete # NickValue exists, delete
@ -154,10 +151,9 @@ class SpiceDB(object):
nick_id = self.get_nick_id(nick) nick_id = self.get_nick_id(nick)
session = self.ssession() session = self.ssession()
try: try:
# .filter(NickValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(NickValues) \ result = session.query(NickValues) \
.filter(NickValues.nick_id == nick_id) \ .filter(NickValues.nick_id == nick_id) \
.filter(NickValues.namespace == namespace)\
.filter(NickValues.key == key) \ .filter(NickValues.key == key) \
.one_or_none() .one_or_none()
# NickValue exists, update # NickValue exists, update
@ -166,7 +162,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_nickvalue = NickValues(nick_id=nick_id, key=key, value=float(value)) new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=float(value))
session.add(new_nickvalue) session.add(new_nickvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -184,10 +180,9 @@ class SpiceDB(object):
nick_id = self.get_nick_id(nick) nick_id = self.get_nick_id(nick)
session = self.ssession() session = self.ssession()
try: try:
# .filter(NickValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(NickValues) \ result = session.query(NickValues) \
.filter(NickValues.nick_id == nick_id) \ .filter(NickValues.nick_id == nick_id) \
.filter(NickValues.namespace == namespace)\
.filter(NickValues.key == key) \ .filter(NickValues.key == key) \
.one_or_none() .one_or_none()
# NickValue exists, update # NickValue exists, update
@ -212,7 +207,7 @@ class SpiceDB(object):
for entry in entries: for entry in entries:
while entry in values: while entry in values:
values.remove(entry) values.remove(entry)
new_nickvalue = NickValues(nick_id=nick_id, key=key, value=values) new_nickvalue = NickValues(nick_id=nick_id, namespace=namespace, key=key, value=values)
session.add(new_nickvalue) session.add(new_nickvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -229,10 +224,9 @@ class SpiceDB(object):
value = json.dumps(value, ensure_ascii=False) value = json.dumps(value, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(ChannelValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(ChannelValues) \ result = session.query(ChannelValues) \
.filter(ChannelValues.channel == channel)\ .filter(ChannelValues.channel == channel)\
.filter(ChannelValues.namespace == namespace)\
.filter(ChannelValues.key == key) \ .filter(ChannelValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, update # ChannelValue exists, update
@ -241,7 +235,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_channelvalue = ChannelValues(channel=channel, key=key, value=value) new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=value)
session.add(new_channelvalue) session.add(new_channelvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -255,10 +249,9 @@ class SpiceDB(object):
channel = Identifier(channel).lower() channel = Identifier(channel).lower()
session = self.ssession() session = self.ssession()
try: try:
# .filter(ChannelValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(ChannelValues) \ result = session.query(ChannelValues) \
.filter(ChannelValues.channel == channel)\ .filter(ChannelValues.channel == channel)\
.filter(ChannelValues.namespace == namespace)\
.filter(ChannelValues.key == key) \ .filter(ChannelValues.key == key) \
.one_or_none() .one_or_none()
if result is not None: if result is not None:
@ -275,10 +268,9 @@ class SpiceDB(object):
channel = Identifier(channel).lower() channel = Identifier(channel).lower()
session = self.ssession() session = self.ssession()
try: try:
# .filter(ChannelValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(ChannelValues) \ result = session.query(ChannelValues) \
.filter(ChannelValues.channel == channel)\ .filter(ChannelValues.channel == channel)\
.filter(ChannelValues.namespace == namespace)\
.filter(ChannelValues.key == key) \ .filter(ChannelValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, delete # ChannelValue exists, delete
@ -297,10 +289,9 @@ class SpiceDB(object):
value = json.dumps(value, ensure_ascii=False) value = json.dumps(value, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(ChannelValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(ChannelValues) \ result = session.query(ChannelValues) \
.filter(ChannelValues.channel == channel)\ .filter(ChannelValues.channel == channel)\
.filter(ChannelValues.namespace == namespace)\
.filter(ChannelValues.key == key) \ .filter(ChannelValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, update # ChannelValue exists, update
@ -309,7 +300,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_channelvalue = ChannelValues(channel=channel, key=key, value=float(value)) new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=float(value))
session.add(new_channelvalue) session.add(new_channelvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -326,10 +317,9 @@ class SpiceDB(object):
entries = json.dumps(entries, ensure_ascii=False) entries = json.dumps(entries, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(ChannelValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(ChannelValues) \ result = session.query(ChannelValues) \
.filter(ChannelValues.channel == channel)\ .filter(ChannelValues.channel == channel)\
.filter(ChannelValues.namespace == namespace)\
.filter(ChannelValues.key == key) \ .filter(ChannelValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, update # ChannelValue exists, update
@ -354,7 +344,7 @@ class SpiceDB(object):
for entry in entries: for entry in entries:
while entry in values: while entry in values:
values.remove(entry) values.remove(entry)
new_channelvalue = ChannelValues(channel=channel, key=key, value=values) new_channelvalue = ChannelValues(channel=channel, namespace=namespace, key=key, value=values)
session.add(new_channelvalue) session.add(new_channelvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -371,10 +361,9 @@ class SpiceDB(object):
value = json.dumps(value, ensure_ascii=False) value = json.dumps(value, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(PluginValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(PluginValues) \ result = session.query(PluginValues) \
.filter(PluginValues.plugin == plugin)\ .filter(PluginValues.plugin == plugin)\
.filter(PluginValues.namespace == namespace)\
.filter(PluginValues.key == key) \ .filter(PluginValues.key == key) \
.one_or_none() .one_or_none()
# PluginValues exists, update # PluginValues exists, update
@ -383,7 +372,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_pluginvalue = PluginValues(plugin=plugin, key=key, value=value) new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=value)
session.add(new_pluginvalue) session.add(new_pluginvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -397,10 +386,9 @@ class SpiceDB(object):
plugin = Identifier(plugin).lower() plugin = Identifier(plugin).lower()
session = self.ssession() session = self.ssession()
try: try:
# .filter(PluginValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(PluginValues) \ result = session.query(PluginValues) \
.filter(PluginValues.plugin == plugin)\ .filter(PluginValues.plugin == plugin)\
.filter(PluginValues.namespace == namespace)\
.filter(PluginValues.key == key) \ .filter(PluginValues.key == key) \
.one_or_none() .one_or_none()
if result is not None: if result is not None:
@ -417,10 +405,9 @@ class SpiceDB(object):
plugin = Identifier(plugin).lower() plugin = Identifier(plugin).lower()
session = self.ssession() session = self.ssession()
try: try:
# .filter(PluginValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(PluginValues) \ result = session.query(PluginValues) \
.filter(PluginValues.plugin == plugin)\ .filter(PluginValues.plugin == plugin)\
.filter(PluginValues.namespace == namespace)\
.filter(PluginValues.key == key) \ .filter(PluginValues.key == key) \
.one_or_none() .one_or_none()
# PluginValues exists, delete # PluginValues exists, delete
@ -439,10 +426,9 @@ class SpiceDB(object):
value = json.dumps(value, ensure_ascii=False) value = json.dumps(value, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(PluginValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(PluginValues) \ result = session.query(PluginValues) \
.filter(PluginValues.plugin == plugin)\ .filter(PluginValues.plugin == plugin)\
.filter(PluginValues.namespace == namespace)\
.filter(PluginValues.key == key) \ .filter(PluginValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, update # ChannelValue exists, update
@ -451,7 +437,7 @@ class SpiceDB(object):
session.commit() session.commit()
# DNE - Insert # DNE - Insert
else: else:
new_pluginvalue = PluginValues(plugin=plugin, key=key, value=float(value)) new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=float(value))
session.add(new_pluginvalue) session.add(new_pluginvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError:
@ -468,10 +454,9 @@ class SpiceDB(object):
entries = json.dumps(entries, ensure_ascii=False) entries = json.dumps(entries, ensure_ascii=False)
session = self.ssession() session = self.ssession()
try: try:
# .filter(PluginValues.namespace == namespace)\
key = namespace + "_" + key
result = session.query(PluginValues) \ result = session.query(PluginValues) \
.filter(PluginValues.plugin == plugin)\ .filter(PluginValues.plugin == plugin)\
.filter(PluginValues.namespace == namespace)\
.filter(PluginValues.key == key) \ .filter(PluginValues.key == key) \
.one_or_none() .one_or_none()
# ChannelValue exists, update # ChannelValue exists, update
@ -496,8 +481,7 @@ class SpiceDB(object):
for entry in entries: for entry in entries:
while entry in values: while entry in values:
values.remove(entry) values.remove(entry)
new_pluginvalue = PluginValues(plugin=plugin, key=key, value=values) new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=values)
# new_pluginvalue = PluginValues(plugin=plugin, namespace=namespace, key=key, value=values)
session.add(new_pluginvalue) session.add(new_pluginvalue)
session.commit() session.commit()
except SQLAlchemyError: except SQLAlchemyError: