izaliamae/barkshark-web
Archived
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

fix extension loading and another naming issue

Browse source
This commit is contained in:
Izalia Mae 2021-07-14 20:01:58 -04:00
parent fe9203dea5
commit b144ff77b6
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bsweb/component/window.py
View file

@ -344,7 +344,7 @@ class Window(Gtk.ApplicationWindow):
tab = self.current_tab
if arg == 'menu':
self['nav-menu-popover'].popdown()
self['navbar-menu-popover'].popdown()
if name == 'library':
self.OpenLibrary()
@ -372,7 +372,7 @@ class Window(Gtk.ApplicationWindow):
elif tab and tab.webview:
if name == 'go':
tab.LoadUrl(self['nav-url'].get_text())
tab.LoadUrl(self['navbar-url'].get_text())
elif name == 'prev':
tab.webview.go_back()

16
bsweb/extensions/server.py
View file

@ -58,20 +58,24 @@ class ExtMessageServer(threading.Thread):
extension.setup(path)
exttype = 'user' if path else 'system'
if None in [extension.manifest.name, extension.manifest.shortname, extension.manifest.author, extension.digest]:
raise ValueError('Missing name or author for extension')
if path:
extension.path = path
with db.session as s:
if not s.get.extension(extension.digest):
options = {
'system': not path
}
if ext == extensions.ExtPrintJsLog:
options['enabled'] = False
if not s.put.extension(extension, system=not path):
return
if ext in [extensions.ExtPreventAutoplay, extensions.ExtPrintJsLog]:
s.put.extstate(extension.digest, False)
if None in [extension.manifest.name, extension.manifest.shortname, extension.manifest.author, extension.digest]:
raise ValueError('Missing name or author for extension')
getattr(self, exttype).append(extension)
logging.verbose(f'Loaded {exttype} extension:', extension.manifest.name)