From 0421aeb76a2659d0657d6d4f86440bb7f5ae25a5 Mon Sep 17 00:00:00 2001
From: Florian Festi <florian@festi.info>
Date: Mon, 20 Feb 2023 22:22:26 +0100
Subject: [PATCH] Calculate short url and command line

with only the changed parameters
---
 boxes/__init__.py   | 12 +++++++++++-
 scripts/boxesserver | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/boxes/__init__.py b/boxes/__init__.py
index 255bab4..4243ad1 100755
--- a/boxes/__init__.py
+++ b/boxes/__init__.py
@@ -294,6 +294,7 @@ class Boxes:
         self.argparser = ArgumentParser(description=description)
         self.edgesettings: dict[Any, Any] = {}
         self.inkscapefile = None
+        self.non_default_args: dict[Any, Any] = {}
 
         self.metadata = {
             "name" : self.__class__.__name__,
@@ -301,7 +302,9 @@ class Boxes:
             "description" : self.description,
             "group" : self.ui_group,
             "url" : "",
-            "command_line" : ""
+            "url_short" : "",
+            "cli" : "",
+            "cli_short" : "",
         }
 
         self.argparser._action_groups[1].title = self.__class__.__name__ + " Settings"
@@ -521,19 +524,26 @@ class Boxes:
             return quote(s)
 
         self.metadata["cli"] = "boxes " + self.__class__.__name__ + " " + " ".join(cliquote(arg) for arg in args)
+
         for key, value in vars(self.argparser.parse_args(args=args)).items():
+            default = self.argparser.get_default(key)
+
             # treat edge settings separately
             for setting in self.edgesettings:
                 if key.startswith(setting + '_'):
                     self.edgesettings[setting][key[len(setting)+1:]] = value
                     continue
             setattr(self, key, value)
+            if (value != default):
+                self.non_default_args[key] = value
 
         # Change file ending to format if not given explicitly
         format = getattr(self, "format", "svg")
         if getattr(self, 'output', None) == 'box.svg':
             self.output = 'box.' + format.split("_")[0]
 
+        self.metadata["cli_short"] = "boxes " + self.__class__.__name__ + " " + " ".join(cliquote(arg) for arg in args if (arg.split("=")[0][2:] in self.non_default_args))
+
     def addPart(self, part, name=None):
         """
         Add Edge or other part instance to this one and add it as attribute
diff --git a/scripts/boxesserver b/scripts/boxesserver
index 120555e..a31aede 100755
--- a/scripts/boxesserver
+++ b/scripts/boxesserver
@@ -79,6 +79,20 @@ class FileChecker(threading.Thread):
     def stop(self) -> None:
         self._stopped = True
 
+def filter_url(url, non_default_args):
+    if len(url) == 0:
+        return ''
+    try:
+        base, args = url.split('?')
+    except ValueError:
+        return ''
+    args = args.split('&')
+    new_args = []
+    for arg in args:
+        a, b = arg.split('=')
+        if a in non_default_args:
+            new_args.append(arg)
+    return f"{base}?{'&'.join(new_args)}"
 
 class ArgumentParserError(Exception): pass
 
@@ -612,6 +626,8 @@ class BServer:
         try:
             fd, box.output = tempfile.mkstemp()
             box.metadata["url"] = self.getURL(environ)
+            box.metadata["url_short"] = filter_url(box.metadata["url"],
+                                                   box.non_default_args)
             box.open()
             box.render()
             box.close()