appmenus: initial conversion to core3 API
This commits change code itself for core3 API, but doesn't plug it anywhere yet. QubesOS/qubes-issues#1897
This commit is contained in:
Marek Marczykowski-Górecki
parent
b91eace873
commit
d446f849d8
@ -27,368 +27,331 @@ import os.path
|
|||||||
import shutil
|
import shutil
|
||||||
import dbus
|
import dbus
|
||||||
|
|
||||||
from qubes.qubes import QubesVm, QubesHVm
|
import qubes.ext
|
||||||
from qubes.qubes import vm_files, system_path
|
|
||||||
|
|
||||||
import qubesimgconverter
|
import qubesimgconverter
|
||||||
|
|
||||||
vm_files['appmenus_templates_subdir'] = 'apps.templates'
|
|
||||||
vm_files['appmenus_template_icons_subdir'] = 'apps.tempicons'
|
|
||||||
vm_files['appmenus_subdir'] = 'apps'
|
|
||||||
vm_files['appmenus_icons_subdir'] = 'apps.icons'
|
|
||||||
vm_files['appmenus_template_templates_subdir'] = 'apps-template.templates'
|
|
||||||
vm_files['appmenus_whitelist'] = 'whitelisted-appmenus.list'
|
|
||||||
|
|
||||||
system_path['appmenu_start_hvm_template'] = \
|
class AppmenusSubdirs:
|
||||||
'/usr/share/qubes-appmenus/qubes-start.desktop'
|
templates_subdir = 'apps.templates'
|
||||||
system_path['appmenu_create_cmd'] = \
|
template_icons_subdir = 'apps.tempicons'
|
||||||
'/usr/libexec/qubes-appmenus/create-apps-for-appvm.sh'
|
subdir = 'apps'
|
||||||
system_path['appmenu_remove_cmd'] = \
|
icons_subdir = 'apps.icons'
|
||||||
'/usr/libexec/qubes-appmenus/remove-appvm-appmenus.sh'
|
template_templates_subdir = 'apps-template.templates'
|
||||||
|
whitelist = 'whitelisted-appmenus.list'
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_get_appmenus_templates_dir(self):
|
class AppmenusPaths:
|
||||||
if self.updateable:
|
appmenu_start_hvm_template = \
|
||||||
return self.absolute_path(vm_files["appmenus_templates_subdir"], None)
|
'/usr/share/qubes-appmenus/qubes-start.desktop'
|
||||||
elif self.template is not None:
|
appmenu_create_cmd = \
|
||||||
return self.template.appmenus_templates_dir
|
'/usr/libexec/qubes-appmenus/create-apps-for-appvm.sh'
|
||||||
else:
|
appmenu_remove_cmd = \
|
||||||
return None
|
'/usr/libexec/qubes-appmenus/remove-appvm-appmenus.sh'
|
||||||
|
|
||||||
QubesVm.appmenus_templates_dir = property(QubesVm_get_appmenus_templates_dir)
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_get_appmenus_template_icons_dir(self):
|
class AppmenusExtension(qubes.ext.Extension):
|
||||||
if self.updateable:
|
def __init__(self, *args):
|
||||||
return self.absolute_path(vm_files["appmenus_template_icons_subdir"],
|
super(AppmenusExtension, self).__init__(*args)
|
||||||
None)
|
import qubes.vm.qubesvm
|
||||||
elif self.template:
|
|
||||||
return self.template.appmenus_template_icons_dir
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
QubesVm.appmenus_template_icons_dir = \
|
def templates_dir(self, vm):
|
||||||
property(QubesVm_get_appmenus_template_icons_dir)
|
"""
|
||||||
|
|
||||||
|
:type vm: qubes.vm.qubesvm.QubesVM
|
||||||
def QubesVm_get_appmenus_dir(self):
|
"""
|
||||||
return self.absolute_path(vm_files["appmenus_subdir"], None)
|
assert isinstance(vm, qubes.vm.qubesvm.QubesVM)
|
||||||
|
if vm.updateable:
|
||||||
QubesVm.appmenus_dir = property(QubesVm_get_appmenus_dir)
|
return os.path.join(vm.dir_path,
|
||||||
|
AppmenusSubdirs.templates_subdir)
|
||||||
|
elif hasattr(vm, 'template'):
|
||||||
def QubesVm_get_appmenus_icons_dir(self):
|
return self.templates_dir(vm.template)
|
||||||
return self.absolute_path(vm_files["appmenus_icons_subdir"], None)
|
|
||||||
|
|
||||||
|
|
||||||
QubesVm.appmenus_icons_dir = property(QubesVm_get_appmenus_icons_dir)
|
|
||||||
|
|
||||||
|
|
||||||
def get_whitelist_names(vm):
|
|
||||||
return (whitelist for whitelist in (
|
|
||||||
vm_files["appmenus_whitelist"],
|
|
||||||
'vm-' + vm_files["appmenus_whitelist"],
|
|
||||||
'netvm-' + vm_files["appmenus_whitelist"])
|
|
||||||
if os.path.exists(os.path.join(vm.dir_path, whitelist)))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appmenus_create(self, verbose=False, source_template=None):
|
|
||||||
if source_template is None:
|
|
||||||
source_template = self.template
|
|
||||||
|
|
||||||
if self.internal:
|
|
||||||
return
|
|
||||||
if self.is_disposablevm():
|
|
||||||
return
|
|
||||||
|
|
||||||
if self.is_netvm():
|
|
||||||
vmtype = 'servicevms'
|
|
||||||
elif self.is_template():
|
|
||||||
vmtype = 'vm-templates'
|
|
||||||
else:
|
|
||||||
vmtype = 'appvms'
|
|
||||||
|
|
||||||
try:
|
|
||||||
msgoutput = None if verbose else open(os.devnull, 'w')
|
|
||||||
if source_template is not None:
|
|
||||||
subprocess.check_call([system_path["appmenu_create_cmd"],
|
|
||||||
source_template.appmenus_templates_dir,
|
|
||||||
self.name, vmtype, self.label.icon],
|
|
||||||
stdout=msgoutput, stderr=msgoutput)
|
|
||||||
elif self.appmenus_templates_dir is not None:
|
|
||||||
subprocess.check_call([system_path["appmenu_create_cmd"],
|
|
||||||
self.appmenus_templates_dir, self.name,
|
|
||||||
vmtype, self.label.icon],
|
|
||||||
stdout=msgoutput, stderr=msgoutput)
|
|
||||||
else:
|
else:
|
||||||
# Only add apps to menu
|
return None
|
||||||
subprocess.check_call([system_path["appmenu_create_cmd"],
|
|
||||||
"none", self.name, vmtype,
|
|
||||||
self.label.icon],
|
|
||||||
stdout=msgoutput, stderr=msgoutput)
|
|
||||||
except subprocess.CalledProcessError:
|
|
||||||
print >> sys.stderr, "Ooops, there was a problem creating appmenus " \
|
|
||||||
"for {0} VM!".format(self.name)
|
|
||||||
|
|
||||||
|
def template_icons_dir(self, vm):
|
||||||
def QubesVm_appmenus_remove(self):
|
if vm.updateable:
|
||||||
if self.is_netvm():
|
return os.path.join(vm.dir_path,
|
||||||
vmtype = 'servicevms'
|
AppmenusSubdirs.template_icons_subdir)
|
||||||
elif self.is_template():
|
elif hasattr(vm, 'template'):
|
||||||
vmtype = 'vm-templates'
|
return self.template_icons_dir(vm.template)
|
||||||
else:
|
|
||||||
vmtype = 'appvms'
|
|
||||||
subprocess.check_call([system_path["appmenu_remove_cmd"], self.name,
|
|
||||||
vmtype], stderr=open(os.devnull, 'w'))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appmenus_cleanup(self):
|
|
||||||
srcdir = self.appmenus_templates_dir
|
|
||||||
if srcdir is None:
|
|
||||||
return
|
|
||||||
if not os.path.exists(srcdir):
|
|
||||||
return
|
|
||||||
if not os.path.exists(self.appmenus_dir):
|
|
||||||
return
|
|
||||||
|
|
||||||
for appmenu in os.listdir(self.appmenus_dir):
|
|
||||||
if not os.path.exists(os.path.join(srcdir, appmenu)):
|
|
||||||
os.unlink(os.path.join(self.appmenus_dir, appmenu))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appmenus_replace_entry(self, old_name, new_name):
|
|
||||||
for whitelist in get_whitelist_names(self):
|
|
||||||
whitelist_path = os.path.join(self.dir_path, whitelist)
|
|
||||||
with open(whitelist_path) as f:
|
|
||||||
old_lines = f.readlines()
|
|
||||||
new_lines = [
|
|
||||||
(new_name + '\n' if l == old_name + '\n' else l)
|
|
||||||
for l in old_lines]
|
|
||||||
if new_lines != old_lines:
|
|
||||||
with open(whitelist_path, 'w') as f:
|
|
||||||
f.write(''.join(new_lines))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appicons_create(self, srcdir=None, force=False):
|
|
||||||
if srcdir is None:
|
|
||||||
srcdir = self.appmenus_template_icons_dir
|
|
||||||
if srcdir is None:
|
|
||||||
return
|
|
||||||
if not os.path.exists(srcdir):
|
|
||||||
return
|
|
||||||
|
|
||||||
if self.internal:
|
|
||||||
return
|
|
||||||
if self.is_disposablevm():
|
|
||||||
return
|
|
||||||
|
|
||||||
whitelist = os.path.join(self.dir_path, vm_files['appmenus_whitelist'])
|
|
||||||
if os.path.exists(whitelist):
|
|
||||||
whitelist = [line.strip() for line in open(whitelist)]
|
|
||||||
else:
|
|
||||||
whitelist = None
|
|
||||||
|
|
||||||
if not os.path.exists(self.appmenus_icons_dir):
|
|
||||||
os.mkdir(self.appmenus_icons_dir)
|
|
||||||
elif not os.path.isdir(self.appmenus_icons_dir):
|
|
||||||
os.unlink(self.appmenus_icons_dir)
|
|
||||||
os.mkdir(self.appmenus_icons_dir)
|
|
||||||
|
|
||||||
for icon in os.listdir(srcdir):
|
|
||||||
desktop = os.path.splitext(icon)[0] + '.desktop'
|
|
||||||
if whitelist and desktop not in whitelist:
|
|
||||||
continue
|
|
||||||
|
|
||||||
src_icon = os.path.join(srcdir, icon)
|
|
||||||
dst_icon = os.path.join(self.appmenus_icons_dir, icon)
|
|
||||||
if not os.path.exists(dst_icon) or force or \
|
|
||||||
os.path.getmtime(src_icon) > os.path.getmtime(dst_icon):
|
|
||||||
qubesimgconverter.tint(src_icon, dst_icon, self.label.color)
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appicons_remove(self):
|
|
||||||
if not os.path.exists(self.appmenus_icons_dir):
|
|
||||||
return
|
|
||||||
for icon in os.listdir(self.appmenus_icons_dir):
|
|
||||||
os.unlink(os.path.join(self.appmenus_icons_dir, icon))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appicons_cleanup(self):
|
|
||||||
srcdir = self.appmenus_template_icons_dir
|
|
||||||
if srcdir is None:
|
|
||||||
return
|
|
||||||
if not os.path.exists(srcdir):
|
|
||||||
return
|
|
||||||
if not os.path.exists(self.appmenus_icons_dir):
|
|
||||||
return
|
|
||||||
|
|
||||||
for icon in os.listdir(self.appmenus_icons_dir):
|
|
||||||
if not os.path.exists(os.path.join(srcdir, icon)):
|
|
||||||
os.unlink(os.path.join(self.appmenus_icons_dir, icon))
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_pre_rename(self, new_name):
|
|
||||||
self.appmenus_remove()
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_post_rename(self, old_name):
|
|
||||||
self.appmenus_create()
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_create_on_disk(self, verbose, source_template):
|
|
||||||
if isinstance(self, QubesHVm) and source_template is None:
|
|
||||||
if verbose:
|
|
||||||
print >> sys.stderr, "--> Creating appmenus directory: {0}".format(
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
os.mkdir(self.appmenus_templates_dir)
|
|
||||||
shutil.copy(system_path["appmenu_start_hvm_template"],
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
|
|
||||||
source_whitelist_filename = 'vm-' + vm_files["appmenus_whitelist"]
|
|
||||||
if self.is_netvm():
|
|
||||||
source_whitelist_filename = 'netvm-' + vm_files["appmenus_whitelist"]
|
|
||||||
if source_template and os.path.exists(
|
|
||||||
os.path.join(source_template.dir_path, source_whitelist_filename)):
|
|
||||||
if verbose:
|
|
||||||
print >> sys.stderr, "--> Creating default whitelisted apps list: {0}". \
|
|
||||||
format(self.dir_path + '/' + vm_files["whitelisted_appmenus"])
|
|
||||||
shutil.copy(
|
|
||||||
os.path.join(source_template.dir_path, source_whitelist_filename),
|
|
||||||
os.path.join(self.dir_path, vm_files["whitelisted_appmenus"]))
|
|
||||||
|
|
||||||
if source_template and self.updateable:
|
|
||||||
if verbose:
|
|
||||||
print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}". \
|
|
||||||
format(source_template.appmenus_templates_dir,
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
if os.path.isdir(source_template.appmenus_templates_dir):
|
|
||||||
shutil.copytree(source_template.appmenus_templates_dir,
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
else:
|
else:
|
||||||
os.mkdir(self.appmenus_templates_dir)
|
return None
|
||||||
if os.path.isdir(source_template.appmenus_template_icons_dir):
|
|
||||||
shutil.copytree(source_template.appmenus_template_icons_dir,
|
|
||||||
self.appmenus_template_icons_dir)
|
|
||||||
else:
|
|
||||||
os.mkdir(self.appmenus_template_icons_dir)
|
|
||||||
|
|
||||||
# Create appmenus
|
def appmenus_dir(self, vm):
|
||||||
self.appicons_create()
|
return os.path.join(vm.dir_path, AppmenusSubdirs.subdir)
|
||||||
self.appmenus_create(verbose=verbose)
|
|
||||||
|
|
||||||
|
def icons_dir(self, vm):
|
||||||
|
return os.path.join(vm.dir_path, AppmenusSubdirs.icons_subdir)
|
||||||
|
|
||||||
def QubesVm_clone_disk_files(self, src_vm, verbose):
|
def appmenus_create(self, vm, source_template=None):
|
||||||
if src_vm.updateable and src_vm.appmenus_templates_dir is not None and \
|
if source_template is None and hasattr(vm, 'template'):
|
||||||
self.appmenus_templates_dir is not None:
|
source_template = vm.template
|
||||||
if verbose:
|
|
||||||
print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}". \
|
|
||||||
format(src_vm.appmenus_templates_dir,
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
shutil.copytree(src_vm.appmenus_templates_dir,
|
|
||||||
self.appmenus_templates_dir)
|
|
||||||
|
|
||||||
if src_vm.updateable and src_vm.appmenus_template_icons_dir is not None \
|
if vm.internal:
|
||||||
and self.appmenus_template_icons_dir is not None and \
|
return
|
||||||
os.path.isdir(src_vm.appmenus_template_icons_dir):
|
if vm.is_disposablevm():
|
||||||
if verbose:
|
return
|
||||||
print >> sys.stderr, "--> Copying the template's appmenus " \
|
|
||||||
"template icons dir:\n{0} ==>\n{1}". \
|
|
||||||
format(src_vm.appmenus_template_icons_dir,
|
|
||||||
self.appmenus_template_icons_dir)
|
|
||||||
shutil.copytree(src_vm.appmenus_template_icons_dir,
|
|
||||||
self.appmenus_template_icons_dir)
|
|
||||||
|
|
||||||
for whitelist in get_whitelist_names(src_vm):
|
vmsubdir = vm.dir_path.split(os.path.sep)[-2]
|
||||||
if verbose:
|
|
||||||
print >> sys.stderr, "--> Copying whitelisted apps list: {0}". \
|
|
||||||
format(whitelist)
|
|
||||||
shutil.copy(os.path.join(src_vm.dir_path, whitelist),
|
|
||||||
os.path.join(self.dir_path, whitelist))
|
|
||||||
|
|
||||||
# Create appmenus
|
|
||||||
self.appicons_create()
|
|
||||||
self.appmenus_create(verbose=verbose)
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_remove_from_disk(self):
|
|
||||||
self.appmenus_remove()
|
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_label_setter(self, _):
|
|
||||||
self.appicons_create(force=True)
|
|
||||||
|
|
||||||
# Apparently desktop environments heavily caches the icons,
|
|
||||||
# see #751 for details
|
|
||||||
if "plasma" in os.environ.get("DESKTOP_SESSION", ""):
|
|
||||||
try:
|
try:
|
||||||
os.unlink(os.path.expandvars(
|
#TODO msgoutput = None if verbose else open(os.devnull, 'w')
|
||||||
"$HOME/.kde/cache-$HOSTNAME/icon-cache.kcache"))
|
msgoutput = None
|
||||||
except:
|
if source_template is not None:
|
||||||
pass
|
subprocess.check_call([AppmenusPaths.appmenu_create_cmd,
|
||||||
try:
|
self.templates_dir(source_template),
|
||||||
notify_object = dbus.SessionBus().get_object(
|
vm.name, vmsubdir, vm.label.icon],
|
||||||
"org.freedesktop.Notifications",
|
stdout=msgoutput, stderr=msgoutput)
|
||||||
"/org/freedesktop/Notifications")
|
elif self.templates_dir(vm) is not None:
|
||||||
notify_object.Notify(
|
subprocess.check_call([AppmenusPaths.appmenu_create_cmd,
|
||||||
"Qubes", 0, self.label.icon, "Qubes",
|
self.templates_dir(vm), vm.name,
|
||||||
"You will need to log off and log in again for the VM icons "
|
vmsubdir, vm.label.icon],
|
||||||
"to update in the KDE launcher menu",
|
stdout=msgoutput, stderr=msgoutput)
|
||||||
[], [], 10000,
|
else:
|
||||||
dbus_interface="org.freedesktop.Notifications")
|
# Only add apps to menu
|
||||||
except:
|
subprocess.check_call([AppmenusPaths.appmenu_create_cmd,
|
||||||
pass
|
"none", vm.name, vmsubdir,
|
||||||
elif "xfce" in os.environ.get("DESKTOP_SESSION", ""):
|
vm.label.icon],
|
||||||
self.appmenus_remove()
|
stdout=msgoutput, stderr=msgoutput)
|
||||||
self.appmenus_create()
|
except subprocess.CalledProcessError:
|
||||||
|
vm.log.warning("Ooops, there was a problem creating appmenus "
|
||||||
|
"for {0} VM!")
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appmenus_recreate(self):
|
def appmenus_remove(self, vm):
|
||||||
"""
|
vmsubdir = vm.dir_path.split(os.path.sep)[-2]
|
||||||
Force recreation of all appmenus and icons. For example when VM label
|
subprocess.check_call([AppmenusPaths.appmenu_remove_cmd, vm.name,
|
||||||
color was changed
|
vmsubdir], stderr=open(os.devnull, 'w'))
|
||||||
"""
|
|
||||||
self.appmenus_remove()
|
def appmenus_cleanup(self, vm):
|
||||||
self.appmenus_cleanup()
|
srcdir = self.templates_dir(vm)
|
||||||
self.appicons_remove()
|
if srcdir is None:
|
||||||
self.appicons_create()
|
return
|
||||||
self.appmenus_create()
|
if not os.path.exists(srcdir):
|
||||||
|
return
|
||||||
|
if not os.path.exists(self.appmenus_dir(vm)):
|
||||||
|
return
|
||||||
|
|
||||||
|
for appmenu in os.listdir(self.appmenus_dir(vm)):
|
||||||
|
if not os.path.exists(os.path.join(srcdir, appmenu)):
|
||||||
|
os.unlink(os.path.join(self.appmenus_dir(vm), appmenu))
|
||||||
|
|
||||||
|
def appicons_create(self, vm, srcdir=None, force=False):
|
||||||
|
if srcdir is None:
|
||||||
|
srcdir = self.template_icons_dir(vm)
|
||||||
|
if srcdir is None:
|
||||||
|
return
|
||||||
|
if not os.path.exists(srcdir):
|
||||||
|
return
|
||||||
|
|
||||||
|
if vm.internal:
|
||||||
|
return
|
||||||
|
if vm.is_disposablevm():
|
||||||
|
return
|
||||||
|
|
||||||
|
whitelist = os.path.join(vm.dir_path, AppmenusSubdirs.whitelist)
|
||||||
|
if os.path.exists(whitelist):
|
||||||
|
whitelist = [line.strip() for line in open(whitelist)]
|
||||||
|
else:
|
||||||
|
whitelist = None
|
||||||
|
|
||||||
|
if not os.path.exists(self.icons_dir(vm)):
|
||||||
|
os.mkdir(self.icons_dir(vm))
|
||||||
|
elif not os.path.isdir(self.icons_dir(vm)):
|
||||||
|
os.unlink(self.icons_dir(vm))
|
||||||
|
os.mkdir(self.icons_dir(vm))
|
||||||
|
|
||||||
|
for icon in os.listdir(srcdir):
|
||||||
|
desktop = os.path.splitext(icon)[0] + '.desktop'
|
||||||
|
if whitelist and desktop not in whitelist:
|
||||||
|
continue
|
||||||
|
|
||||||
|
src_icon = os.path.join(srcdir, icon)
|
||||||
|
dst_icon = os.path.join(self.icons_dir(vm), icon)
|
||||||
|
if not os.path.exists(dst_icon) or force or \
|
||||||
|
os.path.getmtime(src_icon) > os.path.getmtime(dst_icon):
|
||||||
|
qubesimgconverter.tint(src_icon, dst_icon, vm.label.color)
|
||||||
|
|
||||||
|
def appicons_remove(self, vm):
|
||||||
|
if not os.path.exists(self.icons_dir(vm)):
|
||||||
|
return
|
||||||
|
for icon in os.listdir(self.icons_dir(vm)):
|
||||||
|
os.unlink(os.path.join(self.icons_dir(vm), icon))
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_appmenus_update(self):
|
def appicons_cleanup(self, vm):
|
||||||
"""
|
srcdir = self.template_icons_dir(vm)
|
||||||
Similar to appmenus_recreate, but do not touch unchanged files
|
if srcdir is None:
|
||||||
"""
|
return
|
||||||
self.appmenus_remove()
|
if not os.path.exists(srcdir):
|
||||||
self.appmenus_cleanup()
|
return
|
||||||
self.appicons_create()
|
if not os.path.exists(self.icons_dir(vm)):
|
||||||
self.appicons_cleanup()
|
return
|
||||||
self.appmenus_create()
|
|
||||||
|
for icon in os.listdir(self.icons_dir(vm)):
|
||||||
|
if not os.path.exists(os.path.join(srcdir, icon)):
|
||||||
|
os.unlink(os.path.join(self.icons_dir(vm), icon))
|
||||||
|
|
||||||
|
@qubes.ext.handler('property-pre-set:name')
|
||||||
|
def pre_rename(self, vm, event, prop, *args):
|
||||||
|
self.appmenus_remove(vm)
|
||||||
|
|
||||||
|
@qubes.ext.handler('property-set:name')
|
||||||
|
def post_rename(self, vm, event, prop, *args):
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
@qubes.ext.handler('domain-create-on-disk')
|
||||||
|
def create_on_disk(self, vm, event, source_template=None):
|
||||||
|
if vm.hvm and source_template is None:
|
||||||
|
vm.log.info("Creating appmenus directory: {0}".format(
|
||||||
|
self.templates_dir(vm)))
|
||||||
|
os.mkdir(self.templates_dir(vm))
|
||||||
|
shutil.copy(AppmenusPaths.appmenu_start_hvm_template,
|
||||||
|
self.templates_dir(vm))
|
||||||
|
|
||||||
|
source_whitelist_filename = 'vm-' + AppmenusSubdirs.whitelist
|
||||||
|
if vm.is_netvm():
|
||||||
|
source_whitelist_filename = 'netvm-' + AppmenusSubdirs.whitelist
|
||||||
|
if source_template and os.path.exists(
|
||||||
|
os.path.join(source_template.dir_path, source_whitelist_filename)):
|
||||||
|
vm.log.info("Creating default whitelisted apps list: {0}".
|
||||||
|
format(vm.dir_path + '/' + AppmenusSubdirs.whitelist))
|
||||||
|
shutil.copy(
|
||||||
|
os.path.join(source_template.dir_path, source_whitelist_filename),
|
||||||
|
os.path.join(vm.dir_path, AppmenusSubdirs.whitelist))
|
||||||
|
|
||||||
|
if source_template and vm.updateable:
|
||||||
|
vm.log.info("--> Copying the template's appmenus templates "
|
||||||
|
"dir:\n{0} ==>\n{1}".
|
||||||
|
format(self.templates_dir(source_template),
|
||||||
|
self.templates_dir(vm)))
|
||||||
|
if os.path.isdir(self.templates_dir(source_template)):
|
||||||
|
shutil.copytree(self.templates_dir(source_template),
|
||||||
|
self.templates_dir(vm))
|
||||||
|
else:
|
||||||
|
os.mkdir(self.templates_dir(vm))
|
||||||
|
if os.path.isdir(self.template_icons_dir(source_template)):
|
||||||
|
shutil.copytree(self.template_icons_dir(source_template),
|
||||||
|
self.template_icons_dir(vm))
|
||||||
|
else:
|
||||||
|
os.mkdir(self.template_icons_dir(vm))
|
||||||
|
|
||||||
|
# Create appmenus
|
||||||
|
self.appicons_create(vm)
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
@qubes.ext.handler('domain-clone-files')
|
||||||
|
def clone_disk_files(self, vm, event, src_vm):
|
||||||
|
if src_vm.updateable and src_vm.templates_dir(vm) is not None and \
|
||||||
|
self.templates_dir(vm) is not None:
|
||||||
|
vm.log.info("Copying the template's appmenus templates "
|
||||||
|
"dir:\n{0} ==>\n{1}".
|
||||||
|
format(self.templates_dir(src_vm),
|
||||||
|
self.templates_dir(vm)))
|
||||||
|
shutil.copytree(self.templates_dir(src_vm),
|
||||||
|
self.templates_dir(vm))
|
||||||
|
|
||||||
|
if src_vm.updateable and src_vm.template_icons_dir(vm) is not None \
|
||||||
|
and self.template_icons_dir(vm) is not None and \
|
||||||
|
os.path.isdir(self.template_icons_dir(src_vm)):
|
||||||
|
vm.log.info("Copying the template's appmenus "
|
||||||
|
"template icons dir:\n{0} ==>\n{1}".
|
||||||
|
format(self.template_icons_dir(src_vm),
|
||||||
|
self.template_icons_dir(vm)))
|
||||||
|
shutil.copytree(self.template_icons_dir(src_vm),
|
||||||
|
self.template_icons_dir(vm))
|
||||||
|
|
||||||
|
for whitelist in (
|
||||||
|
AppmenusSubdirs.whitelist,
|
||||||
|
'vm-' + AppmenusSubdirs.whitelist,
|
||||||
|
'netvm-' + AppmenusSubdirs.whitelist):
|
||||||
|
if os.path.exists(os.path.join(src_vm.dir_path, whitelist)):
|
||||||
|
vm.log.info("Copying whitelisted apps list: {0}".
|
||||||
|
format(whitelist))
|
||||||
|
shutil.copy(os.path.join(src_vm.dir_path, whitelist),
|
||||||
|
os.path.join(vm.dir_path, whitelist))
|
||||||
|
|
||||||
|
# Create appmenus
|
||||||
|
self.appicons_create(vm)
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
|
||||||
def QubesVm_set_attr(self, name, newvalue, oldvalue):
|
@qubes.ext.handler('domain-remove-from-disk')
|
||||||
if name == 'internal':
|
def remove_from_disk(self, vm, event):
|
||||||
|
self.appmenus_remove(vm)
|
||||||
|
|
||||||
|
|
||||||
|
@qubes.ext.handler('property-set:label')
|
||||||
|
def label_setter(self, vm, event, *args):
|
||||||
|
self.appicons_create(vm, force=True)
|
||||||
|
|
||||||
|
# Apparently desktop environments heavily caches the icons,
|
||||||
|
# see #751 for details
|
||||||
|
if "plasma" in os.environ.get("DESKTOP_SESSION", ""):
|
||||||
|
try:
|
||||||
|
os.unlink(os.path.expandvars(
|
||||||
|
"$HOME/.kde/cache-$HOSTNAME/icon-cache.kcache"))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
notify_object = dbus.SessionBus().get_object(
|
||||||
|
"org.freedesktop.Notifications",
|
||||||
|
"/org/freedesktop/Notifications")
|
||||||
|
notify_object.Notify(
|
||||||
|
"Qubes", 0, vm.label.icon, "Qubes",
|
||||||
|
"You will need to log off and log in again for the VM icons "
|
||||||
|
"to update in the KDE launcher menu",
|
||||||
|
[], [], 10000,
|
||||||
|
dbus_interface="org.freedesktop.Notifications")
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
elif "xfce" in os.environ.get("DESKTOP_SESSION", ""):
|
||||||
|
self.appmenus_remove(vm)
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
def appmenus_recreate(self, vm):
|
||||||
|
"""
|
||||||
|
Force recreation of all appmenus and icons. For example when VM label
|
||||||
|
color was changed
|
||||||
|
"""
|
||||||
|
self.appmenus_remove(vm)
|
||||||
|
self.appmenus_cleanup(vm)
|
||||||
|
self.appicons_remove(vm)
|
||||||
|
self.appicons_create(vm)
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
def appmenus_update(self, vm):
|
||||||
|
"""
|
||||||
|
Similar to appmenus_recreate, but do not touch unchanged files
|
||||||
|
"""
|
||||||
|
self.appmenus_remove(vm)
|
||||||
|
self.appmenus_cleanup(vm)
|
||||||
|
self.appicons_create(vm)
|
||||||
|
self.appicons_cleanup(vm)
|
||||||
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
@qubes.ext.handler('property-set:internal')
|
||||||
|
def set_attr(self, vm, event, prop, newvalue, *args):
|
||||||
|
if len(args):
|
||||||
|
oldvalue = args[0]
|
||||||
|
else:
|
||||||
|
oldvalue = vm.__class__.internal._default
|
||||||
if newvalue and not oldvalue:
|
if newvalue and not oldvalue:
|
||||||
self.appmenus_remove()
|
self.appmenus_remove(vm)
|
||||||
elif not newvalue and oldvalue:
|
elif not newvalue and oldvalue:
|
||||||
self.appmenus_create()
|
self.appmenus_create(vm)
|
||||||
|
|
||||||
|
@qubes.ext.handler('backup-get-files')
|
||||||
# new methods
|
def files_for_backup(self, vm, event):
|
||||||
QubesVm.appmenus_create = QubesVm_appmenus_create
|
if vm.internal:
|
||||||
QubesVm.appmenus_remove = QubesVm_appmenus_remove
|
return
|
||||||
QubesVm.appmenus_cleanup = QubesVm_appmenus_cleanup
|
if vm.updateable:
|
||||||
QubesVm.appmenus_recreate = QubesVm_appmenus_recreate
|
yield self.templates_dir(vm)
|
||||||
QubesVm.appmenus_update = QubesVm_appmenus_update
|
yield self.template_icons_dir(vm)
|
||||||
QubesVm.appmenus_replace_entry = QubesVm_appmenus_replace_entry
|
yield os.path.join(vm.dir_path, AppmenusSubdirs.whitelist)
|
||||||
QubesVm.appicons_create = QubesVm_appicons_create
|
if vm.is_template():
|
||||||
QubesVm.appicons_cleanup = QubesVm_appicons_cleanup
|
for whitelist in (
|
||||||
QubesVm.appicons_remove = QubesVm_appicons_remove
|
'vm-' + AppmenusSubdirs.whitelist,
|
||||||
|
'netvm-' + AppmenusSubdirs.whitelist):
|
||||||
# hooks for existing methods
|
yield os.path.join(vm.dir_path, whitelist)
|
||||||
QubesVm.hooks_pre_rename.append(QubesVm_pre_rename)
|
|
||||||
QubesVm.hooks_post_rename.append(QubesVm_post_rename)
|
|
||||||
QubesVm.hooks_create_on_disk.append(QubesVm_create_on_disk)
|
|
||||||
QubesVm.hooks_clone_disk_files.append(QubesVm_clone_disk_files)
|
|
||||||
QubesVm.hooks_remove_from_disk.append(QubesVm_remove_from_disk)
|
|
||||||
QubesVm.hooks_label_setter.append(QubesVm_label_setter)
|
|
||||||
QubesVm.hooks_set_attr.append(QubesVm_set_attr)
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user