From 645b057d49653e3feaede789d4860855e2704787 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Tue, 4 Jul 2023 18:40:40 -0400 Subject: [PATCH] Performance fix in _findBookmark(), some comments. --- owrx/bookmarks.py | 1 + owrx/controllers/settings/bookmarks.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/owrx/bookmarks.py b/owrx/bookmarks.py index 15e209d8..accc394e 100644 --- a/owrx/bookmarks.py +++ b/owrx/bookmarks.py @@ -119,6 +119,7 @@ class Bookmarks(object): return result def getEditableBookmarks(self): + # Only return bookmarks that can be saved self._refresh() return [b for b in self.bookmarks if b.srcFile is None] diff --git a/owrx/controllers/settings/bookmarks.py b/owrx/controllers/settings/bookmarks.py index 0d4104e0..9cd39e7e 100644 --- a/owrx/controllers/settings/bookmarks.py +++ b/owrx/controllers/settings/bookmarks.py @@ -86,7 +86,7 @@ class BookmarksController(AuthorizationMixin, BreadcrumbMixin, WebpageController def _findBookmark(self, bookmark_id): bookmarks = Bookmarks.getSharedInstance() try: - return next(b for b in bookmarks.getEditableBookmarks() if id(b) == bookmark_id) + return next(b for b in bookmarks.getBookmarks() if id(b) == bookmark_id) except StopIteration: return None