Hopefully fix removing users last point. Fix logging
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import logging
|
||||
from logging.handlers import RotatingFileHandler
|
||||
import os
|
||||
import os.path
|
||||
import re
|
||||
@@ -28,7 +29,7 @@ def run():
|
||||
|
||||
cfg = config.load()
|
||||
|
||||
file_handler = logging.FileHandler(cfg.log_path, 'w', 'utf-8')
|
||||
file_handler = RotatingFileHandler(cfg.log_path, mode='w', maxBytes=1024*1024, backupCount=3, encoding='utf-8')
|
||||
console_handler = logging.StreamHandler(sys.stderr)
|
||||
console_handler.setLevel(logging.INFO)
|
||||
|
||||
@@ -129,7 +130,10 @@ def monitor_comments(reddit, subreddit, db, levels, cfg):
|
||||
|
||||
points = db.get_points(solver)
|
||||
logging.info('Total points for user "%s": %d', solver.name, points)
|
||||
if points > 0:
|
||||
level_info = level.user_level_info(points, levels)
|
||||
else:
|
||||
level_info = None
|
||||
|
||||
# Reply to the comment marking the submission as solved
|
||||
reply_body = reply.make(solver,
|
||||
@@ -154,8 +158,8 @@ def monitor_comments(reddit, subreddit, db, levels, cfg):
|
||||
continue
|
||||
|
||||
# Check if (non-mod) user flair should be updated to new level
|
||||
if level_info and level_info.current and level_info.current.points == points:
|
||||
lvl = level_info.current
|
||||
if lvl and lvl.points == points:
|
||||
logging.info('User reached level: %s', lvl.name)
|
||||
if not subreddit.moderator(redditor=solver):
|
||||
logging.info('User is not mod; setting flair')
|
||||
|
||||
@@ -63,6 +63,16 @@ class Database:
|
||||
self.cursor.execute(insert_stmt, {'id': redditor.id, 'name': redditor.name})
|
||||
return self.cursor.rowcount
|
||||
|
||||
@transaction
|
||||
def remove_redditor(self, redditor):
|
||||
insert_stmt = '''
|
||||
DELETE FROM redditor_points
|
||||
WHERE id = :id
|
||||
AND name = :name
|
||||
'''
|
||||
self.cursor.execute(insert_stmt, {'id': redditor.id, 'name': redditor.name})
|
||||
return self.cursor.rowcount
|
||||
|
||||
def add_point(self, redditor):
|
||||
return self._update_points(redditor, 1)
|
||||
|
||||
@@ -73,6 +83,9 @@ class Database:
|
||||
def _update_points(self, redditor, points_modifier):
|
||||
"""points_modifier is positive to add points, negative to subtract."""
|
||||
points = self.get_points(redditor, add_if_none=True)
|
||||
if points + points_modifier <= 0:
|
||||
return self.remove_redditor(redditor)
|
||||
else:
|
||||
params = {
|
||||
'id': redditor.id,
|
||||
'name': redditor.name,
|
||||
@@ -101,6 +114,8 @@ class Database:
|
||||
elif add_if_none:
|
||||
points = 0
|
||||
self.add_redditor(redditor)
|
||||
else:
|
||||
points = 0
|
||||
|
||||
return points
|
||||
|
||||
|
||||
@@ -27,6 +27,9 @@ def make(redditor, points, level_info, feedback_url=None, scoreboard_url=None, i
|
||||
else:
|
||||
paras = [remove_header()]
|
||||
|
||||
if level_info is None:
|
||||
paras.append(no_points(redditor))
|
||||
else:
|
||||
if points <= 1:
|
||||
paras.append(first_greeting(redditor))
|
||||
if level_info.current and points == level_info.current.points:
|
||||
@@ -69,6 +72,10 @@ def remove_header():
|
||||
return 'Point removed.'
|
||||
|
||||
|
||||
def no_points(redditor):
|
||||
return f'u/{redditor.name} now has no points'
|
||||
|
||||
|
||||
def first_greeting(redditor):
|
||||
return (f'Congrats, u/{redditor.name}, you have received a point! Points '
|
||||
'help you "level up" to the next user flair!')
|
||||
|
||||
Reference in New Issue
Block a user