Skip to content

Make videos on the computer you already own. FreeVideo runs MiniMax H3 in as little as 8 GB of VRAM and 16 GB of RAM, and adapts its acceleration path to your hardware.

Open folder: show a note with the images folder when the folder cannot be opened

Bowen Xueeb74bbde4961
diff --git a/freevideo_engine/image_gen/service.py b/freevideo_engine/image_gen/service.py
index 0c4b7a7..ed00e03 100644
--- a/freevideo_engine/image_gen/service.py
+++ b/freevideo_engine/image_gen/service.py
@@ -355,7 +355,7 @@ class Service:
else:
from ..windows_ux import open_folder
if not open_folder(folder):
- raise OSError('No file manager is available to open the folder.')
+ return dict(opened=False, folder=folder) # the page tells the user where the images are
return dict(opened=True)
def close_segment_worker(self):
diff --git a/freevideo_engine/launcher_copy.py b/freevideo_engine/launcher_copy.py
index 86447b6..7267418 100644
--- a/freevideo_engine/launcher_copy.py
+++ b/freevideo_engine/launcher_copy.py
@@ -9,8 +9,8 @@ from .model_status import NAMES
ACTION_COPY = {
'download_missing': ('The download folder no longer exists. Export the list again.',
'下载目录已不存在,请重新导出清单'),
- 'folder_open_failed': ('This system has no file manager to open the folder. Open it from your own file manager.',
- '此系统没有可用的文件管理器来打开该文件夹,请在自己的文件管理器中打开'),
+ 'folder_open_failed': ('The folder could not be opened automatically. Open it in a file manager.',
+ '无法自动打开该文件夹,请在文件管理器中手动打开'),
'installation_missing': ('There is no installation information yet. Complete installation first.',
'还没有安装信息,请先完成安装'),
'installation_unavailable': ('The saved ComfyUI folder could not be opened. It may have been moved or renamed, or its drive may be disconnected. Choose its current location below, or install ComfyUI.',
diff --git a/web/image_editor.css b/web/image_editor.css
index e9b0e64..ecb2b5b 100644
--- a/web/image_editor.css
+++ b/web/image_editor.css
@@ -87,6 +87,7 @@ button.fv-ie-size:hover{background:var(--fv-hover);color:var(--fv-ink)}
.fv-ie-gen-history .fv-ie-menu-list{top:calc(100% + 6px);right:0;bottom:auto;left:auto;width:min(320px,calc(100vw - 16px));max-height:min(420px,70vh)}
.fv-ie-gen-history .fv-ie-menu-list.fv-ie-gen-history-up{top:auto;bottom:calc(100% + 6px)}
.fv-ie-gen-history-confirm{opacity:1!important;width:auto!important;padding:0 6px;background:#c0392b!important;color:#fff!important;font-size:var(--fv-micro)}
+.fv-ie-gen-history-path{overflow-wrap:anywhere;user-select:text}
.fv-ie-gen-history-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(88px,1fr));gap:6px}
.fv-ie-gen-history-tile{position:relative}
.fv-ie-gen-history-pick{display:block;width:100%;padding:0;border:0;background:none;cursor:pointer}
diff --git a/web/image_generation.js b/web/image_generation.js
index 05ddb97..f98d334 100644
--- a/web/image_generation.js
+++ b/web/image_generation.js
@@ -652,13 +652,17 @@ export function createImageGeneration({client, renderer, t, getDoc, getSelection
const list = el('div', null, 'fv-ie-menu-list');
menu.append(summary, list);
// Choosing several: the ticked files, the reason each one that stayed gives, and the two-step confirm of the delete button.
- let selecting = false, armed = null, failed = false;
+ let selecting = false, armed = null, failed = false, unopened = null;
const chosen = new Set(), stayed = new Map();
const reasons = {busy: t('In use', '被占用'), missing: t('Already gone', '已不存在'), invalid: t('Not deleted', '未删除')};
const disarm = () => { clearTimeout(armed); armed = null; };
const draw = () => {
list.replaceChildren();
if (failed) list.append(el('div', t('Could not delete this image', '无法删除这张图片'), 'fv-ie-menu-label'));
+ if (unopened) {
+ list.append(el('div', t('The folder could not be opened automatically. Open it in a file manager.', '无法自动打开该文件夹,请在文件管理器中手动打开'), 'fv-ie-menu-label'));
+ if (unopened.folder) list.append(el('div', unopened.folder, 'fv-ie-menu-label fv-ie-gen-history-path'));
+ }
if (!past.length) { list.append(el('div', t('No images generated yet', '还没有生成过图片'), 'fv-ie-menu-label')); return; }
const grid = el('div', null, 'fv-ie-gen-history-grid');
for (const item of past) {
@@ -732,14 +736,17 @@ export function createImageGeneration({client, renderer, t, getDoc, getSelection
} else {
foot.append(button(t('Select', '选择'), null, () => { selecting = true; failed = false; draw(); }, 'fv-ie-menu-item'));
if (['localhost', '127.0.0.1', '[::1]'].includes(location.hostname))
- foot.append(button(t('Open folder', '打开文件夹'), null, () => { void client.historyOpen().catch(() => {}); }, 'fv-ie-menu-item'));
+ foot.append(button(t('Open folder', '打开文件夹'), null, async () => {
+ let answer; try { answer = await client.historyOpen(); } catch { answer = {opened: false}; }
+ unopened = answer.opened === false ? {folder: answer.folder || ''} : null; draw();
+ }, 'fv-ie-menu-item'));
}
list.append(foot);
};
menu.ontoggle = async () => {
if (!menu.open) return;
try { past = await client.history(); } catch { past = []; }
- selecting = false; chosen.clear(); stayed.clear(); disarm(); failed = false;
+ selecting = false; chosen.clear(); stayed.clear(); disarm(); failed = false; unopened = null;
draw();
// Open upward when the list does not fit below, and keep it inside the window.
list.classList.remove('fv-ie-gen-history-up'); list.style.right = '';