From fb429cd1b61a2caa8b4bf99c95e26397ecdee300 Mon Sep 17 00:00:00 2001 From: maximstewart Date: Sun, 7 Feb 2021 18:49:29 -0600 Subject: [PATCH] fm fixes --- README.md | 2 +- src/core/utils/shellfm/windows/Launcher.py | 2 +- src/core/utils/shellfm/windows/Settings.py | 24 ++++++++++------------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 932df05..61541ba 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ WebFM is a media and file viewer aspiring to become a full fledged file manager 5. Update client_secrets.json > 'client_secret' field with your Keycloak key. (Current one is local to me and not public) 6. Place files or start uploading some to the folders. 7. Place an image such as a jpg, png, or gif labeled "000.itsExtension" in a directory and the viewer will use it as the background image for that folder/directory. -7. Password protect folder based on core/utils/shellfm/windows/webfm_config.json file settings. +7. Password protect folder based on core/utils/shellfm/windows/Settings.py file settings. 8. Save paths to favorites list for quick access. Notes: diff --git a/src/core/utils/shellfm/windows/Launcher.py b/src/core/utils/shellfm/windows/Launcher.py index 0fdc3bb..6c748e9 100644 --- a/src/core/utils/shellfm/windows/Launcher.py +++ b/src/core/utils/shellfm/windows/Launcher.py @@ -23,7 +23,7 @@ class Launcher: elif lowerName.endswith(self.fimages): command = [self.image_app, file] elif lowerName.endswith(self.fmusic): - command = [self.music_app], file] + command = [self.music_app, file] elif lowerName.endswith(self.foffice): command = [self.office_app, file] elif lowerName.endswith(self.ftext): diff --git a/src/core/utils/shellfm/windows/Settings.py b/src/core/utils/shellfm/windows/Settings.py index 3d3b173..f54a473 100644 --- a/src/core/utils/shellfm/windows/Settings.py +++ b/src/core/utils/shellfm/windows/Settings.py @@ -14,21 +14,19 @@ class Settings: REMUX_FOLDER = None # Used for Remuxed files and is set by passing in FFMPG_THUMBNLR = None # Used for thumbnail generator binary and is set by passing in HIDE_HIDDEN_FILES = True + lock_folder = True + go_past_home = False - CONFIG_FILE = path.dirname(__file__) + '/webfm_config.json' subpath = "/LazyShare" # modify 'home' folder path - - locked_folders = "Synced Backup::::venv::::flasks".split("::::") - mplayer_options = "-quiet -really-quiet -xy 1600 -geometry 50%:50%".split() - music_app = "/opt/deadbeef/bin/deadbeef" - media_app = "mpv" - image_app = "mirage" - office_app = "libreoffice" - pdf_app = "evince" - text_app = "leafpad" - file_manager_app = "spacefm" - lock_folder = True - go_past_home = False + locked_folders = "Synced Backup::::venv::::flasks".split("::::") + mplayer_options = "-quiet -really-quiet -xy 1600 -geometry 50%:50%".split() + music_app = "/opt/deadbeef/bin/deadbeef" + media_app = "mpv" + image_app = "mirage" + office_app = "libreoffice" + pdf_app = "evince" + text_app = "leafpad" + file_manager_app = "spacefm" remux_folder_max_disk_usage = "8589934592"