sch/Slixfeed
sch/Slixfeed
3
1
Fork 1
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

Restore settings functionality.

Browse source 
Minor fixes for image extraction and self groupchat message.
This commit is contained in:
Schimon Jehudah 2024-01-14 12:46:38 +00:00
parent f721059278
commit 219c23a648
5 changed files with 299 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

286
slixfeed/sqlite.py
View file

@ -241,9 +241,6 @@ async def import_feeds(db_file, feeds):
for feed in feeds: for feed in feeds:
url = feed[0] url = feed[0]
title = feed[1] title = feed[1]
feed = (
title, url
)
sql = ( sql = (
""" """
INSERT INSERT
@ -253,8 +250,11 @@ async def import_feeds(db_file, feeds):
?, ?) ?, ?)
""" """
) )
par = (
title, url
)
try: try:
cur.execute(sql, feed) cur.execute(sql, par)
except IntegrityError as e: except IntegrityError as e:
logging.warning("Skipping: " + url) logging.warning("Skipping: " + url)
logging.error(e) logging.error(e)
@ -304,8 +304,9 @@ def insert_feed_status(cur, feed_id):
?) ?)
""" """
) )
par = (feed_id,)
try: try:
cur.execute(sql, (feed_id,)) cur.execute(sql, par)
except IntegrityError as e: except IntegrityError as e:
logging.warning( logging.warning(
"Skipping feed_id {} for table status".format(feed_id)) "Skipping feed_id {} for table status".format(feed_id))
@ -330,8 +331,9 @@ def insert_feed_properties(cur, feed_id):
?) ?)
""" """
) )
par = (feed_id,)
try: try:
cur.execute(sql, (feed_id,)) cur.execute(sql, par)
except IntegrityError as e: except IntegrityError as e:
logging.warning( logging.warning(
"Skipping feed_id {} for table properties".format(feed_id)) "Skipping feed_id {} for table properties".format(feed_id))
@ -368,9 +370,6 @@ async def insert_feed(
async with DBLOCK: async with DBLOCK:
with create_connection(db_file) as conn: with create_connection(db_file) as conn:
cur = conn.cursor() cur = conn.cursor()
feed = (
title, url
)
sql = ( sql = (
""" """
INSERT INSERT
@ -380,7 +379,10 @@ async def insert_feed(
?, ?) ?, ?)
""" """
) )
cur.execute(sql, feed) par = (
title, url
)
cur.execute(sql, par)
sql = ( sql = (
""" """
SELECT id SELECT id
@ -388,10 +390,8 @@ async def insert_feed(
WHERE url = :url WHERE url = :url
""" """
) )
feed_id = cur.execute(sql, (url,)).fetchone()[0] par = (url,)
status = ( feed_id = cur.execute(sql, par).fetchone()[0]
feed_id, 1, updated, status_code, 1
)
sql = ( sql = (
""" """
INSERT INSERT
@ -401,10 +401,10 @@ async def insert_feed(
?, ?, ?, ?, ?) ?, ?, ?, ?, ?)
""" """
) )
cur.execute(sql, status) par = (
properties = ( feed_id, 1, updated, status_code, 1
feed_id, entries, version, encoding, language
) )
cur.execute(sql, par)
sql = ( sql = (
""" """
INSERT INSERT
@ -414,7 +414,10 @@ async def insert_feed(
?, ?, ?, ?, ?) ?, ?, ?, ?, ?)
""" """
) )
cur.execute(sql, properties) par = (
feed_id, entries, version, encoding, language
)
cur.execute(sql, par)
async def insert_feed_( async def insert_feed_(
@ -451,9 +454,6 @@ async def insert_feed_(
async with DBLOCK: async with DBLOCK:
with create_connection(db_file) as conn: with create_connection(db_file) as conn:
cur = conn.cursor() cur = conn.cursor()
feed = (
title, url
)
sql = ( sql = (
""" """
INSERT INSERT
@ -463,7 +463,10 @@ async def insert_feed_(
?, ?) ?, ?)
""" """
) )
cur.execute(sql, feed) par = (
title, url
)
cur.execute(sql, par)
feed_id = get_feed_id(cur, url) feed_id = get_feed_id(cur, url)
insert_feed_properties( insert_feed_properties(
cur, feed_id, entries=None, cur, feed_id, entries=None,
@ -493,7 +496,8 @@ async def remove_feed_by_url(db_file, url):
WHERE url = ? WHERE url = ?
""" """
) )
cur.execute(sql, (url,)) par = (url,)
cur.execute(sql, par)
async def remove_feed_by_index(db_file, ix): async def remove_feed_by_index(db_file, ix):
@ -517,27 +521,31 @@ async def remove_feed_by_index(db_file, ix):
WHERE id = ? WHERE id = ?
""" """
) )
url = cur.execute(sql, (ix,)).fetchone()[0] par = (ix,)
url = cur.execute(sql, par).fetchone()[0]
# # NOTE Should we move DBLOCK to this line? 2022-12-23 # # NOTE Should we move DBLOCK to this line? 2022-12-23
# sql = ( # sql = (
# "DELETE " # "DELETE "
# "FROM entries " # "FROM entries "
# "WHERE feed_id = ?" # "WHERE feed_id = ?"
# ) # )
# cur.execute(sql, (url,)) # Error? 2024-01-05 # par = (url,)
# cur.execute(sql, par) # Error? 2024-01-05
# sql = ( # sql = (
# "DELETE " # "DELETE "
# "FROM archive " # "FROM archive "
# "WHERE feed_id = ?" # "WHERE feed_id = ?"
# ) # )
# cur.execute(sql, (url,)) # par = (url,)
# cur.execute(sql, par)
sql = ( sql = (
""" """
DELETE FROM feeds DELETE FROM feeds
WHERE id = ? WHERE id = ?
""" """
) )
cur.execute(sql, (ix,)) par = (ix,)
cur.execute(sql, par)
return url return url
@ -568,7 +576,8 @@ async def get_feed_id_and_name(db_file, url):
WHERE url = ? WHERE url = ?
""" """
) )
result = cur.execute(sql, (url,)).fetchone() par = (url,)
result = cur.execute(sql, par).fetchone()
return result return result
@ -691,7 +700,8 @@ async def get_unread_entries(db_file, num):
DESC LIMIT :num DESC LIMIT :num
""" """
) )
results = cur.execute(sql, (num,)).fetchall() par = (num,)
results = cur.execute(sql, par).fetchall()
return results return results
@ -718,7 +728,8 @@ def get_feed_id(cur, url):
WHERE url = :url WHERE url = :url
""" """
) )
feed_id = cur.execute(sql, (url,)).fetchone()[0] par = (url,)
feed_id = cur.execute(sql, par).fetchone()[0]
return feed_id return feed_id
@ -740,7 +751,8 @@ async def mark_entry_as_read(cur, ix):
WHERE id = ? WHERE id = ?
""" """
) )
cur.execute(sql, (ix,)) par = (ix,)
cur.execute(sql, par)
async def mark_feed_as_read(db_file, url): async def mark_feed_as_read(db_file, url):
@ -764,7 +776,8 @@ async def mark_feed_as_read(db_file, url):
WHERE feed_id = ? WHERE feed_id = ?
""" """
) )
cur.execute(sql, (url,)) par = (url,)
cur.execute(sql, par)
async def delete_entry_by_id(db_file, ix): async def delete_entry_by_id(db_file, ix):
@ -788,7 +801,8 @@ async def delete_entry_by_id(db_file, ix):
WHERE id = :ix WHERE id = :ix
""" """
) )
cur.execute(sql, (ix,)) par = (ix,)
cur.execute(sql, par)
async def archive_entry(db_file, ix): async def archive_entry(db_file, ix):
@ -814,8 +828,9 @@ async def archive_entry(db_file, ix):
WHERE entries.id = :ix WHERE entries.id = :ix
""" """
) )
par = (ix,)
try: try:
cur.execute(sql, (ix,)) cur.execute(sql, par)
except: except:
print( print(
"ERROR DB insert from entries " "ERROR DB insert from entries "
@ -828,8 +843,9 @@ async def archive_entry(db_file, ix):
WHERE id = :ix WHERE id = :ix
""" """
) )
par = (ix,)
try: try:
cur.execute(sql, (ix,)) cur.execute(sql, par)
except: except:
print( print(
"ERROR DB deleting items from " "ERROR DB deleting items from "
@ -847,7 +863,8 @@ def get_feed_title(db_file, ix):
WHERE id = :ix WHERE id = :ix
""" """
) )
title = cur.execute(sql, (ix,)).fetchone()[0] par = (ix,)
title = cur.execute(sql, par).fetchone()[0]
return title return title
@ -861,7 +878,8 @@ def get_entry_url(db_file, ix):
WHERE id = :ix WHERE id = :ix
""" """
) )
url = cur.execute(sql, (ix,)).fetchone()[0] par = (ix,)
url = cur.execute(sql, par).fetchone()[0]
return url return url
@ -875,7 +893,8 @@ def get_feed_url(db_file, feed_id):
WHERE id = :feed_id WHERE id = :feed_id
""" """
) )
url = cur.execute(sql, (feed_id,)).fetchone()[0] par = (feed_id,)
url = cur.execute(sql, par).fetchone()[0]
return url return url
@ -938,7 +957,8 @@ async def delete_archived_entry(cur, ix):
WHERE id = ? WHERE id = ?
""" """
) )
cur.execute(sql, (ix,)) par = (ix,)
cur.execute(sql, par)
async def statistics(db_file): async def statistics(db_file):
@ -973,8 +993,9 @@ async def statistics(db_file):
"FROM settings " "FROM settings "
"WHERE key = ?" "WHERE key = ?"
) )
par = (key,)
try: try:
value = cur.execute(sql, (key,)).fetchone()[0] value = cur.execute(sql, par).fetchone()[0]
except: except:
print("Error for key:", key) print("Error for key:", key)
value = "Default" value = "Default"
@ -1001,17 +1022,19 @@ async def update_statistics(cur):
"FROM statistics " "FROM statistics "
"WHERE title = ?" "WHERE title = ?"
) )
cur.execute(sql, (i,)) par = (i,)
cur.execute(sql, par)
if cur.fetchone(): if cur.fetchone():
sql = ( sql = (
"UPDATE statistics " "UPDATE statistics "
"SET number = :num " "SET number = :num "
"WHERE title = :title" "WHERE title = :title"
) )
cur.execute(sql, { par = {
"title": i, "title": i,
"num": stat_dict[i] "num": stat_dict[i]
}) }
cur.execute(sql, par)
else: else:
sql = ( sql = (
"SELECT count(id) " "SELECT count(id) "
@ -1023,7 +1046,8 @@ async def update_statistics(cur):
"INSERT INTO statistics " "INSERT INTO statistics "
"VALUES(?,?,?)" "VALUES(?,?,?)"
) )
cur.execute(sql, (ix, i, stat_dict[i])) par = (ix, i, stat_dict[i])
cur.execute(sql, par)
async def set_enabled_status(db_file, ix, status): async def set_enabled_status(db_file, ix, status):
@ -1049,10 +1073,11 @@ async def set_enabled_status(db_file, ix, status):
WHERE feed_id = :id WHERE feed_id = :id
""" """
) )
cur.execute(sql, { par = {
"status": status, "status": status,
"id": ix "id": ix
}) }
cur.execute(sql, par)
""" """
@ -1101,14 +1126,15 @@ async def add_entry(
:title, :link, :entry_id, :feed_id, :timestamp, :read) :title, :link, :entry_id, :feed_id, :timestamp, :read)
""" """
) )
cur.execute(sql, { par = {
"title": title, "title": title,
"link": link, "link": link,
"entry_id": entry_id, "entry_id": entry_id,
"feed_id": feed_id, "feed_id": feed_id,
"timestamp": date, "timestamp": date,
"read": read_status "read": read_status
}) }
cur.execute(sql, par)
# try: # try:
# cur.execute(sql, entry) # cur.execute(sql, entry)
# except: # except:
@ -1153,7 +1179,7 @@ async def add_entries_and_update_timestamp(db_file, new_entries):
:title, :link, :enclosure, :entry_id, :feed_id, :timestamp, :read) :title, :link, :enclosure, :entry_id, :feed_id, :timestamp, :read)
""" """
) )
cur.execute(sql, { par = {
"title": entry["title"], "title": entry["title"],
"link": entry["link"], "link": entry["link"],
"enclosure": entry["enclosure"], "enclosure": entry["enclosure"],
@ -1161,7 +1187,8 @@ async def add_entries_and_update_timestamp(db_file, new_entries):
"feed_id": feed_id, "feed_id": feed_id,
"timestamp": entry["date"], "timestamp": entry["date"],
"read": entry["read_status"] "read": entry["read_status"]
}) }
cur.execute(sql, par)
if url not in feeds: if url not in feeds:
feeds.extend([url]) feeds.extend([url])
for feed in feeds: for feed in feeds:
@ -1174,10 +1201,11 @@ async def add_entries_and_update_timestamp(db_file, new_entries):
WHERE feed_id = :feed_id WHERE feed_id = :feed_id
""" """
) )
cur.execute(sql, { par = {
"today": date.today(), "today": date.today(),
"feed_id": feed_id "feed_id": feed_id
}) }
cur.execute(sql, par)
async def set_date(db_file, url): async def set_date(db_file, url):
@ -1202,11 +1230,12 @@ async def set_date(db_file, url):
WHERE feed_id = :feed_id WHERE feed_id = :feed_id
""" """
) )
# cur = conn.cursor() par = {
cur.execute(sql, {
"today": date.today(), "today": date.today(),
"feed_id": feed_id "feed_id": feed_id
}) }
# cur = conn.cursor()
cur.execute(sql, par)
async def update_feed_status(db_file, url, status_code): async def update_feed_status(db_file, url, status_code):
@ -1233,11 +1262,12 @@ async def update_feed_status(db_file, url, status_code):
WHERE feed_id = :feed_id WHERE feed_id = :feed_id
""" """
) )
cur.execute(sql, { par = {
"status_code": status_code, "status_code": status_code,
"scanned": date.today(), "scanned": date.today(),
"feed_id": feed_id "feed_id": feed_id
}) }
cur.execute(sql, par)
async def update_feed_validity(db_file, url, valid): async def update_feed_validity(db_file, url, valid):
@ -1264,10 +1294,11 @@ async def update_feed_validity(db_file, url, valid):
WHERE feed_id = :feed_id WHERE feed_id = :feed_id
""" """
) )
cur.execute(sql, { par = {
"valid": valid, "valid": valid,
"feed_id": feed_id "feed_id": feed_id
}) }
cur.execute(sql, par)
async def update_feed_properties(db_file, url, entries, updated): async def update_feed_properties(db_file, url, entries, updated):
@ -1296,10 +1327,11 @@ async def update_feed_properties(db_file, url, entries, updated):
WHERE feed_id = :feed_id WHERE feed_id = :feed_id
""" """
) )
cur.execute(sql, { par = {
"entries" : entries, "entries" : entries,
"feed_id": feed_id "feed_id": feed_id
}) }
cur.execute(sql, par)
async def maintain_archive(db_file, limit): async def maintain_archive(db_file, limit):
@ -1343,9 +1375,10 @@ async def maintain_archive(db_file, limit):
) )
""" """
) )
cur.execute(sql, { par = {
"difference": difference "difference": difference
}) }
cur.execute(sql, par)
# TODO Move entries that don't exist into table archive. # TODO Move entries that don't exist into table archive.
@ -1376,7 +1409,8 @@ async def get_entries_of_feed(db_file, feed, url):
WHERE feed_id = ? WHERE feed_id = ?
""" """
) )
items = cur.execute(sql, (url,)).fetchall() par = (url,)
items = cur.execute(sql, par).fetchall()
return items return items
@ -1500,8 +1534,8 @@ async def last_entries(db_file, num):
LIMIT :num LIMIT :num
""" """
) )
results = cur.execute( par = (num,)
sql, (num,)).fetchall() results = cur.execute(sql, par).fetchall()
return results return results
@ -1532,8 +1566,8 @@ async def search_feeds(db_file, query):
LIMIT 50 LIMIT 50
""" """
) )
results = cur.execute( par = [f'%{query}%', f'%{query}%']
sql, [f'%{query}%', f'%{query}%']).fetchall() results = cur.execute(sql, par).fetchall()
return results return results
@ -1567,8 +1601,8 @@ async def search_entries(db_file, query):
LIMIT 50 LIMIT 50
""" """
) )
results = cur.execute( par = (f'%{query}%', f'%{query}%')
sql, (f'%{query}%', f'%{query}%')).fetchall() results = cur.execute(sql, par).fetchall()
return results return results
@ -1634,10 +1668,11 @@ async def check_entry_exist(
WHERE entry_id = :entry_id and feed_id = :feed_id WHERE entry_id = :entry_id and feed_id = :feed_id
""" """
) )
result = cur.execute(sql, { par = {
"entry_id": entry_id, "entry_id": entry_id,
"feed_id": feed_id "feed_id": feed_id
}).fetchone() }
result = cur.execute(sql, par).fetchone()
if result: exist = True if result: exist = True
elif date: elif date:
sql = ( sql = (
@ -1647,12 +1682,13 @@ async def check_entry_exist(
WHERE title = :title and link = :link and timestamp = :date WHERE title = :title and link = :link and timestamp = :date
""" """
) )
try: par = {
result = cur.execute(sql, {
"title": title, "title": title,
"link": link, "link": link,
"timestamp": date "timestamp": date
}).fetchone() }
try:
result = cur.execute(sql, par).fetchone()
if result: exist = True if result: exist = True
except: except:
print(current_time(), "ERROR DATE: source =", url) print(current_time(), "ERROR DATE: source =", url)
@ -1665,10 +1701,11 @@ async def check_entry_exist(
WHERE title = :title and link = :link WHERE title = :title and link = :link
""" """
) )
result = cur.execute(sql, { par = {
"title": title, "title": title,
"link": link "link": link
}).fetchone() }
result = cur.execute(sql, par).fetchone()
if result: exist = True if result: exist = True
# try: # try:
# if result: # if result:
@ -1684,6 +1721,41 @@ async def set_settings_value(db_file, key_value):
""" """
Set settings value. Set settings value.
Parameters
----------
db_file : str
Path to database file.
key_value : list
key : str
enabled, interval, masters, quantum, random.
value : int
Numeric value.
"""
key = key_value[0]
value = key_value[1]
async with DBLOCK:
with create_connection(db_file) as conn:
cur = conn.cursor()
sql = (
"""
INSERT
INTO settings(
key, value)
VALUES(
:key, :value)
"""
)
par = {
"key": key,
"value": value
}
cur.execute(sql, par)
async def update_settings_value(db_file, key_value):
"""
Update settings value.
Parameters Parameters
---------- ----------
db_file : str db_file : str
@ -1708,7 +1780,6 @@ async def set_settings_value(db_file, key_value):
async with DBLOCK: async with DBLOCK:
with create_connection(db_file) as conn: with create_connection(db_file) as conn:
cur = conn.cursor() cur = conn.cursor()
# try:
sql = ( sql = (
""" """
UPDATE settings UPDATE settings
@ -1716,10 +1787,11 @@ async def set_settings_value(db_file, key_value):
WHERE key = :key WHERE key = :key
""" """
) )
cur.execute(sql, { par = {
"key": key, "key": key,
"value": value "value": value
}) }
cur.execute(sql, par)
# except: # except:
# logging.debug( # logging.debug(
# "No specific value set for key {}.".format(key) # "No specific value set for key {}.".format(key)
@ -1753,18 +1825,56 @@ async def get_settings_value(db_file, key):
WHERE key = ? WHERE key = ?
""" """
) )
value = cur.execute(sql, (key,)).fetchone()[0] par = (key,)
return value value = cur.execute(sql, par).fetchone()[0]
value = str(value)
except: except:
value = None
logging.debug( logging.debug(
"No specific value set for key {}.".format(key) "No specific value set for key {}.".format(key)
) )
return value
async def set_filters_value(db_file, key_value): async def set_filters_value(db_file, key_value):
""" """
Set settings value. Set settings value.
Parameters
----------
db_file : str
Path to database file.
key_value : list
key : str
filter-allow, filter-deny, filter-replace.
value : int
Numeric value.
"""
key = key_value[0]
val = key_value[1]
async with DBLOCK:
with create_connection(db_file) as conn:
cur = conn.cursor()
sql = (
"""
INSERT
INTO filters(
key, value)
VALUES(
:key, :value)
"""
)
par = {
"key": key,
"value": val
}
cur.execute(sql, par)
async def update_filters_value(db_file, key_value):
"""
Update settings value.
Parameters Parameters
---------- ----------
db_file : str db_file : str
@ -1796,10 +1906,11 @@ async def set_filters_value(db_file, key_value):
WHERE key = :key WHERE key = :key
""" """
) )
cur.execute(sql, { par = {
"key": key, "key": key,
"value": val "value": val
}) }
cur.execute(sql, par)
async def get_filters_value(db_file, key): async def get_filters_value(db_file, key):
@ -1828,9 +1939,12 @@ async def get_filters_value(db_file, key):
WHERE key = ? WHERE key = ?
""" """
) )
value = cur.execute(sql, (key,)).fetchone()[0] par = (key,)
return value value = cur.execute(sql, par).fetchone()[0]
value = str(value)
except: except:
value = None
logging.debug( logging.debug(
"No specific value set for key {}.".format(key) "No specific value set for key {}.".format(key)
) )
return value

