Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

feat: restart backend when config changes

沈浩4716a44bceee
diff --git a/cmd/desktop/main.go b/cmd/desktop/main.go
index df3803b9..227375cf 100644
--- a/cmd/desktop/main.go
+++ b/cmd/desktop/main.go
@@ -24,12 +24,12 @@ func main() {
os.Exit(1)
}
}
- config.LoadConfig()
go func() {
if err := server.StartBackend(); err != nil {
log.GetLogger().Error("后端服务启动失败", zap.Error(err))
os.Exit(1)
}
}()
+ config.ConfigBackup = config.Conf
desktop.Show()
}
diff --git a/config/config.go b/config/config.go
index 571e2ef0..c99429d4 100644
--- a/config/config.go
+++ b/config/config.go
@@ -13,6 +13,8 @@ import (
"go.uber.org/zap"
)
+var ConfigBackup Config // 用于在开始任务之前,检测配置是否更新,更新后要重启服务端
+
type App struct {
SegmentDuration int `toml:"segment_duration"`
TranscribeParallelNum int `toml:"transcribe_parallel_num"`
diff --git a/internal/desktop/desktop.go b/internal/desktop/desktop.go
index 760c84d5..6ab5fb11 100644
--- a/internal/desktop/desktop.go
+++ b/internal/desktop/desktop.go
@@ -33,8 +33,6 @@ func createNavButton(text string, icon fyne.Resource, isSelected bool, onTap fun
// Show 展示桌面
func Show() {
- TempConf = config.Conf
-
myApp := app.New()
// 自定义主题
@@ -86,7 +84,7 @@ func Show() {
// 创建导航项
for i, item := range navItems {
index := i // 捕获变量
- isSelected := (i == currentSelectedIndex)
+ isSelected := i == currentSelectedIndex
// 创建导航按钮以及点击处理函数
navBtn := createNavButton(item, navIcons[i], isSelected, func() {
@@ -105,18 +103,15 @@ func Show() {
}
if index == 0 {
- if TempConf != config.Conf {
- // 如果配置发生了变化,重新加载配置
- config.Conf = TempConf
- err := config.SaveConfig()
- if err != nil {
- // 保存配置失败,弹出提示框
- dialog.ShowError(fmt.Errorf("保存配置失败: %v", err), myWindow)
- log.GetLogger().Error("保存配置失败 Failed to save config", zap.Error(err))
- return
- }
- log.GetLogger().Info("配置已保存 Config saved successfully")
+ // tab切换出去就保存和重新加载配置
+ err := config.SaveConfig()
+ if err != nil {
+ // 保存配置失败,弹出提示框
+ dialog.ShowError(fmt.Errorf("保存配置失败: %v", err), myWindow)
+ log.GetLogger().Error("保存配置失败 Failed to save config", zap.Error(err))
+ return
}
+ log.GetLogger().Info("配置已保存 Config saved successfully")
workbenchContent.Show()
configContent.Hide()
// 确保进度条和下载区域状态正确显示
@@ -124,16 +119,13 @@ func Show() {
FadeAnimation(workbenchContent, 300*time.Millisecond, 0.0, 1.0)
} else {
workbenchContent.Hide()
- TempConf = config.Conf
configContent.Show()
FadeAnimation(configContent, 300*time.Millisecond, 0.0, 1.0)
}
// 更新当前选中的索引
currentSelectedIndex = index
-
navContainer.Refresh()
-
contentStack.Refresh()
})
@@ -175,13 +167,10 @@ func Show() {
myWindow.ShowAndRun()
// 关闭窗口时保存配置
- if TempConf != config.Conf {
- config.Conf = TempConf
- err := config.SaveConfig()
- if err != nil {
- log.GetLogger().Error("保存配置失败 Failed to save config", zap.Error(err))
- return
- }
- log.GetLogger().Info("配置已保存 Config saved successfully")
+ err := config.SaveConfig()
+ if err != nil {
+ log.GetLogger().Error("保存配置失败 Failed to save config", zap.Error(err))
+ return
}
+ log.GetLogger().Info("配置已保存 Config saved successfully")
}
diff --git a/internal/desktop/ui.go b/internal/desktop/ui.go
index 3f499459..6e385d94 100644
--- a/internal/desktop/ui.go
+++ b/internal/desktop/ui.go
@@ -23,8 +23,6 @@ import (
"go.uber.org/zap"
)
-var TempConf config.Config
-
// 创建配置界面
func CreateConfigTab(window fyne.Window) fyne.CanvasObject {
// 创建页面标题
@@ -139,7 +137,7 @@ func CreateSubtitleTab(window fyne.Window) fyne.CanvasObject {
// 创建应用配置组
func createAppConfigGroup() *fyne.Container {
appSegmentDurationEntry := StyledEntry("字幕分段处理时长(分钟)")
- appSegmentDurationEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.App.SegmentDuration)))
+ appSegmentDurationEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.App.SegmentDuration)))
appSegmentDurationEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -152,7 +150,7 @@ func createAppConfigGroup() *fyne.Container {
}
appTranscribeParallelNumEntry := StyledEntry("转录并行数量")
- appTranscribeParallelNumEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.App.TranscribeParallelNum)))
+ appTranscribeParallelNumEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.App.TranscribeParallelNum)))
appTranscribeParallelNumEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -165,7 +163,7 @@ func createAppConfigGroup() *fyne.Container {
}
appTranslateParallelNumEntry := StyledEntry("翻译并行数量")
- appTranslateParallelNumEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.App.TranslateParallelNum)))
+ appTranslateParallelNumEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.App.TranslateParallelNum)))
appTranslateParallelNumEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -178,7 +176,7 @@ func createAppConfigGroup() *fyne.Container {
}
appTranscribeMaxAttemptsEntry := StyledEntry("转录最大尝试次数")
- appTranscribeMaxAttemptsEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.App.TranscribeMaxAttempts)))
+ appTranscribeMaxAttemptsEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.App.TranscribeMaxAttempts)))
appTranscribeMaxAttemptsEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -191,7 +189,7 @@ func createAppConfigGroup() *fyne.Container {
}
appTranslateMaxAttemptsEntry := StyledEntry("翻译最大尝试次数")
- appTranslateMaxAttemptsEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.App.TranslateMaxAttempts)))
+ appTranslateMaxAttemptsEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.App.TranslateMaxAttempts)))
appTranslateMaxAttemptsEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -204,17 +202,17 @@ func createAppConfigGroup() *fyne.Container {
}
appProxyEntry := StyledEntry("网络代理地址")
- appProxyEntry.Bind(binding.BindString(&TempConf.App.Proxy))
+ appProxyEntry.Bind(binding.BindString(&config.Conf.App.Proxy))
appTranscribeProviderEntry := StyledSelect([]string{"openai", "fasterwhisper", "whispercpp", "whisperkit", "aliyun"}, func(s string) {
- TempConf.App.TranscribeProvider = s
+ config.Conf.App.TranscribeProvider = s
})
- appTranscribeProviderEntry.SetSelected(TempConf.App.TranscribeProvider)
+ appTranscribeProviderEntry.SetSelected(config.Conf.App.TranscribeProvider)
appLlmProviderEntry := StyledSelect([]string{"openai", "aliyun"}, func(s string) {
- TempConf.App.LlmProvider = s
+ config.Conf.App.LlmProvider = s
})
- appLlmProviderEntry.SetSelected(TempConf.App.LlmProvider)
+ appLlmProviderEntry.SetSelected(config.Conf.App.LlmProvider)
// 格式化表单项以使其更美观
form := widget.NewForm(
@@ -234,10 +232,10 @@ func createAppConfigGroup() *fyne.Container {
// 创建server配置组
func createServerConfigGroup() *fyne.Container {
serverHostEntry := StyledEntry("服务器地址 Server address")
- serverHostEntry.Bind(binding.BindString(&TempConf.Server.Host))
+ serverHostEntry.Bind(binding.BindString(&config.Conf.Server.Host))
serverPortEntry := StyledEntry("服务器端口 Server port")
- serverPortEntry.Bind(binding.IntToString(binding.BindInt(&TempConf.Server.Port)))
+ serverPortEntry.Bind(binding.IntToString(binding.BindInt(&config.Conf.Server.Port)))
serverPortEntry.Validator = func(s string) error {
val, err := strconv.Atoi(s)
if err != nil {
@@ -260,19 +258,19 @@ func createServerConfigGroup() *fyne.Container {
// 创建本地模型配置组
func createLocalModelGroup() *fyne.Container {
localModelFasterwhisperEntry := StyledSelect([]string{"tiny", "medium", "large-v2"}, func(s string) {
- TempConf.LocalModel.Fasterwhisper = s
+ config.Conf.LocalModel.Fasterwhisper = s
})
- localModelFasterwhisperEntry.SetSelected(TempConf.LocalModel.Fasterwhisper)
+ localModelFasterwhisperEntry.SetSelected(config.Conf.LocalModel.Fasterwhisper)
localModelWhisperkitEntry := StyledSelect([]string{"large-v2"}, func(s string) {
- TempConf.LocalModel.Whisperkit = s
+ config.Conf.LocalModel.Whisperkit = s
})
- localModelWhisperkitEntry.SetSelected(TempConf.LocalModel.Whisperkit)
+ localModelWhisperkitEntry.SetSelected(config.Conf.LocalModel.Whisperkit)
localModelWhispercppEntry := StyledSelect([]string{"large-v2"}, func(s string) {
- TempConf.LocalModel.Whisperkit = s
+ config.Conf.LocalModel.Whisperkit = s
})
- localModelWhispercppEntry.SetSelected(TempConf.LocalModel.Whispercpp)
+ localModelWhispercppEntry.SetSelected(config.Conf.LocalModel.Whispercpp)
form := widget.NewForm(
widget.NewFormItem("Fasterwhisper模型 Model", localModelFasterwhisperEntry),
@@ -693,30 +691,32 @@ func createStartButton(window fyne.Window, sm *SubtitleManager, videoInputContai
progress.Hide()
return
}
+ // 隐藏开始按钮
+ btn.Hide()
- // 重启后端服务以刷新配置
- if err = server.StopBackend(); err != nil {
- dialog.ShowError(fmt.Errorf("停止后端服务失败: %v", err), window)
- log.GetLogger().Error("停止后端服务失败", zap.Error(err))
- progress.Hide()
- return
- }
-
- go func() {
- err := server.StartBackend()
- if err != nil {
- dialog.ShowError(fmt.Errorf("启动后端服务失败: %v", err), window)
- log.GetLogger().Error("启动后端服务失败", zap.Error(err))
+ if config.ConfigBackup != config.Conf {
+ // 重启后端服务以刷新配置
+ if err = server.StopBackend(); err != nil {
+ dialog.ShowError(fmt.Errorf("停止后端服务失败: %v", err), window)
+ log.GetLogger().Error("停止后端服务失败", zap.Error(err))
progress.Hide()
return
}
- }()
- // 延迟一段时间以确保后端服务启动
- time.Sleep(1 * time.Second)
+ go func() {
+ err := server.StartBackend()
+ if err != nil {
+ dialog.ShowError(fmt.Errorf("启动后端服务失败: %v", err), window)
+ log.GetLogger().Error("启动后端服务失败", zap.Error(err))
+ progress.Hide()
+ return
+ }
+ }()
- // 隐藏开始按钮
- btn.Hide()
+ // 延迟一段时间以确保后端服务启动
+ time.Sleep(1 * time.Second)
+ config.ConfigBackup = config.Conf
+ }
if err = sm.StartTask(); err != nil {
dialog.ShowError(err, window)
@@ -752,13 +752,13 @@ func createStartButton(window fyne.Window, sm *SubtitleManager, videoInputContai
// 创建OpenAI配置组
func createOpenAIConfigGroup() *fyne.Container {
openaiBaseUrlEntry := StyledEntry("OpenAI API base url")
- openaiBaseUrlEntry.Bind(binding.BindString(&TempConf.Openai.BaseUrl))
+ openaiBaseUrlEntry.Bind(binding.BindString(&config.Conf.Openai.BaseUrl))
openaiModelEntry := StyledEntry("OpenAI模型名称 Model name")
- openaiModelEntry.Bind(binding.BindString(&TempConf.Openai.Model))
+ openaiModelEntry.Bind(binding.BindString(&config.Conf.Openai.Model))
openaiApiKeyEntry := StyledPasswordEntry("OpenAI API密钥 Key")
- openaiApiKeyEntry.Bind(binding.BindString(&TempConf.Openai.ApiKey))
+ openaiApiKeyEntry.Bind(binding.BindString(&config.Conf.Openai.ApiKey))
form := widget.NewForm(
widget.NewFormItem("API base url", openaiBaseUrlEntry),
@@ -772,10 +772,10 @@ func createOpenAIConfigGroup() *fyne.Container {
// 创建Whisper配置组
func createWhisperConfigGroup() *fyne.Container {
whisperBaseUrlEntry := StyledEntry("Whisper API base url")
- whisperBaseUrlEntry.Bind(binding.BindString(&TempConf.Openai.Whisper.BaseUrl))
+ whisperBaseUrlEntry.Bind(binding.BindString(&config.Conf.Openai.Whisper.BaseUrl))
whisperApiKeyEntry := StyledPasswordEntry("Whisper API密钥")
- whisperApiKeyEntry.Bind(binding.BindString(&TempConf.Openai.Whisper.ApiKey))
+ whisperApiKeyEntry.Bind(binding.BindString(&config.Conf.Openai.Whisper.ApiKey))
form := widget.NewForm(
widget.NewFormItem("API base url", whisperBaseUrlEntry),
@@ -788,13 +788,13 @@ func createWhisperConfigGroup() *fyne.Container {
// 创建阿里云OSS配置组
func createAliyunOSSConfigGroup() *fyne.Container {
ossAccessKeyIdEntry := StyledEntry("阿里云AccessKey ID")
- ossAccessKeyIdEntry.Bind(binding.BindString(&TempConf.Aliyun.Oss.AccessKeyId))
+ ossAccessKeyIdEntry.Bind(binding.BindString(&config.Conf.Aliyun.Oss.AccessKeyId))
ossAccessKeySecretEntry := StyledPasswordEntry("阿里云AccessKey Secret")
- ossAccessKeySecretEntry.Bind(binding.BindString(&TempConf.Aliyun.Oss.AccessKeySecret))
+ ossAccessKeySecretEntry.Bind(binding.BindString(&config.Conf.Aliyun.Oss.AccessKeySecret))
ossBucketEntry := StyledEntry("OSS Bucket名称 ")
- ossBucketEntry.Bind(binding.BindString(&TempConf.Aliyun.Oss.Bucket))
+ ossBucketEntry.Bind(binding.BindString(&config.Conf.Aliyun.Oss.Bucket))
form := widget.NewForm(
widget.NewFormItem("AccessKey ID", ossAccessKeyIdEntry),
@@ -808,13 +808,13 @@ func createAliyunOSSConfigGroup() *fyne.Container {
// 创建阿里云语音配置组
func createAliyunSpeechConfigGroup() *fyne.Container {
ossAccessKeyIdEntry := StyledEntry("阿里云 AccessKey ID")
- ossAccessKeyIdEntry.Bind(binding.BindString(&TempConf.Aliyun.Speech.AccessKeyId))
+ ossAccessKeyIdEntry.Bind(binding.BindString(&config.Conf.Aliyun.Speech.AccessKeyId))
ossAccessKeySecretEntry := StyledPasswordEntry("阿里云 AccessKey Secret")
- ossAccessKeySecretEntry.Bind(binding.BindString(&TempConf.Aliyun.Speech.AccessKeySecret))
+ ossAccessKeySecretEntry.Bind(binding.BindString(&config.Conf.Aliyun.Speech.AccessKeySecret))
speechAppKeyEntry := StyledEntry("阿里云语音服务 AppKey")
- speechAppKeyEntry.Bind(binding.BindString(&TempConf.Aliyun.Speech.AppKey))
+ speechAppKeyEntry.Bind(binding.BindString(&config.Conf.Aliyun.Speech.AppKey))
form := widget.NewForm(
widget.NewFormItem("AccessKey ID", ossAccessKeyIdEntry),
@@ -828,7 +828,7 @@ func createAliyunSpeechConfigGroup() *fyne.Container {
// 创建阿里云百炼配置组
func createAliyunBailianConfigGroup() *fyne.Container {
bailianApiKeyEntry := StyledPasswordEntry("阿里云百炼API密钥 Aliyun bailian api key")
- bailianApiKeyEntry.Bind(binding.BindString(&TempConf.Aliyun.Bailian.ApiKey))
+ bailianApiKeyEntry.Bind(binding.BindString(&config.Conf.Aliyun.Bailian.ApiKey))
form := widget.NewForm(
widget.NewFormItem("API密钥 key", bailianApiKeyEntry),