From ccd991c6cc4af6e98d3c7e5ccc7def94987cf384 Mon Sep 17 00:00:00 2001
From: "Dr.Lt.Data" <dr.lt.data@gmail.com>
Date: Tue, 22 Aug 2023 22:28:20 +0900
Subject: [PATCH] fix: channel bug fix

---
 __init__.py           | 16 +++++++++++++---
 js/comfyui-manager.js | 10 ++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/__init__.py b/__init__.py
index 0d4dd4ac..3fee16bb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -55,7 +55,7 @@ sys.path.append('../..')
 from torchvision.datasets.utils import download_url
 
 # ensure .js
-print("### Loading: ComfyUI-Manager (V0.26)")
+print("### Loading: ComfyUI-Manager (V0.26.1)")
 
 comfy_ui_required_revision = 1240
 comfy_ui_revision = "Unknown"
@@ -1057,16 +1057,26 @@ async def badge_mode(request):
 @server.PromptServer.instance.routes.get("/manager/channel_url_list")
 async def channel_url_list(request):
     channels = default_channels+","+get_config()['channel_url_list']
+    channels = channels.split(',')
 
     if "value" in request.rel_url.query:
-        for item in channels.split(','):
+        for item in channels:
             name_url = item.split("::")
             if len(name_url) == 2 and name_url[0] == request.rel_url.query['value']:
                 get_config()['channel_url'] = name_url[1]
                 write_config()
                 break
     else:
-        return web.Response(text=channels, status=200)
+        selected = 'custom'
+        selected_url = get_config()['channel_url']
+        for item in channels:
+            item_info = item.split('::')
+            if len(item_info) == 2 and item_info[1] == selected_url:
+                selected = item_info[0]
+
+        res = {'selected': selected,
+               'list': channels}
+        return web.json_response(res, status=200)
 
     return web.Response(status=200)
 
diff --git a/js/comfyui-manager.js b/js/comfyui-manager.js
index 7b1cb278..3ace5608 100644
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -1776,7 +1776,7 @@ class ManagerMenuDialog extends ComfyDialog {
 
         api.fetchApi('/manager/badge_mode')
         .then(response => response.text())
-        .then(data => { badge_combo.value = data; badge_mode = data; })
+        .then(data => { badge_combo.value = data; badge_mode = data; });
 
 		badge_combo.addEventListener('change', function(event) {
             api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
@@ -1787,10 +1787,10 @@ class ManagerMenuDialog extends ComfyDialog {
         // channel
 		let channel_combo = document.createElement("select");
         api.fetchApi('/manager/channel_url_list')
-        .then(response => response.text())
-        .then(data => {
+        .then(response => response.json())
+        .then(async data => {
             try {
-				let urls = data.split(',');
+				let urls = data.list;
 				for(let i in urls) {
 					if(urls[i] != '') {
 						let name_url = urls[i].split('::');
@@ -1801,6 +1801,8 @@ class ManagerMenuDialog extends ComfyDialog {
 				channel_combo.addEventListener('change', function(event) {
 		            api.fetchApi(`/manager/channel_url_list?value=${event.target.value}`);
 				});
+
+                channel_combo.value = data.selected;
 			}
 			catch(exception) {