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

Do not cancel task immediately after it is allocated.

Browse source 
Thank you chunk, A_Dragon, TML and graingert.
This commit is contained in:
Schimon Jehudah 2024-02-10 21:50:37 +00:00
parent 9434833449
commit 1e794b3498
2 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
slixfeed/task.py
View file

@ -153,33 +153,17 @@ async def start_tasks_xmpp(self, jid, tasks=None):
async def task_send(self, jid): async def task_send(self, jid):
print("task_send for", jid)
try:
self.task_manager[jid]['interval'].cancel()
except:
logging.info('No task interval for JID {} (start_tasks_xmpp)'
.format(jid))
jid_file = jid.replace('/', '_') jid_file = jid.replace('/', '_')
print(jid_file)
db_file = config.get_pathname_to_database(jid_file) db_file = config.get_pathname_to_database(jid_file)
print(db_file)
update_interval = await config.get_setting_value(db_file, 'interval') update_interval = await config.get_setting_value(db_file, 'interval')
print(update_interval)
update_interval = 60 * int(update_interval) update_interval = 60 * int(update_interval)
print(update_interval)
last_update_time = await sqlite.get_last_update_time(db_file) last_update_time = await sqlite.get_last_update_time(db_file)
print(last_update_time)
if last_update_time: if last_update_time:
print('if')
last_update_time = float(last_update_time) last_update_time = float(last_update_time)
diff = time.time() - last_update_time diff = time.time() - last_update_time
if diff < update_interval: if diff < update_interval:
next_update_time = update_interval - diff next_update_time = update_interval - diff
print('next_update_time')
print(next_update_time)
print(next_update_time/60/60)
await asyncio.sleep(next_update_time) # FIXME! await asyncio.sleep(next_update_time) # FIXME!
print('after await sleep')
# print("jid :", jid, "\n" # print("jid :", jid, "\n"
# "time :", time.time(), "\n" # "time :", time.time(), "\n"
@ -191,15 +175,12 @@ async def task_send(self, jid):
# elif diff > val: # elif diff > val:
# next_update_time = val # next_update_time = val
print('await (if)')
await sqlite.update_last_update_time(db_file) await sqlite.update_last_update_time(db_file)
else: else:
print('await (else)')
await sqlite.set_last_update_time(db_file) await sqlite.set_last_update_time(db_file)
print("await is done for", jid)
await xmpp_send_update(self, jid) await xmpp_send_update(self, jid)
await start_tasks_xmpp(self, jid, ['status'])
await refresh_task(self, jid, task_send, 'interval') await refresh_task(self, jid, task_send, 'interval')
await start_tasks_xmpp(self, jid, ['status'])
async def xmpp_send_update(self, jid, num=None): async def xmpp_send_update(self, jid, num=None):
@ -213,28 +194,19 @@ async def xmpp_send_update(self, jid, num=None):
num : str, optional num : str, optional
Number. The default is None. Number. The default is None.
""" """
print('Sending a news update to JID {}'.format(jid))
jid_file = jid.replace('/', '_') jid_file = jid.replace('/', '_')
print(jid_file)
db_file = config.get_pathname_to_database(jid_file) db_file = config.get_pathname_to_database(jid_file)
print(db_file)
enabled = await config.get_setting_value(db_file, 'enabled') enabled = await config.get_setting_value(db_file, 'enabled')
print(enabled)
if enabled: if enabled:
print('enabled')
if not num: if not num:
num = await config.get_setting_value(db_file, 'quantum') num = await config.get_setting_value(db_file, 'quantum')
else: else:
num = int(num) num = int(num)
print(num)
results = await sqlite.get_unread_entries(db_file, num) results = await sqlite.get_unread_entries(db_file, num)
print(results)
news_digest = '' news_digest = ''
media = None media = None
chat_type = await get_chat_type(self, jid) chat_type = await get_chat_type(self, jid)
print(jid, num, chat_type)
for result in results: for result in results:
print(result)
ix = result[0] ix = result[0]
title_e = result[1] title_e = result[1]
url = result[2] url = result[2]
@ -261,9 +233,6 @@ async def xmpp_send_update(self, jid, num=None):
media = await action.extract_image_from_html(url) media = await action.extract_image_from_html(url)
if media and news_digest: if media and news_digest:
print('SENDING MESSAGE (if media and news_digest)')
print(news_digest)
print(media)
# Send textual message # Send textual message
XmppMessage.send(self, jid, news_digest, chat_type) XmppMessage.send(self, jid, news_digest, chat_type)
news_digest = '' news_digest = ''
@ -272,8 +241,6 @@ async def xmpp_send_update(self, jid, num=None):
media = None media = None
if news_digest: if news_digest:
print('SENDING MESSAGE (if news_digest)')
print(news_digest)
XmppMessage.send(self, jid, news_digest, chat_type) XmppMessage.send(self, jid, news_digest, chat_type)
# TODO Add while loop to assure delivery. # TODO Add while loop to assure delivery.
# print(await current_time(), ">>> ACT send_message",jid) # print(await current_time(), ">>> ACT send_message",jid)
@ -501,5 +468,3 @@ async def select_file(self):
main_task.extend([tg.create_task(self.task_jid(jid))]) main_task.extend([tg.create_task(self.task_jid(jid))])
# main_task = [tg.create_task(self.task_jid(jid))] # main_task = [tg.create_task(self.task_jid(jid))]
# self.task_manager.update({jid: tg}) # self.task_manager.update({jid: tg})

4
slixfeed/xmpp/utility.py
View file

@ -57,3 +57,7 @@ async def get_chat_type(self, jid):
'Jabber ID: {}' 'Jabber ID: {}'
.format(e, jid)) .format(e, jid))
logging.error(message) logging.error(message)
except BaseException as e:
logging.error('BaseException', str(e))
finally:
logging.info('Chat type is:', chat_type)