Correction du lock de la sqlite
This commit is contained in:
parent
6d9a993d0a
commit
e7383cfc0e
2 changed files with 33 additions and 13 deletions
|
@ -1,5 +1,5 @@
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from users.models import user
|
from users.models import User
|
||||||
from machines.models import Machine,Interface
|
from machines.models import Machine,Interface
|
||||||
SQLITE_FILENAME = '/var/www/re2o/players.db'
|
SQLITE_FILENAME = '/var/www/re2o/players.db'
|
||||||
|
|
||||||
|
@ -8,15 +8,25 @@ def connect_sqlite():
|
||||||
return sqlite3.connect(SQLITE_FILENAME)
|
return sqlite3.connect(SQLITE_FILENAME)
|
||||||
|
|
||||||
# Connexion à la base SQLite locale
|
# Connexion à la base SQLite locale
|
||||||
con_sqlite = connect_sqlite()
|
con = connect_sqlite()
|
||||||
cur_sqlite = con_sqlite.cursor()
|
cur = con.cursor()
|
||||||
# cur_sqlite.execute('''create table players (id,prenom,nom, etat)''')
|
# cur.execute('''create table players (id,prenom,nom, etat)''')
|
||||||
# cur_sqlite.execute('''create table machines (id,uid_user,ip)''')
|
# cur.execute('''create table machines (id,uid_user,ip)''')
|
||||||
|
cur.execute("""select id from players""")
|
||||||
|
players = cur.fetchall()
|
||||||
|
players = [player[0] for player in players]
|
||||||
|
|
||||||
|
cur.execute("""select ip from machines""")
|
||||||
|
machines = cur.fetchall()
|
||||||
|
machines = [machine[0] for machine in machines]
|
||||||
|
|
||||||
for user in User.objects.filter(school=1):
|
for user in User.objects.filter(school=1):
|
||||||
if user.has_access() and user.is_adherent():
|
if user.has_access() and (user.is_adherent() or user.end_adhesion()):
|
||||||
cur_sqlite.execute("""insert into players values (?,?,?,?)""",(user.uid_number, user.name, user.surname, 0))
|
if user.uid_number not in players:
|
||||||
|
cur.execute("""insert into players values (?,?,?,?)""",(user.uid_number, user.name, user.surname, 0))
|
||||||
for m in Machine.objects.filter(user= user):
|
for m in Machine.objects.filter(user= user):
|
||||||
for i in Interface.objects.filter(machine = m):
|
for i in Interface.objects.filter(machine = m):
|
||||||
cur_sqlite.execute("""insert into machines values (?,?,?) """,(i.id, user.uid_number, i.ipv4.ipv4))
|
if i.ipv4.ipv4 not in machines:
|
||||||
con_sqlite.commit()
|
cur.execute("""insert into machines values (?,?,?) """,(i.id, user.uid_number, i.ipv4.ipv4))
|
||||||
con_sqlite.close()
|
con.commit()
|
||||||
|
con.close()
|
||||||
|
|
16
roulette.py
16
roulette.py
|
@ -244,18 +244,28 @@ def ban(player_id, target_id, success):
|
||||||
cur.execute("""select id,ban_end from players
|
cur.execute("""select id,ban_end from players
|
||||||
where id=(?)""", [banned_player['id']])
|
where id=(?)""", [banned_player['id']])
|
||||||
|
|
||||||
|
con.commit()
|
||||||
|
con.close()
|
||||||
|
con = connect_sqlite()
|
||||||
|
cur = con.cursor()
|
||||||
|
|
||||||
ban_end = cur.fetchone()[0]
|
ban_end = cur.fetchone()[0]
|
||||||
ban_end = time() + BAN_DURATION
|
ban_end = time() + BAN_DURATION
|
||||||
|
|
||||||
cur.execute("""update players set ban_end=(?)
|
cur.execute("""update players set ban_end=(?)
|
||||||
where id=(?)""", [ban_end, banned_player['id']])
|
where id=(?)""", [ban_end, banned_player['id']])
|
||||||
|
|
||||||
cur.execute("""insert into bans (player_id,target_id,success,time)
|
|
||||||
values (?,?,?,?)""", [player['id'], target['id'], \
|
|
||||||
success and 1 or 0, time()])
|
|
||||||
|
|
||||||
con.commit()
|
con.commit()
|
||||||
con.close()
|
con.close()
|
||||||
|
con = connect_sqlite()
|
||||||
|
cur = con.cursor()
|
||||||
|
cur.execute("""insert into bans (player_id,target_id,success,time)
|
||||||
|
values (?,?,?,?)""", [player['id'], target['id'], \
|
||||||
|
success and 1 or 0, time()])
|
||||||
|
con.commit()
|
||||||
|
con.close()
|
||||||
|
|
||||||
|
|
||||||
def unban(player_id):
|
def unban(player_id):
|
||||||
con = connect_sqlite()
|
con = connect_sqlite()
|
||||||
|
|
Loading…
Reference in a new issue