From f12264c5ad4574cf925e7cb342fe89db17bfd5a5 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Wed, 14 May 2025 21:10:45 +1200
Subject: [PATCH] VNC-155 Refactor

---
 unix/vncserver | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 32b32ba..ee2fb33 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -1257,6 +1257,14 @@ sub DefineConfigToCLIConversion {
       allowedValues => [flatten(@allConfigKeys)]
     })
   };
+  my $deriveValueStripPercentSub = sub {
+    $self = shift;
+
+    my $value = $self->configValue();
+    $value =~ s/%$//;
+
+    $value;
+  };
   KasmVNC::CliOption::beforeIsActive(\&limitVncModeOptions);
   my $ipv4_regexp = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|$)){4}';
   my $ipv6_regexp = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
@@ -2006,14 +2014,7 @@ sub DefineConfigToCLIConversion {
             validator => $percentValidator
           })
         ],
-        deriveValueSub => sub {
-          $self = shift;
-
-          my $value = $self->configValue();
-          $value =~ s/%$//;
-
-          $value;
-        }
+        deriveValueSub => $deriveValueStripPercentSub
     }),
     KasmVNC::CliOption->new({
         name => 'VideoOutTime',