Skip to content

Commit

Permalink
config.misc.pluginlist.fc_bookmarks_order
Browse files Browse the repository at this point in the history 
Couldn't handle bookmarks with , in path.
Don't use .split(,) and ,.join() to use ConfigText as list.
Use list as string for ConfigText.

cherry-pick > openatv/enigma2@d56712f
  • Loading branch information
@fairbird
fairbird committed Jan 4, 2025
1 parent 8961cad commit 91b7d04
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions lib/python/Plugins/Extensions/FileCommander/plugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ def makeSymlinkCallback(newName):

def keyManageBookmarks(self, current):
bookmarks = config.plugins.FileCommander.bookmarks.value
order = config.misc.pluginlist.fc_bookmarks_order.value.split(",")
order = eval(config.misc.pluginlist.fcBookmarksOrder.value)
directory = current and self.sourceColumn.getCurrentDirectory() or self.sourceColumn.getPath()
if directory in bookmarks:
bookmarks.remove(directory)
Expand All @@ -1029,8 +1029,8 @@ def keyManageBookmarks(self, current):
self.displayStatus(_("Bookmark added."))
config.plugins.FileCommander.bookmarks.value = bookmarks
config.plugins.FileCommander.bookmarks.save()
config.misc.pluginlist.fc_bookmarks_order.value = ",".join(order)
config.misc.pluginlist.fc_bookmarks_order.save()
config.misc.pluginlist.fcBookmarksOrder.value = str(order)
config.misc.pluginlist.fcBookmarksOrder.save()

def keyMediaInfo(self):
self.shortcutAction("mediainfo")
Expand Down Expand Up @@ -1581,13 +1581,13 @@ def selectBookmarkCallback(answer):

bookmarks = [(x, x) for x in config.plugins.FileCommander.bookmarks.value]
bookmarks.insert(0, (_("Storage Devices"), None))
order = config.misc.pluginlist.fc_bookmarks_order.value.split(",")
order = eval(config.misc.pluginlist.fcBookmarksOrder.value)
if order and _("Storage Devices") in order:
order.remove(_("Storage Devices"))
order.insert(0, _("Storage Devices"))
config.misc.pluginlist.fc_bookmarks_order.value = ",".join(order)
config.misc.pluginlist.fc_bookmarks_order.save()
self.session.openWithCallback(selectBookmarkCallback, ChoiceBox, title=_("Select Bookmark"), list=bookmarks, reorderConfig="fc_bookmarks_order")
config.misc.pluginlist.fcBookmarksOrder.value = str(order)
config.misc.pluginlist.fcBookmarksOrder.save()
self.session.openWithCallback(selectBookmarkCallback, ChoiceBox, title=_("Select Bookmark"), list=bookmarks, reorderConfig="fcBookmarksOrder")

def keySettings(self):
def settingsCallback(*answer):
Expand Down
5 changes: 3 additions & 2 deletions lib/python/Screens/ChoiceBox.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
from enigma import ePoint, eSize, getDesktop

config.misc.pluginlist = ConfigSubsection()
config.misc.pluginlist.eventinfo_order = ConfigText(default="")
config.misc.pluginlist.extension_order = ConfigText(default="")
config.misc.pluginlist.eventinfoOrder = ConfigText(default="[]")
config.misc.pluginlist.extensionOrder = ConfigText(default="[]")
config.misc.pluginlist.fcBookmarksOrder = ConfigText(default=f"['{_("Storage Devices")}']")


class ChoiceBox(Screen):
Expand Down

2 comments on commit 91b7d04

@68foxboris
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2025-01-05 12:20:18.7130 Traceback (most recent call last):
2025-01-05 12:20:18.7167 File "/usr/lib/enigma2/python/Screens/Hotkey.py", line 587, in action
2025-01-05 12:20:18.7168 File "/usr/lib/enigma2/python/Screens/Hotkey.py", line 634, in hotkeyGlobal
2025-01-05 12:20:18.7169 File "/usr/lib/enigma2/python/Screens/Hotkey.py", line 678, in execHotkey
2025-01-05 12:20:18.7170 File "", line 1, in
2025-01-05 12:20:18.7170 File "/usr/lib/enigma2/python/Screens/InfoBarGenerics.py", line 1456, in showEventInfoPlugins
2025-01-05 12:20:18.7171 File "/usr/lib/enigma2/python/StartEnigma.py", line 162, in openWithCallback
dialog = self.open(screen, *arguments, **kwargs)
2025-01-05 12:20:18.7171 File "/usr/lib/enigma2/python/StartEnigma.py", line 173, in open
dialog = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs)
~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2025-01-05 12:20:18.7172 File "/usr/lib/enigma2/python/StartEnigma.py", line 109, in instantiateDialog
return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2025-01-05 12:20:18.7173 File "/usr/lib/enigma2/python/StartEnigma.py", line 132, in doInstantiateDialog
dialog = screen(self, *arguments, **kwargs) # Create dialog.
2025-01-05 12:20:18.7174 File "/usr/lib/enigma2/python/Screens/ChoiceBox.py", line 49, in init
2025-01-05 12:20:18.7174 File "", line 1, in
2025-01-05 12:20:18.7175 File "/usr/lib/enigma2/python/Components/config.py", line 2220, in getattr
2025-01-05 12:20:18.7176 AttributeError: eventinfo_order

@fairbird
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1374545

Please sign in to comment.