quexten/goldwarden
1
1
Fork 0
mirror of https://github.com/quexten/goldwarden.git synced 2024-11-23 21:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #193 from quexten/feature/resource-file

Browse Source 
Move commands to resource.json
This commit is contained in:
Bernd Schoolmann 2024-05-03 22:50:25 +02:00 committed by GitHub
commit c56fbb2dd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/src/gui/browserbiometrics.py
View File

@ -8,7 +8,7 @@ gi.require_version('Adw', '1')
from gi.repository import Gtk, Adw, GLib, Gdk, Gio
from ..services import goldwarden
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template, load_json
import subprocess
from . import components
import os
@ -26,6 +26,9 @@ class GoldwardenBrowserBiometricsSetupGuideApp(Adw.Application):
builder = load_template("browserbiometrics.ui")
self.window = builder.get_object("window")
self.window.set_application(self)
commands = load_json("commands")
self.setup_command_row = builder.get_object("setup_command_row")
self.setup_command_row.set_subtitle(commands["browserbiometric-setup"])
if __name__ == "__main__":
app = GoldwardenBrowserBiometricsSetupGuideApp(application_id="com.quexten.Goldwarden.browserbiometrics")

2
gui/src/gui/login.py
View File

@ -5,7 +5,7 @@ import gc
import time
from gi.repository import Gtk, Adw, GLib, Notify, Gdk
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import sys
import os
from ..services import goldwarden

2
gui/src/gui/pinentry.py
View File

@ -5,7 +5,7 @@ import gc
import time
from gi.repository import Gtk, Adw, GLib, Notify, Gdk
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import sys
import os

2
gui/src/gui/pinentry_approval.py
View File

@ -5,7 +5,7 @@ import gc
import time
from gi.repository import Gtk, Adw, GLib, Notify, Gdk
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import sys
import os

2
gui/src/gui/quickaccess.py
View File

@ -7,7 +7,7 @@ import time
from gi.repository import Gtk, Adw, GLib, Notify, Gdk
from ..services import goldwarden
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import sys
import os
from ..services import totp

6
gui/src/gui/template_loader.py → gui/src/gui/resource_loader.py
View File

@ -1,5 +1,6 @@
import os
from gi.repository import Gtk
import json
isflatpak = os.path.exists("/.flatpak-info")
pathprefix = "/app/bin/src/gui/" if isflatpak else "./src/gui/"
@ -8,3 +9,8 @@ def load_template(path):
builder = Gtk.Builder()
builder.add_from_file(pathprefix + ".templates/" + path)
return builder
def load_json(name):
with open(pathprefix + "resources/" + name + ".json", "r") as f:
result = json.load(f)
return result

5
gui/src/gui/resources/commands.json Normal file
View File

@ -0,0 +1,5 @@
{
"browserbiometric-setup": "flatpak run --filesystem=home --command=goldwarden com.quexten.Goldwarden setup browserbiometrics",
"add-ssh-key": "flatpak run --command=goldwarden com.quexten.Goldwarden ssh add --name MY_KEY_NAME",
"ssh-socket-path": "export SSH_AUTH_SOCK=/home/$USER/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock"
}

2
gui/src/gui/settings.py
View File

@ -8,7 +8,7 @@ gi.require_version('Adw', '1')
from gi.repository import Gtk, Adw, GLib, Gdk, Gio
from ..services import goldwarden
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import subprocess
import os

2
gui/src/gui/shortcuts.py
View File

@ -8,7 +8,7 @@ gi.require_version('Adw', '1')
from gi.repository import Gtk, Adw, GLib, Gdk, Gio
from ..services import goldwarden
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template
import subprocess
from . import components
import os

7
gui/src/gui/ssh.py
View File

@ -8,7 +8,7 @@ gi.require_version('Adw', '1')
from gi.repository import Gtk, Adw, GLib, Gdk, Gio
from ..services import goldwarden
from threading import Thread
from .template_loader import load_template
from .resource_loader import load_template, load_json
import subprocess
from . import components
import os
@ -26,6 +26,11 @@ class GoldwardenSSHSetupGuideApp(Adw.Application):
builder = load_template("ssh.ui")
self.window = builder.get_object("window")
self.window.set_application(self)
commands = load_json("commands")
self.add_ssh_key_row = builder.get_object("add_ssh_key_row")
self.add_ssh_key_row.set_subtitle(commands["add-ssh-key"])
self.ssh_socket_path_row = builder.get_object("ssh_socket_path_row")
self.ssh_socket_path_row.set_subtitle(commands["ssh-socket-path"])
if __name__ == "__main__":
app = GoldwardenSSHSetupGuideApp(application_id="com.quexten.Goldwarden.sshsetup")