fix Windows file path encoding, support for Transparent Dark skin

AF-1 · Oct 1, 2023 · 8daadf0 · 8daadf0
1 parent b117c06
commit 8daadf0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/VirtualLibraryCreator/ConfigManager/ParameterHandler.pm b/VirtualLibraryCreator/ConfigManager/ParameterHandler.pm
@@ -492,8 +492,8 @@ sub handleSearchURL {
 	# don't escape backslashes
 	$uri =~ s$%(?:2F|5C)$/$ig;
 
-	# don't escape colon after file
-	$uri =~ s$file(?:%3A|_3A)$file:$ig;
+	# don't escape colons (important for file: and Windows)
+	$uri =~ s$%(?:3A|_3A)$:$ig;
 
 	# replace the % in the URI escaped string with a single character placeholder
 	$uri =~ s/%/_/g;

diff --git a/VirtualLibraryCreator/ConfigManager/WebPageMethods.pm b/VirtualLibraryCreator/ConfigManager/WebPageMethods.pm
@@ -1029,8 +1029,8 @@ sub fileURLFromPathUri {
 	# don't escape backslashes
 	$uri =~ s$%(?:2F|5C)$/$ig;
 
-	# don't escape colon after file
-	$uri =~ s$file(?:%3A|_3A)$file:$ig;
+	# don't escape colons (important for file: and Windows)
+	$uri =~ s$%(?:3A|_3A)$:$ig;
 
 	# replace the % in the URI escaped string with a single character placeholder
 	$uri =~ s/%/_/g;

diff --git a/VirtualLibraryCreator/HTML/EN/plugins/VirtualLibraryCreator/list.html b/VirtualLibraryCreator/HTML/EN/plugins/VirtualLibraryCreator/list.html
@@ -1,4 +1,4 @@
-<style>.inputbtn{padding:2px;}.error{color: red !important;}.vlrefreshmsg{color:[% IF systemSkin == "material" || systemSkin == "DarkDefault" %]#81d477[% ELSE %]#0e9300[% END %] !important;background-color:[% IF systemSkin == "material" || systemSkin == "DarkDefault" %]#404040[% ELSE %]#c1c1c1[% END %];border-radius:10px;padding:10px;transition: opacity 3s ease 0s;}.tmpdisable{float:right;}.state{height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;background-color:#bbb;border-radius:50%;display:inline-block;}.enabled{background-color:#2abb2a;}.pausebars{margin-top:2px;margin-left:3px;float:left;border-left:[% IF systemSkin == "material" %]2[% ELSE %]1[% END %]px solid #262626;border-right:[% IF systemSkin == "material" %]2[% ELSE %]1[% END %]px solid #262626;width:1px;height:[% IF systemSkin == "material" %]7[% ELSE %]5[% END %]px;}.browsemenus{display:inline-block;height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;cursor:default;background-color:transparent;}.hasbrowsemenus{background:center/cover url("[% webroot %]plugins/VirtualLibraryCreator/html/images/vlc_browsemenu.png") no-repeat;}.dailyrefresh{display:inline-block;height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;cursor:default;background-color:transparent;}.refreshenabled{background:center/cover url("[% webroot %]plugins/VirtualLibraryCreator/html/images/vlc_scheduleddailyrefresh.png") no-repeat;}</style>
+<style>.inputbtn{padding:2px;}.error{color: red !important;}.vlrefreshmsg{color:[% IF systemSkin == "material" || systemSkin == "DarkDefault" || systemSkin == "TransparentDark" %]#81d477[% ELSE %]#0e9300[% END %] !important;background-color:[% IF systemSkin == "material" || systemSkin == "DarkDefault" || systemSkin == "TransparentDark" %]#404040[% ELSE %]#c1c1c1[% END %];border-radius:10px;padding:10px;transition: opacity 3s ease 0s;}.tmpdisable{float:right;}.state{height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;background-color:#bbb;border-radius:50%;display:inline-block;}.enabled{background-color:#2abb2a;}.pausebars{margin-top:2px;margin-left:3px;float:left;border-left:[% IF systemSkin == "material" %]2[% ELSE %]1[% END %]px solid #262626;border-right:[% IF systemSkin == "material" %]2[% ELSE %]1[% END %]px solid #262626;width:1px;height:[% IF systemSkin == "material" %]7[% ELSE %]5[% END %]px;}.browsemenus{display:inline-block;height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;cursor:default;background-color:transparent;}.hasbrowsemenus{background:center/cover url("[% webroot %]plugins/VirtualLibraryCreator/html/images/vlc_browsemenu.png") no-repeat;}.dailyrefresh{display:inline-block;height:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;width:[% IF systemSkin == "material" %]11[% ELSE %]9[% END %]px;cursor:default;background-color:transparent;}.refreshenabled{background:center/cover url("[% webroot %]plugins/VirtualLibraryCreator/html/images/vlc_scheduleddailyrefresh.png") no-repeat;}</style>
 [%- pagetitle = 'PLUGIN_VIRTUALLIBRARYCREATOR' | string; pageicon = 'PLUGIN_VIRTUALLIBRARYCREATOR' -%]
 [%- pwd_list = BLOCK -%]/
 	<a href="[% webroot %]plugins/VirtualLibraryCreator/list.html">

diff --git a/VirtualLibraryCreator/install.xml b/VirtualLibraryCreator/install.xml
@@ -3,7 +3,7 @@
 	<id>affea2d8-cd2b-8905-a813-21f475f1f802</id>
 	<name>PLUGIN_VIRTUALLIBRARYCREATOR</name>
 	<module>Plugins::VirtualLibraryCreator::Plugin</module>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 	<description>PLUGIN_VIRTUALLIBRARYCREATOR_DESC</description>
 	<creator>AF</creator>
 	<optionsURL>plugins/VirtualLibraryCreator/settings/settings.html</optionsURL>