alvierahman90/todo.txt_telegram
Archived
1
0
Fork 0
Code Releases Activity

move fuzzy_get_task_id to src/db.py

Browse Source
This commit is contained in:
Akbar Rahman 2021-02-27 15:02:24 +00:00
parent 669181239d
commit a5ff687ade
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bot.py
View File

@ -11,8 +11,7 @@ from telegram.ext import MessageHandler, Filters
import logging
import db
import pydo
from fuzzywuzzy import process as fuzzyprocess
from fuzzywuzzy import utils as fuzzyutils
logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
@ -44,7 +43,7 @@ dispatcher.add_handler(CommandHandler('ls', ls))
def do(update, context):
for arg in context.args:
if not arg.isnumeric():
task_ids = [fuzzy_get_task_id(update.effective_user, ' '.join(context.args))]
task_ids = [db.fuzzy_get_task_id(update.effective_user, ' '.join(context.args))]
break
else:
task_ids = [int(x) for x in context.args]

19
src/db.py
View File

@ -5,6 +5,9 @@ import json
import pydo
import telegram
from fuzzywuzzy import process as fuzzyprocess
from fuzzywuzzy import utils as fuzzyutils
DB_FILE="./db.json"
class DbKeys:
@ -49,6 +52,10 @@ def get_task(user: telegram.User, task_id: int) -> pydo.Task:
if int(task.id) == int(task_id):
return task
def fuzzy_get_task_id(user, text):
task_strs = [str(task) for task in get_all_user_tasks(user)]
return task_strs.index(fuzzyprocess.extractOne(text, task_strs)[0])
def create_user(db, user: telegram.User):
if str(user.id) not in db[DbKeys.USER_TASKS].keys():
db[DbKeys.USER_TASKS][str(user.id)] = []
@ -70,15 +77,21 @@ def update_task(user: telegram.User, new_task: pydo.Task) -> pydo.Task:
_set_db(db)
return new_task
def remove_task(user: telegram.User, task_id: int) -> int:
def remove_task_by_id(user: telegram.User, task_id: int) -> int:
db = _get_db()
# instead of removing an item, set it's text value to nothing, so that all other tasks' ids
# don't change
db[DbKeys.USER_TASKS][str(user.id)][str(task_id)] = ""
if db[DbKeys.USER_TASKS][str(user.id)][task_id]:
task = pydo.Task(db[DbKeys.USER_TASKS][str(user.id)][task_id])
else:
task = None
db[DbKeys.USER_TASKS][str(user.id)][task_id] = ""
_set_db(db)
return task
def remove_task(user: telegram.User, task: pydo.Task) -> pydo.Task:
remove_task(user.id, task.id)
remove_task_by_id(user.id, task.id)
return task
try: