dece/Xion
1
0
Fork 0
Code Issues Pull requests Releases Activity

xfconf: remove bogus string sanitisation

Browse source
This commit is contained in:
dece 2020-09-28 23:04:16 +02:00
parent 28f1dbb4a1
commit 961180dab1
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xion/xfconf.py
View file

@ -80,14 +80,12 @@ class Xfconf:
prop_type = Xfconf.convert_type(prop_type) prop_type = Xfconf.convert_type(prop_type)
if not prop_type: if not prop_type:
return False return False
value = Xfconf.sanitize_str(value)
output = self.xq(["-c", channel, "-p", prop, "-n", output = self.xq(["-c", channel, "-p", prop, "-n",
"-t", prop_type, "-s", value]) "-t", prop_type, "-s", value])
return output == "" return output == ""
def update_property(self, channel, prop, value): def update_property(self, channel, prop, value):
"""Update an existing property, return True on success.""" """Update an existing property, return True on success."""
value = Xfconf.sanitize_str(value)
output = self.xq(["-c", channel, "-p", prop, "-s", value]) output = self.xq(["-c", channel, "-p", prop, "-s", value])
return output == "" return output == ""
@ -102,7 +100,7 @@ class Xfconf:
subtype = Xfconf.convert_type(value["type"]) subtype = Xfconf.convert_type(value["type"])
if not subtype: if not subtype:
return False return False
subvalue = Xfconf.sanitize_str(value["value"]) subvalue = value["value"]
command += ["-t", subtype, "-s", subvalue] command += ["-t", subtype, "-s", subvalue]
output = self.xq(command) output = self.xq(command)
return output == "" return output == ""
@ -129,14 +127,6 @@ class Xfconf:
print(f"Unknown gtype {gtype}.") print(f"Unknown gtype {gtype}.")
return xq_type return xq_type
@staticmethod
def sanitize_str(value):
"""Wrap value with doublequotes if it contains whitespaces."""
for char in string.whitespace:
if char in value:
return f'"{value}"'
return value
XION_PROP_RE = re.compile(r"t:(\S+) (.+)") XION_PROP_RE = re.compile(r"t:(\S+) (.+)")

7
xion/xion.py
View file

@ -67,9 +67,10 @@ class Xion:
if confirm and input("Confirm? [y/N]") != "y": if confirm and input("Confirm? [y/N]") != "y":
print("Operation cancelled.") print("Operation cancelled.")
return False return False
if replace and not self.clear_tree(channel, root): if replace:
print("Failed to clear properties.") if not self.clear_tree(channel, root):
return False print("Failed to clear properties.")
return False
for prop, content in tree.items(): for prop, content in tree.items():
if not self.apply_property(channel, prop, content): if not self.apply_property(channel, prop, content):
print(f"Failed to apply property {prop}.") print(f"Failed to apply property {prop}.")