mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2026-01-01 09:40:49 +08:00
Clean up
This commit is contained in:
parent
82895efcec
commit
59cc62c199
@ -927,8 +927,6 @@ def check_model_installed(json_obj):
|
|||||||
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
||||||
full_paths = get_base_folder_path(model_dir_name, item['filename'], item['url'])
|
full_paths = get_base_folder_path(model_dir_name, item['filename'], item['url'])
|
||||||
|
|
||||||
item['group'] = f"A"
|
|
||||||
|
|
||||||
# non-general name case
|
# non-general name case
|
||||||
if item['filename'] in total_models_files:
|
if item['filename'] in total_models_files:
|
||||||
item['installed'] = 'True'
|
item['installed'] = 'True'
|
||||||
@ -936,15 +934,12 @@ def check_model_installed(json_obj):
|
|||||||
return
|
return
|
||||||
|
|
||||||
if item['save_path'] == 'default':
|
if item['save_path'] == 'default':
|
||||||
item['group'] = 'B'
|
|
||||||
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
||||||
if model_dir_name is not None:
|
if model_dir_name is not None:
|
||||||
item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
|
item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
|
||||||
else:
|
else:
|
||||||
item['installed'] = 'False'
|
item['installed'] = 'False'
|
||||||
else:
|
else:
|
||||||
item['group'] = 'C'
|
|
||||||
|
|
||||||
model_dir_name = item['save_path'].split('/')[0]
|
model_dir_name = item['save_path'].split('/')[0]
|
||||||
if model_dir_name in folder_paths.folder_names_and_paths:
|
if model_dir_name in folder_paths.folder_names_and_paths:
|
||||||
if is_exists(model_dir_name, item['filename'], item['url']):
|
if is_exists(model_dir_name, item['filename'], item['url']):
|
||||||
|
|||||||
@ -256,7 +256,7 @@ export class ModelManager {
|
|||||||
// updateGrid handler for filter and keywords
|
// updateGrid handler for filter and keywords
|
||||||
rowFilter: (rowItem) => {
|
rowFilter: (rowItem) => {
|
||||||
|
|
||||||
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path", "full_paths", "group"];
|
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path", "full_paths"];
|
||||||
const models_extensions = ['.ckpt', '.pt', '.pt2', '.bin', '.pth', '.safetensors', '.pkl', '.sft'];
|
const models_extensions = ['.ckpt', '.pt', '.pt2', '.bin', '.pth', '.safetensors', '.pkl', '.sft'];
|
||||||
|
|
||||||
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
||||||
@ -381,6 +381,14 @@ export class ModelManager {
|
|||||||
width: 400,
|
width: 400,
|
||||||
maxWidth: 5000,
|
maxWidth: 5000,
|
||||||
classMap: 'cmm-node-desc'
|
classMap: 'cmm-node-desc'
|
||||||
|
}, {
|
||||||
|
id: "save_path",
|
||||||
|
name: 'Save Path',
|
||||||
|
width: 200
|
||||||
|
}, {
|
||||||
|
id: 'filename',
|
||||||
|
name: 'Filename',
|
||||||
|
width: 200
|
||||||
}, {
|
}, {
|
||||||
id: 'full_paths',
|
id: 'full_paths',
|
||||||
name: 'Full Paths',
|
name: 'Full Paths',
|
||||||
@ -396,18 +404,6 @@ export class ModelManager {
|
|||||||
return full_paths;
|
return full_paths;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, {
|
|
||||||
id: "save_path",
|
|
||||||
name: 'Save Path',
|
|
||||||
width: 200
|
|
||||||
}, {
|
|
||||||
id: 'filename',
|
|
||||||
name: 'Filename',
|
|
||||||
width: 200
|
|
||||||
}, {
|
|
||||||
id: 'group',
|
|
||||||
name: 'Group',
|
|
||||||
width: 200
|
|
||||||
}];
|
}];
|
||||||
|
|
||||||
restoreColumnWidth(gridId, columns);
|
restoreColumnWidth(gridId, columns);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user