Use signals instead of calling procedures directly

Author: beef331

src/bookmarks.py

@@ -26,13 +26,14 @@ class PortfolioBookmarks(GObject.GObject):
     __gtype_name__ = "PortfolioBookmarks"
 
     __gsignals__ = {
-        "bookmark_toggled": (GObject.SignalFlags.RUN_LAST, None, (str,)),
+        "toggle-bookmark": (GObject.SignalFlags.RUN_LAST, None, (str,)),
     }
 
     def __init__(self):
         GObject.GObject.__init__(self)
+        self.connect("toggle-bookmark", self._toggle_bookmark)
 
-        self._bookmarked = {}
+        self.bookmarked = {}
         self._portfolio_config_path = os.path.join(GLib.get_user_config_dir(), "portfolio")
         self._bookmark_path = os.path.join(self._portfolio_config_path, "bookmarks")
 
@@ -50,33 +51,30 @@ def __init__(self):
                         self._add_bookmark(path)
 
         except (json.JSONDecodeError, OSError, IOError):
-            self._bookmarked = {}
-
-        self.connect("bookmark_toggled", self._toggle_bookmark)
+            self.bookmarked = {}
 
     def _add_bookmark(self, path):
-        if path not in self._bookmarked:
+        if path not in self.bookmarked:
             name = os.path.basename(path)
-            self._bookmarked[path] = 0 # Python Hashsets are limited?
+            self.bookmarked[path] = 0 # Python Hashsets are limited?
 
     def _delete_bookmark(self, path):
-        if path in self._bookmarked:
-            self._bookmarked.pop(path)
+        if path in self.bookmarked:
+            self.bookmarked.pop(path)
 
     def _is_bookmarked(self, path):
-        return path in self._bookmarked
-
-    def _toggle_bookmark(self, path):
-        print("hello")
-        if self._is_bookmarked(path):
-            self._delete_bookmark(path)
-        else:
-            self._add_bookmark(path)
+        return path in self.bookmarked
 
     def _save_bookmarks(self):
         os.makedirs(self._portfolio_config_path, exist_ok = True)
         with open(self._bookmark_path, 'w') as f:
-            paths = [bookmark for bookmark in self._bookmarked]
+            paths = [bookmark for bookmark in self.bookmarked]
             json.dump(paths, f)
 
+    def _toggle_bookmark(self, button, path):
+        if self._is_bookmarked(path):
+            self._delete_bookmark(path)
+        else:
+            self._add_bookmark(path)
+        self._save_bookmarks()
 

src/place.py

@@ -24,6 +24,7 @@ class PortfolioPlace(Adw.ActionRow):
 
     icon = Gtk.Template.Child()
     eject = Gtk.Template.Child()
+    remove_bookmark = Gtk.Template.Child()
     mount = None
     path = ""
     uuid = ""

src/place.ui

@@ -25,6 +25,20 @@
               <class name="eject-button"/>
             </style>
           </object>
+          <object class="GtkButton" id="remove_bookmark">
+            <property name="visible">0</property>
+            <property name="hexpand">1</property>
+            <property name="halign">end</property>
+            <property name="valign">center</property>
+            <child>
+              <object class="GtkImage">
+                <property name="icon-name">bookmark-outline-symbolic</property>
+              </object>
+            </child>
+            <style>
+              <class name="remove-bookmark"/>
+            </style>
+          </object>
         </child>
       </object>
     </child>

src/places.py

@@ -36,6 +36,7 @@ class PortfolioPlaces(Gtk.Stack):
         "removed": (GObject.SignalFlags.RUN_LAST, None, (str, bool)),
         "failed": (GObject.SignalFlags.RUN_LAST, None, (str,)),
         "unlock": (GObject.SignalFlags.RUN_LAST, None, (object,)),
+        "toggle-bookmark": (GObject.SignalFlags.RUN_LAST, None, (str,)),
     }
 
     FLATPAK_INFO = os.path.join(os.path.abspath(os.sep), ".flatpak-info")
@@ -66,6 +67,7 @@ def __init__(self, **kargs):
         self._setup()
 
     def _setup(self):
+        self.connect("toggle-bookmark", self._on_bookmark_toggled)
         self.props.visible = True
         self.props.transition_type = Gtk.StackTransitionType.CROSSFADE
 
@@ -77,7 +79,6 @@ def _setup(self):
         self._devices.connect("encrypted-added", self._on_encrypted_added)
 
         self._bookmarks = PortfolioBookmarks()
-        self._bookmarks.connect("bookmark_toggled", self._on_bookmark_toggled)
 
         # begin UI structure
 
@@ -102,6 +103,9 @@ def _setup(self):
         self._bookmarks_group.props.title = _("Bookmarks")
         self._bookmarks_group.props.visible = True
 
+        for path in self._bookmarks.bookmarked:
+            self._add_bookmark_place(path)
+
         # places
 
         if self._has_permission_for(self.HOME_PERMISSION):
@@ -405,6 +409,14 @@ def _find_place_by_path(self, listbox, path):
                 return place
         return None
 
+    def _remove_bookmark(self, button, path):
+        place = self._find_place_by_path(self._bookmarks_listbox, path)
+        if place is not None:
+            self._bookmarks_group.remove(place)
+            self._bookmarks.emit("toggle-bookmark", path)
+            return True
+        return False
+
     def _add_bookmark_place(self, path):
         name = os.path.basename(path)
         place = self._add_place(
@@ -413,10 +425,13 @@ def _add_bookmark_place(self, path):
             name,
             path
         )
+        place.remove_bookmark.props.visible = True
+        place.remove_bookmark.connect("clicked", self._remove_bookmark, path)
 
-    def _on_bookmark_toggled(self, path):
+    def _on_bookmark_toggled(self, places, path):
         place = self._find_place_by_path(self._bookmarks_listbox, path)
         if place is None:
             self._add_bookmark_place(path)
         else:
             self._bookmarks_group.remove(place)
+        self._bookmarks.emit("toggle-bookmark", path)

src/window.py

@@ -149,7 +149,7 @@ def _setup(self):
         self.select_all.connect("clicked", self._on_select_all)
         self.select_none.connect("clicked", self._on_select_none)
         self.new_folder.connect("clicked", self._on_new_folder)
-        self.bookmark.connect("clicked", self._on_bookmark)
+        self.bookmark.connect("clicked", self._toggle_bookmark)
         self.close_button.connect("clicked", self._on_button_closed)
         self.go_top_button.connect("clicked", self._go_to_top)
         self.stop_button.connect("clicked", self._on_stop_clicked)
@@ -861,9 +861,8 @@ def _on_new_folder(self, button):
         directory = self._history[self._index]
         self.files.add_new_folder_row(directory)
 
-    def _on_bookmark(self, button):
-        self._places._on_bookmark_toggled(self._history[self._index])
-        #self.emit("bookmark_toggled", self._history[self._index])
+    def _toggle_bookmark(self, button):
+        self._places.emit("toggle-bookmark", self._history[self._index])
 
     def _on_restore_trash_clicked(self, button):
         selection = self.files.get_selection()