5
slixfeed/task.py
View file

@ -245,6 +245,11 @@ async def send_update(self, jid, num=None):
await mark_as_read(db_file, ix) await mark_as_read(db_file, ix)
# Find media # Find media
# if url.startswith("magnet:"):
# media = action.get_magnet(url)
# elif enclosure.startswith("magnet:"):
# media = action.get_magnet(enclosure)
# elif enclosure:
if enclosure: if enclosure:
media = enclosure media = enclosure
else: else:

2
slixfeed/xmpp/muc.py
View file

@ -56,7 +56,7 @@ async def join(self, inviter, muc_jid):
# token = randrange(10000, 99999) # token = randrange(10000, 99999)
# await initdb( # await initdb(
# muc_jid, # muc_jid,
# set_settings_value, # update_settings_value,
# ["token", token] # ["token", token]
# ) # )
# self.send_message( # self.send_message(

91
slixfeed/xmpp/process.py
View file

@ -82,7 +82,11 @@ async def message(self, message):
jid = message["from"].bare jid = message["from"].bare
message_text = " ".join(message["body"].split()) message_text = " ".join(message["body"].split())
# BOTE This is an exceptional case in which we treat if (message["type"] == "groupchat" and
message['muc']['nick'] == self.nick):
return
# NOTE This is an exceptional case in which we treat
# type groupchat the same as type chat. # type groupchat the same as type chat.
if (message_text.lower().startswith("http") and if (message_text.lower().startswith("http") and
message_text.lower().endswith(".opml")): message_text.lower().endswith(".opml")):
@ -115,8 +119,8 @@ async def message(self, message):
if message["type"] == "groupchat": if message["type"] == "groupchat":
# nick = message["from"][message["from"].index("/")+1:] # nick = message["from"][message["from"].index("/")+1:]
nick = str(message["from"]) # nick = str(message["from"])
nick = nick[nick.index("/")+1:] # nick = nick[nick.index("/")+1:]
if (message['muc']['nick'] == self.nick or if (message['muc']['nick'] == self.nick or
not message["body"].startswith("!")): not message["body"].startswith("!")):
return return
@ -226,12 +230,12 @@ async def message(self, message):
# if int(acode) == token: # if int(acode) == token:
# await initdb( # await initdb(
# jid, # jid,
# set_settings_value, # update_settings_value,
# ["masters", nick] # ["masters", nick]
# ) # )
# await initdb( # await initdb(
# jid, # jid,
# set_settings_value, # update_settings_value,
# ["token", "accepted"] # ["token", "accepted"]
# ) # )
# response = "{}, your are in command.".format(nick) # response = "{}, your are in command.".format(nick)
@ -290,8 +294,11 @@ async def message(self, message):
db_file, key) db_file, key)
val = await add_to_list( val = await add_to_list(
val, keywords) val, keywords)
await sqlite.set_filters_value( if await sqlite.get_filters_value(db_file, key):
await sqlite.update_filters_value(
db_file, [key, val]) db_file, [key, val])
else:
await sqlite.set_filters_value(db_file, [key, val])
response = ( response = (
"Approved keywords\n" "Approved keywords\n"
"```\n{}\n```" "```\n{}\n```"
@ -308,8 +315,11 @@ async def message(self, message):
db_file, key) db_file, key)
val = await remove_from_list( val = await remove_from_list(
val, keywords) val, keywords)
await sqlite.set_filters_value( if await sqlite.get_filters_value(db_file, key):
await sqlite.update_filters_value(
db_file, [key, val]) db_file, [key, val])
else:
await sqlite.set_filters_value(db_file, [key, val])
response = ( response = (
"Approved keywords\n" "Approved keywords\n"
"```\n{}\n```" "```\n{}\n```"
@ -326,6 +336,11 @@ async def message(self, message):
response = "Value may not be greater than 500." response = "Value may not be greater than 500."
else: else:
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
if await sqlite.get_settings_value(
db_file, [key, val]):
await sqlite.update_settings_value(
db_file, [key, val])
else:
await sqlite.set_settings_value( await sqlite.set_settings_value(
db_file, [key, val]) db_file, [key, val])
response = ( response = (
@ -368,8 +383,11 @@ async def message(self, message):
db_file, key) db_file, key)
val = await add_to_list( val = await add_to_list(
val, keywords) val, keywords)
await sqlite.set_filters_value( if await sqlite.get_filters_value(db_file, key):
await sqlite.update_filters_value(
db_file, [key, val]) db_file, [key, val])
else:
await sqlite.set_filters_value(db_file, [key, val])
response = ( response = (
"Rejected keywords\n" "Rejected keywords\n"
"```\n{}\n```" "```\n{}\n```"
@ -386,8 +404,11 @@ async def message(self, message):
db_file, key) db_file, key)
val = await remove_from_list( val = await remove_from_list(
val, keywords) val, keywords)
await sqlite.set_filters_value( if await sqlite.get_filters_value(db_file, key):
await sqlite.update_filters_value(
db_file, [key, val]) db_file, [key, val])
else:
await sqlite.set_filters_value(db_file, [key, val])
response = ( response = (
"Rejected keywords\n" "Rejected keywords\n"
"```\n{}\n```" "```\n{}\n```"
@ -600,6 +621,9 @@ async def message(self, message):
# "Updates will be sent every {} minutes." # "Updates will be sent every {} minutes."
# ).format(response) # ).format(response)
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
if await sqlite.get_settings_value(db_file, key):
await sqlite.update_settings_value(db_file, [key, val])
else:
await sqlite.set_settings_value(db_file, [key, val]) await sqlite.set_settings_value(db_file, [key, val])
# NOTE Perhaps this should be replaced # NOTE Perhaps this should be replaced
# by functions clean and start # by functions clean and start
@ -631,6 +655,11 @@ async def message(self, message):
try: try:
val = int(val) val = int(val)
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
if await sqlite.get_settings_value(
db_file, [key, val]):
await sqlite.update_settings_value(
db_file, [key, val])
else:
await sqlite.set_settings_value( await sqlite.set_settings_value(
db_file, [key, val]) db_file, [key, val])
if val == 0: # if not val: if val == 0: # if not val:
@ -661,7 +690,7 @@ async def message(self, message):
# ) # )
# await initdb( # await initdb(
# jid, # jid,
# set_settings_value, # update_settings_valuevv,
# [key, val] # [key, val]
# ) # )
# response = ( # response = (
@ -673,8 +702,12 @@ async def message(self, message):
send_reply_message(self, message, response) send_reply_message(self, message, response)
case "new": case "new":
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
await sqlite.set_settings_value( key = "old"
db_file, ["old", 0]) val = 0
if await sqlite.get_settings_value(db_file, key):
await sqlite.update_settings_value(db_file, [key, val])
else:
await sqlite.set_settings_value(db_file, [key, val])
response = ( response = (
"Only new items of newly added feeds will be sent." "Only new items of newly added feeds will be sent."
) )
@ -703,8 +736,12 @@ async def message(self, message):
# await refresh_task(jid, key, val) # await refresh_task(jid, key, val)
case "old": case "old":
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
await sqlite.set_settings_value( key = "old"
db_file, ["old", 1]) val = 1
if await sqlite.get_settings_value(db_file, key):
await sqlite.update_settings_value(db_file, [key, val])
else:
await sqlite.set_settings_value(db_file, [key, val])
response = ( response = (
"All items of newly added feeds will be sent." "All items of newly added feeds will be sent."
) )
@ -719,6 +756,18 @@ async def message(self, message):
# "Every update will contain {} news items." # "Every update will contain {} news items."
# ).format(response) # ).format(response)
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
a = await sqlite.get_settings_value(db_file, key)
print(a)
print(key)
print(val)
print(a)
print(a)
print(a)
if await sqlite.get_settings_value(
db_file, key):
await sqlite.update_settings_value(
db_file, [key, val])
else:
await sqlite.set_settings_value( await sqlite.set_settings_value(
db_file, [key, val]) db_file, [key, val])
response = ( response = (
@ -865,8 +914,10 @@ async def message(self, message):
key = "enabled" key = "enabled"
val = 1 val = 1
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
await sqlite.set_settings_value( if await sqlite.get_settings_value(db_file, key):
db_file, [key, val]) await sqlite.update_settings_value(db_file, [key, val])
else:
await sqlite.set_settings_value(db_file, [key, val])
# asyncio.create_task(task_jid(self, jid)) # asyncio.create_task(task_jid(self, jid))
await task.start_tasks_xmpp( await task.start_tasks_xmpp(
self, jid, ["interval", "status", "check"]) self, jid, ["interval", "status", "check"])
@ -916,7 +967,7 @@ async def message(self, message):
# val = 0 # val = 0
# response = await initdb( # response = await initdb(
# jid, # jid,
# set_settings_value, # update_settings_value,
# [key, val] # [key, val]
# ) # )
# except: # except:
@ -926,8 +977,10 @@ async def message(self, message):
key = "enabled" key = "enabled"
val = 0 val = 0
db_file = get_pathname_to_database(jid) db_file = get_pathname_to_database(jid)
await sqlite.set_settings_value( if await sqlite.get_settings_value(db_file, key):
db_file, [key, val]) await sqlite.update_settings_value(db_file, [key, val])
else:
await sqlite.set_settings_value(db_file, [key, val])
await task.clean_tasks_xmpp( await task.clean_tasks_xmpp(
jid, ["interval", "status"]) jid, ["interval", "status"])
response = "Updates are disabled." response = "Updates are disabled."