Fix some derps
Need to move module init code after the functions it calls, also forgot the sanction definitions for 11-14 points.
This commit is contained in:
parent
2151df4fef
commit
adea98e3ed
47
src/db.py
47
src/db.py
@ -9,28 +9,6 @@ from collections import defaultdict
|
|||||||
# they do not run by default for performance reasons
|
# they do not run by default for performance reasons
|
||||||
SCHEMA_VERSION = 1
|
SCHEMA_VERSION = 1
|
||||||
|
|
||||||
need_install = not os.path.isfile("data.sqlite3")
|
|
||||||
conn = sqlite3.connect("data.sqlite3")
|
|
||||||
with conn:
|
|
||||||
c = conn.cursor()
|
|
||||||
c.execute("PRAGMA foreign_keys = ON")
|
|
||||||
if need_install:
|
|
||||||
_install()
|
|
||||||
c.execute("PRAGMA user_version")
|
|
||||||
row = c.fetchone()
|
|
||||||
if row[0] == 0:
|
|
||||||
# new schema does not exist yet, migrate from old schema
|
|
||||||
# NOTE: game stats are NOT migrated to the new schema; the old gamestats table
|
|
||||||
# will continue to exist to allow queries against it, however given how horribly
|
|
||||||
# inaccurate the stats on it are, it would be a disservice to copy those inaccurate
|
|
||||||
# statistics over to the new schema which has the capability of actually being accurate.
|
|
||||||
_migrate()
|
|
||||||
elif row[0] < SCHEMA_VERSION:
|
|
||||||
_upgrade()
|
|
||||||
c.close()
|
|
||||||
|
|
||||||
del need_install, c
|
|
||||||
|
|
||||||
def init_vars():
|
def init_vars():
|
||||||
with var.GRAVEYARD_LOCK:
|
with var.GRAVEYARD_LOCK:
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
@ -128,8 +106,6 @@ def init_vars():
|
|||||||
if host is not None:
|
if host is not None:
|
||||||
var.DENY[host].add(command)
|
var.DENY[host].add(command)
|
||||||
|
|
||||||
init_vars()
|
|
||||||
|
|
||||||
def decrement_stasis(acc=None, hostmask=None):
|
def decrement_stasis(acc=None, hostmask=None):
|
||||||
peid, plid = _get_ids(acc, hostmask)
|
peid, plid = _get_ids(acc, hostmask)
|
||||||
if (acc is not None or hostmask is not None) and peid is None:
|
if (acc is not None or hostmask is not None) and peid is None:
|
||||||
@ -795,4 +771,27 @@ def _set_thing(thing, val, acc, hostmask, raw=False):
|
|||||||
def _toggle_thing(thing, acc, hostmask):
|
def _toggle_thing(thing, acc, hostmask):
|
||||||
_set_thing(thing, "CASE {0} WHEN 1 THEN 0 ELSE 1 END".format(thing), acc, hostmask, raw=True)
|
_set_thing(thing, "CASE {0} WHEN 1 THEN 0 ELSE 1 END".format(thing), acc, hostmask, raw=True)
|
||||||
|
|
||||||
|
need_install = not os.path.isfile("data.sqlite3")
|
||||||
|
conn = sqlite3.connect("data.sqlite3")
|
||||||
|
with conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("PRAGMA foreign_keys = ON")
|
||||||
|
if need_install:
|
||||||
|
_install()
|
||||||
|
c.execute("PRAGMA user_version")
|
||||||
|
row = c.fetchone()
|
||||||
|
if row[0] == 0:
|
||||||
|
# new schema does not exist yet, migrate from old schema
|
||||||
|
# NOTE: game stats are NOT migrated to the new schema; the old gamestats table
|
||||||
|
# will continue to exist to allow queries against it, however given how horribly
|
||||||
|
# inaccurate the stats on it are, it would be a disservice to copy those inaccurate
|
||||||
|
# statistics over to the new schema which has the capability of actually being accurate.
|
||||||
|
_migrate()
|
||||||
|
elif row[0] < SCHEMA_VERSION:
|
||||||
|
_upgrade()
|
||||||
|
c.close()
|
||||||
|
|
||||||
|
del need_install, c
|
||||||
|
init_vars()
|
||||||
|
|
||||||
# vim: set expandtab:sw=4:ts=4:
|
# vim: set expandtab:sw=4:ts=4:
|
||||||
|
@ -82,6 +82,7 @@ AUTO_SANCTION = (
|
|||||||
(1, 4, {"ack": True}),
|
(1, 4, {"ack": True}),
|
||||||
(5, 9, {"stasis": 1}),
|
(5, 9, {"stasis": 1}),
|
||||||
(10, 10, {"ack": True, "stasis": 3}),
|
(10, 10, {"ack": True, "stasis": 3}),
|
||||||
|
(11, 14, {"stasis": 3}),
|
||||||
(15, 24, {"scalestasis": (0, 1, -10)}),
|
(15, 24, {"scalestasis": (0, 1, -10)}),
|
||||||
(25, 25, {"tempban": 15})
|
(25, 25, {"tempban": 15})
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user