Event system logic rework

This commit is contained in:
2022-09-29 17:22:33 -05:00
parent a7fbc6eadb
commit ded86b81ec
15 changed files with 102 additions and 185 deletions

View File

@@ -38,7 +38,6 @@ class Plugin(PluginBase):
self._favorites_dialog = None
self._favorites_store = None
self._favorites = None
self._state = None
self._selected = None
@@ -48,8 +47,6 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
self._builder = Gtk.Builder()
self._builder.add_from_file(self._GLADE_FILE)
@@ -81,19 +78,15 @@ class Plugin(PluginBase):
@threaded
def _get_state(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
self._event_system.post_event("get_current_state", None)
self._state = self._event_message
self._event_message = None
@threaded
def _set_current_dir_lbl(self, widget=None, eve=None):
self.wait_for_state()
self._current_dir_lbl.set_label(f"Current Directory:\n{self._state.tab.get_current_directory()}")
self._current_dir_lbl.set_label(f"Current Directory:\n{self._fm_state.tab.get_current_directory()}")
def _add_to_favorite(self, state):
current_directory = self._state.tab.get_current_directory()
current_directory = self._fm_state.tab.get_current_directory()
self._favorites_store.append([current_directory])
self._favorites.append(current_directory)
self._save_favorites()
@@ -111,11 +104,10 @@ class Plugin(PluginBase):
def _set_selected_path(self, widget=None, eve=None):
path = self._favorites_store.get_value(self._selected, 0)
self._ui_objects[0].set_text(path)
self._set_current_dir_lbl()
def _show_favorites_menu(self, widget=None, eve=None):
self._state = None
self._fm_state = None
self._get_state()
self._set_current_dir_lbl()
self._favorites_dialog.run()
@@ -127,7 +119,3 @@ class Plugin(PluginBase):
selected = user_data.get_selected()[1]
if selected:
self._selected = selected
def wait_for_state(self):
while not self._state:
pass

View File

@@ -89,8 +89,6 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
self._builder = Gtk.Builder()
self._builder.add_from_file(self._GLADE_FILE)
@@ -109,10 +107,9 @@ class Plugin(PluginBase):
@threaded
def _show_properties_page(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
event_system.post_event("get_current_state", None)
state = self._event_message
state = self._fm_state
self._event_message = None
GLib.idle_add(self._process_changes, (state))

View File

@@ -39,7 +39,6 @@ class Plugin(PluginBase):
self._dialog = None
self._thumbnail_preview_img = None
self._tmdb = scraper.get_tmdb_scraper()
self._state = None
self._overview = None
self._file_name = None
self._file_location = None
@@ -53,8 +52,6 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
self._builder = Gtk.Builder()
self._builder.add_from_file(self._GLADE_FILE)
@@ -80,19 +77,18 @@ class Plugin(PluginBase):
@threaded
def _show_info_page(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
self._event_system.post_event("get_current_state", None)
state = self._event_message
state = self._fm_state
self._event_message = None
GLib.idle_add(self._process_changes, (state))
def _process_changes(self, state):
self._state = None
self._fm_state = None
if len(state.selected_files) == 1:
self._state = state
self._fm_state = state
self._set_ui_data()
response = self._thumbnailer_dialog.run()
if response in [Gtk.ResponseType.CLOSE, Gtk.ResponseType.DELETE_EVENT]:
@@ -111,8 +107,8 @@ class Plugin(PluginBase):
print(video_data["videos"]) if not keys in ("", None) and "videos" in keys else ...
def get_video_data(self):
uri = self._state.selected_files[0]
path = self._state.tab.get_current_directory()
uri = self._fm_state.selected_files[0]
path = self._fm_state.tab.get_current_directory()
parts = uri.split("/")
_title = parts[ len(parts) - 1 ]

View File

@@ -98,8 +98,6 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
self._builder = Gtk.Builder()
self._builder.add_from_file(self._GLADE_FILE)
@@ -127,10 +125,9 @@ class Plugin(PluginBase):
@daemon_threaded
def _show_grep_list_page(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
self._event_system.post_event("get_current_state", None)
state = self._event_message
state = self._fm_state
self._event_message = None
GLib.idle_add(self._process_queries, (state))

View File

@@ -39,8 +39,8 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
...
def send_message(self, widget=None, eve=None):
message = "Hello, World!"
self._event_system.push_gui_event([self.name, "display_message", ("warning", message, None)])
event_system.post_event("display_message", ("warning", message, None))

View File

@@ -42,7 +42,6 @@ class Plugin(PluginBase):
self._file_name = None
self._file_location = None
self._file_hash = None
self._state = None
def get_ui_element(self):
@@ -51,8 +50,6 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
self._builder = Gtk.Builder()
self._builder.add_from_file(self._GLADE_FILE)
@@ -78,20 +75,19 @@ class Plugin(PluginBase):
@threaded
def _show_thumbnailer_page(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
self._event_system.post_event("get_current_state", None)
state = self._event_message
state = self._fm_state
self._event_message = None
GLib.idle_add(self._process_changes, (state))
def _process_changes(self, state):
self._state = None
self._fm_state = None
if len(state.selected_files) == 1:
if state.selected_files[0].lower().endswith(state.tab.fvideos):
self._state = state
self._fm_state = state
self._set_ui_data()
response = self._thumbnailer_dialog.run()
if response in [Gtk.ResponseType.CLOSE, Gtk.ResponseType.DELETE_EVENT]:
@@ -103,32 +99,32 @@ class Plugin(PluginBase):
file = self._file_name.get_text()
dir = self._file_location.get_text()
file_hash = self._file_hash.get_text()
hash_img_pth = f"{self._state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
hash_img_pth = f"{self._fm_state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
try:
os.remove(hash_img_pth) if os.path.isfile(hash_img_pth) else ...
self._state.tab.create_thumbnail(dir, file, f"{scrub_percent}%")
self._fm_state.tab.create_thumbnail(dir, file, f"{scrub_percent}%")
preview_pixbuf = GdkPixbuf.Pixbuf.new_from_file(hash_img_pth)
self._thumbnail_preview_img.set_from_pixbuf(preview_pixbuf)
img_pixbuf = self._state.tab.create_scaled_image(hash_img_pth)
tree_pth = self._state.icon_grid.get_selected_items()[0]
itr = self._state.store.get_iter(tree_pth)
pixbuff = self._state.store.get(itr, 0)[0]
self._state.store.set(itr, 0, img_pixbuf)
img_pixbuf = self._fm_state.tab.create_scaled_image(hash_img_pth)
tree_pth = self._fm_state.icon_grid.get_selected_items()[0]
itr = self._fm_state.store.get_iter(tree_pth)
pixbuff = self._fm_state.store.get(itr, 0)[0]
self._fm_state.store.set(itr, 0, img_pixbuf)
except Exception as e:
print(repr(e))
print("Couldn't regenerate thumbnail!")
def _set_ui_data(self):
uri = self._state.selected_files[0]
path = self._state.tab.get_current_directory()
uri = self._fm_state.selected_files[0]
path = self._fm_state.tab.get_current_directory()
parts = uri.split("/")
file_hash = hashlib.sha256(str.encode(uri)).hexdigest()
hash_img_pth = f"{self._state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
hash_img_pth = f"{self._fm_state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
preview_pixbuf = GdkPixbuf.Pixbuf.new_from_file(hash_img_pth)
self._thumbnail_preview_img.set_from_pixbuf(preview_pixbuf)

View File

@@ -40,14 +40,15 @@ class Plugin(PluginBase):
return button
def run(self):
self._module_event_observer()
...
def _do_download(self, widget=None, eve=None):
self._event_system.post_event("get_current_state", None)
dir = self._fm_state.tab.get_current_directory()
self._download(dir)
@threaded
def _do_download(self, widget=None, eve=None):
self._event_system.push_gui_event([self.name, "get_current_state", ()])
self.wait_for_fm_message()
state = self._event_message
subprocess.Popen([f'{self.path}/download.sh' , state.tab.get_current_directory()])
self._event_message = None
def _download(self, dir):
subprocess.Popen([f'{self.path}/download.sh', dir])