enh: strip http(s):// from DCOR server string in settings

ZELLMECHANIK-DRESDEN · Nov 30, 2022 · 4d6e81a · 4d6e81a
1 parent 7808a63
commit 4d6e81a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2.11.11
+ - enh: strip http(s):// from DCOR server string in settings
 2.11.10
  - fix: detect chaged files on disk when reloading metadata
  - setup: bump dclab from 0.46.4 to 0.47.0 (new bg_med feature

diff --git a/shapeout2/gui/preferences.py b/shapeout2/gui/preferences.py
@@ -332,6 +332,13 @@ def on_settings_apply(self):
                 curtext = self.dcor_servers.currentText()
                 items = self.settings.value(key, default)
                 if curtext in items:
+                    # We do it again below to be on the safe side
+                    items.remove(curtext)
+                for bad_start in ["https://", "http://"]:
+                    if curtext.startswith(bad_start):
+                        curtext = curtext[len(bad_start):]
+                if curtext in items:
+                    # We do it again with the stripped version
                     items.remove(curtext)
                 items.insert(0, curtext)
                 value = items