thecoffemaker/Slixfeed
1
0
Fork 0
forked from sch/Slixfeed
Code Pull requests Activity

Update slixfeed.py

Browse source
This commit is contained in:
Schimon Jehudah 2022-07-11 16:50:54 +00:00
parent 010ca2bf93
commit b49a90bc83
1 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
slixfeed.py
View file

@ -23,8 +23,11 @@ import slixmpp
import sqlite3 import sqlite3
from sqlite3 import Error from sqlite3 import Error
import sys import sys
import time
#import xdg #import xdg
offline = False
class Slixfeed(slixmpp.ClientXMPP): class Slixfeed(slixmpp.ClientXMPP):
""" """
Slixmpp bot that will send updates of feeds it Slixmpp bot that will send updates of feeds it
@ -46,16 +49,15 @@ class Slixfeed(slixmpp.ClientXMPP):
# stanza is received. Be aware that that includes # stanza is received. Be aware that that includes
# MUC messages and error messages. # MUC messages and error messages.
self.add_event_handler("message", self.message) self.add_event_handler("message", self.message)
self.add_event_handler("disconnected", self.disconnected) self.add_event_handler("disconnected", self.reconnect)
self.add_event_handler("disconnected", self._reconnect)
async def _reconnect(self, event): async def reconnect(self, event):
await asyncio.sleep(10) await asyncio.sleep(10)
offline = True
print(time.strftime("%H:%M:%S"))
print(offline)
self.connect() self.connect()
#return True
def disconnected(self):
print("disconnected disconnected disconnected")
return True
async def start(self, event): async def start(self, event):
""" """
@ -91,34 +93,50 @@ class Slixfeed(slixmpp.ClientXMPP):
action = print_help() action = print_help()
# NOTE: Might not need it # NOTE: Might not need it
elif message.startswith('feed recent '): elif message.startswith('feed recent '):
print("COMMAND: feed recent")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[12:], message[12:],
last_entries) last_entries)
elif message.startswith('feed search '): elif message.startswith('feed search '):
print("COMMAND: feed search")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[12:], message[12:],
search_entries) search_entries)
elif message.startswith('feed list'): elif message.startswith('feed list'):
print("COMMAND: feed list")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
False, False,
list_subscriptions) list_subscriptions)
elif message.startswith('feed add '): elif message.startswith('feed add '):
print("COMMAND: feed add")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[9:], message[9:],
add_feed) add_feed)
elif message.startswith('feed remove '): elif message.startswith('feed remove '):
print("COMMAND: feed remove")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[12:], message[12:],
remove_feed) remove_feed)
elif message.startswith('feed status '): elif message.startswith('feed status '):
print("COMMAND: feed status")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[12:], message[12:],
toggle_status) toggle_status)
elif message.startswith('feed enable'): elif message.startswith('feed enable'):
print("COMMAND: feed enable")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[11:], message[11:],
toggle_state) toggle_state)
elif message.startswith('feed disable'): elif message.startswith('feed disable'):
print("COMMAND: feed disable")
print("ACCOUNT: " + str(msg['from']))
action = initdb(msg['from'].bare, action = initdb(msg['from'].bare,
message[12:], message[12:],
toggle_state) toggle_state)
@ -127,7 +145,10 @@ class Slixfeed(slixmpp.ClientXMPP):
msg.reply(action).send() msg.reply(action).send()
async def send_updates(self, event): async def send_updates(self, event):
#while not offline:
while True: while True:
print(time.strftime("%H:%M:%S"))
print(offline)
db_dir = get_default_dbdir() db_dir = get_default_dbdir()
if not os.path.isdir(db_dir): if not os.path.isdir(db_dir):
msg = ("Slixfeed can not work without a database. \n" msg = ("Slixfeed can not work without a database. \n"
@ -341,9 +362,10 @@ def create_table(conn, create_table_sql):
def download_updates(conn): def download_updates(conn):
with conn: with conn:
cur = conn.cursor()
# get current date # get current date
#today = date.today() #today = date.today()
urls = get_subscriptions(conn) urls = get_subscriptions(cur)
for url in urls: for url in urls:
#"".join(url) #"".join(url)
source = url[0] source = url[0]
@ -369,7 +391,7 @@ def download_updates(conn):
else: else:
title = feed["feed"]["title"] title = feed["feed"]["title"]
link = source if not entry.link else entry.link link = source if not entry.link else entry.link
exist = check_entry(conn, title, link) exist = check_entry(cur, title, link)
if not exist: if not exist:
if entry.has_key("summary"): if entry.has_key("summary"):
summary = entry.summary summary = entry.summary
@ -390,7 +412,7 @@ def download_updates(conn):
# print(len(news)) # print(len(news))
# return news # return news
def check_feed(conn, url): def check_feed(cur, url):
""" """
Check whether a feed exists Check whether a feed exists
Query for feeds by url Query for feeds by url
@ -398,7 +420,6 @@ def check_feed(conn, url):
:param url: :param url:
:return: row :return: row
""" """
cur = conn.cursor()
sql = "SELECT id FROM feeds WHERE address = ?" sql = "SELECT id FROM feeds WHERE address = ?"
cur.execute(sql, (url,)) cur.execute(sql, (url,))
return cur.fetchone() return cur.fetchone()
@ -411,7 +432,8 @@ def add_feed(conn, url):
:return: string :return: string
""" """
#conn = create_connection(db_file) #conn = create_connection(db_file)
exist = check_feed(conn, url) cur = conn.cursor()
exist = check_feed(cur, url)
if not exist: if not exist:
feed = feedparser.parse(url) feed = feedparser.parse(url)
if feed.bozo: if feed.bozo:
@ -420,7 +442,6 @@ def add_feed(conn, url):
return "Failed to parse URL as feed" return "Failed to parse URL as feed"
title = feedparser.parse(url)["feed"]["title"] title = feedparser.parse(url)["feed"]["title"]
feed = (title, url, 1) feed = (title, url, 1)
cur = conn.cursor()
sql = """INSERT INTO feeds(name,address,status) sql = """INSERT INTO feeds(name,address,status)
VALUES(?,?,?) """ VALUES(?,?,?) """
cur.execute(sql, feed) cur.execute(sql, feed)
@ -462,36 +483,37 @@ def get_unread(conn):
:param id: id of the entry :param id: id of the entry
:return: string :return: string
""" """
entry = []
cur = conn.cursor() with conn:
sql = "SELECT id FROM entries WHERE read = 0" entry = []
#id = cur.execute(sql).fetchone()[0] cur = conn.cursor()
id = cur.execute(sql).fetchone() sql = "SELECT id FROM entries WHERE read = 0"
if id is None: #id = cur.execute(sql).fetchone()[0]
return False id = cur.execute(sql).fetchone()
id = id[0] if id is None:
sql = "SELECT title FROM entries WHERE id = :id" return False
cur.execute(sql, (id,)) id = id[0]
title = cur.fetchone()[0] sql = "SELECT title FROM entries WHERE id = :id"
entry.append(title) cur.execute(sql, (id,))
sql = "SELECT summary FROM entries WHERE id = :id" title = cur.fetchone()[0]
cur.execute(sql, (id,)) entry.append(title)
summary = cur.fetchone()[0] sql = "SELECT summary FROM entries WHERE id = :id"
entry.append(summary) cur.execute(sql, (id,))
sql = "SELECT link FROM entries WHERE id = :id" summary = cur.fetchone()[0]
cur.execute(sql, (id,)) entry.append(summary)
link = cur.fetchone()[0] sql = "SELECT link FROM entries WHERE id = :id"
entry.append(link) cur.execute(sql, (id,))
# columns = ['title', 'summary', 'link'] link = cur.fetchone()[0]
# for column in columns: entry.append(link)
# sql = "SELECT :column FROM entries WHERE id = :id" # columns = ['title', 'summary', 'link']
# cur.execute(sql, {"column": column, "id": id}) # for column in columns:
# str = cur.fetchone()[0] # sql = "SELECT :column FROM entries WHERE id = :id"
# entry.append(str) # cur.execute(sql, {"column": column, "id": id})
entry = "{}\n\n{}\n\nLink to article:\n{}".format(entry[0], entry[1], entry[2]) # str = cur.fetchone()[0]
mark_as_read(conn, id) # entry.append(str)
conn.commit() entry = "{}\n\n{}\n\nLink to article:\n{}".format(entry[0], entry[1], entry[2])
return entry mark_as_read(conn, id)
return entry
def mark_as_read(conn, id): def mark_as_read(conn, id):
""" """
@ -503,6 +525,7 @@ def mark_as_read(conn, id):
sql = "UPDATE entries SET summary = '', read = 1 WHERE id = ?" sql = "UPDATE entries SET summary = '', read = 1 WHERE id = ?"
cur.execute(sql, (id,)) cur.execute(sql, (id,))
conn.commit() conn.commit()
#conn.close()
return return
# TODO test # TODO test
@ -547,13 +570,12 @@ def set_date(conn, url):
cur.execute(sql, {"today": today, "url": url}) cur.execute(sql, {"today": today, "url": url})
conn.commit() conn.commit()
def get_subscriptions(conn): def get_subscriptions(cur):
""" """
Query feeds Query feeds
:param conn: :param conn:
:return: rows (tuple) :return: rows (tuple)
""" """
cur = conn.cursor()
sql = "SELECT address FROM feeds WHERE status = 1" sql = "SELECT address FROM feeds WHERE status = 1"
result = cur.execute(sql) result = cur.execute(sql)
return result return result
@ -586,7 +608,7 @@ def list_subscriptions(conn):
"feed add https://reclaimthenet.org/feed/") "feed add https://reclaimthenet.org/feed/")
return msg return msg
def check_entry(conn, title, link): def check_entry(cur, title, link):
""" """
Check whether an entry exists Check whether an entry exists
Query entries by title and link Query entries by title and link
@ -595,7 +617,6 @@ def check_entry(conn, title, link):
:param title: :param title:
:return: row :return: row
""" """
cur = conn.cursor()
sql = "SELECT id FROM entries WHERE title = :title and link = :link" sql = "SELECT id FROM entries WHERE title = :title and link = :link"
cur.execute(sql, {"title": title, "link": link}) cur.execute(sql, {"title": title, "link": link})
return cur.fetchone() return cur.fetchone()