chore: sub url setter keep name provided

Author: vernesong

luci-app-openclash/luasrc/controller/openclash.lua

@@ -665,8 +665,12 @@ function get_sub_url(filename)
 					string.gsub(s.url, '[^\n]+', function(w) table.insert(info_tb, w) end)
 				end
 				if #info_tb == 1 then
-					local url, _ = parse_url_with_name(info_tb[1], filename)
-					sub_url = url
+					local url, name = parse_url_with_name(info_tb[1], filename)
+					if url ~= info_tb[1] then
+						table.insert(providers, {name = name, url = url})
+					else
+						sub_url = url
+					end
 				elseif #info_tb > 1 then
 					for _, raw in ipairs(info_tb) do
 						local url, name = parse_url_with_name(raw, filename)

luci-app-openclash/luasrc/view/openclash/config_edit.htm

@@ -2738,11 +2738,7 @@
         model.querySelector('#overwrite-add-close').onclick = function() {
             document.body.removeChild(ocDiv);
         };
-        overlay.onclick = function(e) {
-            if (e.target === overlay) {
-                document.body.removeChild(ocDiv);
-            }
-        };
+
         model.querySelector('#overwrite-upload-cancel').onclick = function() {
             document.body.removeChild(ocDiv);
         };

luci-app-openclash/luasrc/view/openclash/config_upload.htm

@@ -1128,12 +1128,6 @@
             }
         });
 
-        this.overlay.addEventListener('click', function(e) {
-            if (e.target === self.overlay && !self.isProcessing) {
-                self.hide();
-            }
-        });
-
         document.addEventListener('keydown', function(e) {
             if (e.key === 'Escape' && !self.isProcessing && self.overlay.classList.contains('show')) {
                 self.hide();

luci-app-openclash/luasrc/view/openclash/status.htm

@@ -3227,8 +3227,8 @@
                     }
 
                     var needsErrorHandling = false;
-                    if (x && x.status == 200 && status.providers) {
-                        var newProvidersLength = (status.providers) ? status.providers.length : 0;
+                    if (x && x.status == 200 && status.providers.length > 0) {
+                        var newProvidersLength = status.providers.length;
                         var cachedProvidersLength = (parsedData && parsedData.providers) ? parsedData.providers.length : 0;
 
                         if (newProvidersLength !== cachedProvidersLength && cachedProvidersLength > newProvidersLength) {
@@ -3597,26 +3597,18 @@
 
         bindEvents: function() {
             var textarea = document.getElementById('subscription-url-textarea');
-            var overlay = document.getElementById('subscription-url-overlay');
 
             if (textarea) {
                 textarea.addEventListener('keydown', this.handleKeyDown.bind(this));
             }
-            if (overlay) {
-                overlay.addEventListener('click', this.handleOverlayClick.bind(this));
-            }
         },
 
         unbindEvents: function() {
             var textarea = document.getElementById('subscription-url-textarea');
-            var overlay = document.getElementById('subscription-url-overlay');
 
             if (textarea) {
                 textarea.removeEventListener('keydown', this.handleKeyDown.bind(this));
             }
-            if (overlay) {
-                overlay.removeEventListener('click', this.handleOverlayClick.bind(this));
-            }
         },
 
         handleKeyDown: function(event) {
@@ -3627,12 +3619,6 @@
             }
         },
 
-        handleOverlayClick: function(event) {
-            if (event.target.id === 'subscription-url-overlay') {
-                this.hide();
-            }
-        },
-
         submit: function() {
             var textarea = document.getElementById('subscription-url-textarea');
             if (!textarea) return;

luci-app-openclash/luasrc/view/openclash/sub_info_show.htm

@@ -815,9 +815,9 @@
 
 	XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "sub_info_get")%>', {filename: "<%=filename%>"}, function(x, status) {
         var needsErrorHandling = false;
-        if (x && x.status == 200 && status.providers) {
+        if (x && x.status == 200 && status.providers.length > 0) {
             var save_info_length = (save_info && save_info.providers) ? save_info.providers.length : 0;
-            var newProvidersLength = (status && status.providers) ? status.providers.length : 0;
+            var newProvidersLength = status.providers.length;
             if (save_info_length !== newProvidersLength && save_info_length > newProvidersLength) {
                 needsErrorHandling = true;
             }