mirror of
https://github.com/MCV-Software/TWBlue.git
synced 2024-11-26 12:53:12 -06:00
Add support to retrieve more conversations if needed. Sort conversation properly on updates
This commit is contained in:
parent
de1d94e679
commit
701a557357
@ -3,6 +3,7 @@ import time
|
|||||||
import logging
|
import logging
|
||||||
import wx
|
import wx
|
||||||
import widgetUtils
|
import widgetUtils
|
||||||
|
import output
|
||||||
from controller.buffers.mastodon.base import BaseBuffer
|
from controller.buffers.mastodon.base import BaseBuffer
|
||||||
from sessions.mastodon import utils, templates
|
from sessions.mastodon import utils, templates
|
||||||
from wxUI import buffers, commonMessageDialogs
|
from wxUI import buffers, commonMessageDialogs
|
||||||
@ -15,7 +16,7 @@ class ConversationListBuffer(BaseBuffer):
|
|||||||
|
|
||||||
def get_item(self):
|
def get_item(self):
|
||||||
index = self.buffer.list.get_selected()
|
index = self.buffer.list.get_selected()
|
||||||
if index > -1 and self.session.db.get(self.name) != None:
|
if index > -1 and self.session.db.get(self.name) != None and len(self.session.db[self.name]) > index:
|
||||||
return self.session.db[self.name][index]["last_status"]
|
return self.session.db[self.name][index]["last_status"]
|
||||||
|
|
||||||
def get_formatted_message(self):
|
def get_formatted_message(self):
|
||||||
@ -35,6 +36,106 @@ class ConversationListBuffer(BaseBuffer):
|
|||||||
t = templates.render_conversation(conversation=conversation, template=template, toot_template=toot_template, relative_times=self.session.settings["general"]["relative_times"], offset_hours=self.session.db["utc_offset"])
|
t = templates.render_conversation(conversation=conversation, template=template, toot_template=toot_template, relative_times=self.session.settings["general"]["relative_times"], offset_hours=self.session.db["utc_offset"])
|
||||||
return t
|
return t
|
||||||
|
|
||||||
|
def start_stream(self, mandatory=False, play_sound=True, avoid_autoreading=False):
|
||||||
|
current_time = time.time()
|
||||||
|
if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory==True:
|
||||||
|
self.execution_time = current_time
|
||||||
|
log.debug("Starting stream for buffer %s, account %s and type %s" % (self.name, self.account, self.type))
|
||||||
|
log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs))
|
||||||
|
count = self.session.settings["general"]["max_toots_per_call"]
|
||||||
|
min_id = None
|
||||||
|
# toDo: Implement reverse timelines properly here.
|
||||||
|
# if (self.name != "favorites" and self.name != "bookmarks") and self.name in self.session.db and len(self.session.db[self.name]) > 0:
|
||||||
|
# min_id = self.session.db[self.name][-1].id
|
||||||
|
try:
|
||||||
|
results = getattr(self.session.api, self.function)(min_id=min_id, limit=count, *self.args, **self.kwargs)
|
||||||
|
results.reverse()
|
||||||
|
except Exception as e:
|
||||||
|
log.exception("Error %s" % (str(e)))
|
||||||
|
return
|
||||||
|
new_position, number_of_items = self.order_buffer(results)
|
||||||
|
log.debug("Number of items retrieved: %d" % (number_of_items,))
|
||||||
|
self.put_items_on_list(number_of_items)
|
||||||
|
if new_position > -1:
|
||||||
|
self.buffer.list.select_item(new_position)
|
||||||
|
if number_of_items > 0 and self.name != "sent_toots" and self.name != "sent_direct_messages" and self.sound != None and self.session.settings["sound"]["session_mute"] == False and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and play_sound == True:
|
||||||
|
self.session.sound.play(self.sound)
|
||||||
|
# Autoread settings
|
||||||
|
if avoid_autoreading == False and mandatory == True and number_of_items > 0 and self.name in self.session.settings["other_buffers"]["autoread_buffers"]:
|
||||||
|
self.auto_read(number_of_items)
|
||||||
|
return number_of_items
|
||||||
|
|
||||||
|
def get_more_items(self):
|
||||||
|
elements = []
|
||||||
|
if self.session.settings["general"]["reverse_timelines"] == False:
|
||||||
|
max_id = self.session.db[self.name][0].last_status.id
|
||||||
|
else:
|
||||||
|
max_id = self.session.db[self.name][-1].last_status.id
|
||||||
|
try:
|
||||||
|
items = getattr(self.session.api, self.function)(max_id=max_id, limit=self.session.settings["general"]["max_toots_per_call"], *self.args, **self.kwargs)
|
||||||
|
except Exception as e:
|
||||||
|
log.exception("Error %s" % (str(e)))
|
||||||
|
return
|
||||||
|
items_db = self.session.db[self.name]
|
||||||
|
for i in items:
|
||||||
|
if utils.find_item(i, self.session.db[self.name]) == None:
|
||||||
|
elements.append(i)
|
||||||
|
if self.session.settings["general"]["reverse_timelines"] == False:
|
||||||
|
items_db.insert(0, i)
|
||||||
|
else:
|
||||||
|
items_db.append(i)
|
||||||
|
self.session.db[self.name] = items_db
|
||||||
|
selection = self.buffer.list.get_selected()
|
||||||
|
log.debug("Retrieved %d items from cursored search in function %s." % (len(elements), self.function))
|
||||||
|
if self.session.settings["general"]["reverse_timelines"] == False:
|
||||||
|
for i in elements:
|
||||||
|
conversation = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"], self.session.settings["general"]["show_screen_names"])
|
||||||
|
self.buffer.list.insert_item(True, *conversation)
|
||||||
|
else:
|
||||||
|
for i in items:
|
||||||
|
conversation = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"], self.session.settings["general"]["show_screen_names"])
|
||||||
|
self.buffer.list.insert_item(False, *conversation)
|
||||||
|
self.buffer.list.select_item(selection)
|
||||||
|
output.speak(_(u"%s items retrieved") % (str(len(elements))), True)
|
||||||
|
|
||||||
|
def get_item_position(self, conversation):
|
||||||
|
for i in range(len(self.session.db[self.name])):
|
||||||
|
if self.session.db[self.name][i].id == conversation.id:
|
||||||
|
return i
|
||||||
|
|
||||||
|
def order_buffer(self, data):
|
||||||
|
num = 0
|
||||||
|
focus_object = None
|
||||||
|
if self.session.db.get(self.name) == None:
|
||||||
|
self.session.db[self.name] = []
|
||||||
|
objects = self.session.db[self.name]
|
||||||
|
for i in data:
|
||||||
|
position = self.get_item_position(i)
|
||||||
|
if position != None:
|
||||||
|
conversation = self.session.db[self.name][position]
|
||||||
|
if conversation.last_status.id != i.last_status.id:
|
||||||
|
focus_object = i
|
||||||
|
objects.pop(position)
|
||||||
|
self.buffer.list.remove_item(position)
|
||||||
|
if self.session.settings["general"]["reverse_timelines"] == False:
|
||||||
|
objects.append(i)
|
||||||
|
else:
|
||||||
|
objects.insert(0, i)
|
||||||
|
num = num+1
|
||||||
|
else:
|
||||||
|
if self.session.settings["general"]["reverse_timelines"] == False:
|
||||||
|
objects.append(i)
|
||||||
|
else:
|
||||||
|
objects.insert(0, i)
|
||||||
|
num = num+1
|
||||||
|
self.session.db[self.name] = objects
|
||||||
|
if focus_object == None:
|
||||||
|
return (-1, num)
|
||||||
|
new_position = self.get_item_position(focus_object)
|
||||||
|
if new_position != None:
|
||||||
|
return (new_position, num)
|
||||||
|
return (-1, num)
|
||||||
|
|
||||||
def bind_events(self):
|
def bind_events(self):
|
||||||
log.debug("Binding events...")
|
log.debug("Binding events...")
|
||||||
self.buffer.set_focus_function(self.onFocus)
|
self.buffer.set_focus_function(self.onFocus)
|
||||||
@ -99,6 +200,7 @@ class ConversationBuffer(BaseBuffer):
|
|||||||
self.auto_read(number_of_items)
|
self.auto_read(number_of_items)
|
||||||
return number_of_items
|
return number_of_items
|
||||||
|
|
||||||
|
|
||||||
def get_more_items(self):
|
def get_more_items(self):
|
||||||
output.speak(_(u"This action is not supported for this buffer"), True)
|
output.speak(_(u"This action is not supported for this buffer"), True)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user