diff --git a/example/app-icon-syso/main.go b/example/app-icon-syso/main.go index adbd5f6ecfa271a5cf45b7548cfead55d958c51a..c1271b546167899b252efd0ff0a0ee4131029ef6 100644 --- a/example/app-icon-syso/main.go +++ b/example/app-icon-syso/main.go @@ -46,7 +46,7 @@ func syso() error { syso := winRes.NewSYSO() // 设置命令行执行目录, 该目录是要生成图标的应用根目录 // 资源在 resources 目录中读取 - syso.CMDDir = filepath.Join(wd(), "example", "browser-control") + syso.CMDDir = filepath.Join(wd(), "example", "browser-lib-checkupdate") syso.IconName = "icon.ico" return syso.RC() } diff --git a/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_386.syso b/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_386.syso new file mode 100644 index 0000000000000000000000000000000000000000..538ae8db6ff2a0ce2bcce143b7d43fe5dc2638df Binary files /dev/null and b/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_386.syso differ diff --git a/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_amd64.syso b/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_amd64.syso new file mode 100644 index 0000000000000000000000000000000000000000..b8840245cc9aaf67a0b55c93f0b92b83ad299c61 Binary files /dev/null and b/example/browser-lib-checkupdate/EnergyAutoUpdate_windows_amd64.syso differ diff --git a/example/browser-lib-checkupdate/README.md b/example/browser-lib-checkupdate/README.md new file mode 100644 index 0000000000000000000000000000000000000000..e6c1ddda8583189ea11f0e4fc5676a3732d1ae89 --- /dev/null +++ b/example/browser-lib-checkupdate/README.md @@ -0,0 +1,20 @@ +### Energy liblcl auto update example + +#### Demonstrating the liblcl dynamic link library module +* liblcl + +#### Using the `autoupdate` tool function in the `cmd` package, check update. +#### This example demonstrates the use of UI window design +#### Reference Example Customization Update + +### Check update steps +> 1. We copy a dynamic library and customize the import of dynamic link library functions to avoid conflicts with the currently updated ones +> 2. Injecting dynamic library proc by oneself `imports.SetEnergyImportDefs(version)` +> 3. initialize `inits.Init(nil, &resources)` +> 4. i18n config +> 5. open autoupdate `autoupdate.IsCheckUpdate(true)` +> 6. Set the callback function, and if there is an update, the function will be executed `autoupdate.CanUpdateLiblcl` +>> 6.1 `CanUpdateLiblcl` Obtain information on the updated module and the updated version level +> +>> 6.2. Update processing here, coding... +> 7. call `autoupdate.CheckUpdate()` Check for updates \ No newline at end of file diff --git a/example/browser-lib-checkupdate/README.zh_CN.md b/example/browser-lib-checkupdate/README.zh_CN.md new file mode 100644 index 0000000000000000000000000000000000000000..3e6d20d83e5fc285a9272ca643c28b7bec8c471b --- /dev/null +++ b/example/browser-lib-checkupdate/README.zh_CN.md @@ -0,0 +1,20 @@ +### Energy liblcl 自动更新示例 + +#### 演示liblcl动态链接库模块 +* liblcl + +#### 使用`cmd`包中的`autoupdate`工具功能，检查更新。 +#### 此示例使用了UI窗口设计 +#### 参考该示例自定义更新, 或直接使用 + +### 检查更新步骤 +> 1. 我们复制了一个动态库，并自定义了动态链接库函数的导入，以避免与当前更新的函数发生冲突 +> 2. 自行导入动态库proc `imports.SetEnergyImportDefs(version)` +> 3. 初始化 `inits.Init(nil, &resources)` +> 4. i18n 配置 +> 5. 打开自动更新 `autoupdate.IsCheckUpdate(true)` +> 6. 设置回调函数，如果有更新，函数将被执行 `autoupdate.CanUpdateLiblcl` +>> 6.1 `CanUpdateLiblcl` 回调函数返回更新模块信息和更新版本级别 +> +>> 6.2. 在这里编写更新代码, coding... +> 7. 调用 `autoupdate.CheckUpdate()` 检查更新 \ No newline at end of file diff --git a/example/browser-lib-checkupdate/demo_windows_386.syso b/example/browser-lib-checkupdate/demo_windows_386.syso deleted file mode 100644 index 561e4178cba6e978d73e4faeebb176d488890a72..0000000000000000000000000000000000000000 Binary files a/example/browser-lib-checkupdate/demo_windows_386.syso and /dev/null differ diff --git a/example/browser-lib-checkupdate/demo_windows_amd64.syso b/example/browser-lib-checkupdate/demo_windows_amd64.syso deleted file mode 100644 index 937f3e9b3e55d7f3198c795b7e2e28c2e91add50..0000000000000000000000000000000000000000 Binary files a/example/browser-lib-checkupdate/demo_windows_amd64.syso and /dev/null differ diff --git a/example/browser-lib-checkupdate/form/form.go b/example/browser-lib-checkupdate/form/form.go index 45134cdf2d004d0639b3d217878317034e5fa395..d6bcf867081ab3e2386c781122ccd28726653405 100644 --- a/example/browser-lib-checkupdate/form/form.go +++ b/example/browser-lib-checkupdate/form/form.go @@ -11,7 +11,6 @@ package form import ( - "fmt" "github.com/energye/golcl/lcl" "github.com/energye/golcl/lcl/types" "github.com/energye/golcl/lcl/types/colors" @@ -24,17 +23,15 @@ var OnCreate callback type UpdateForm struct { *lcl.TForm - TitlePanel *lcl.TPanel - UpdatePromptPanel *lcl.TPanel - UpdateProgressPanel *lcl.TPanel + TitlePanel *lcl.TPanel + UpdatePromptPanel *lcl.TPanel + UpdateContentMemo *lcl.TMemo } func (m *UpdateForm) OnFormCreate(sender lcl.IObject) { - fmt.Println("OnFormCreate") var after = true m.SetOnActivate(func(sender lcl.IObject) { if OnAfter != nil && after { - fmt.Println("SetOnActivate") after = false OnAfter() } diff --git a/example/browser-lib-checkupdate/main.go b/example/browser-lib-checkupdate/main.go index d46cb20b34f4c259ca6d47f37ebfe9bb466c4172..3d47b4535cd0e6807233d2a0c941e68c12065a30 100644 --- a/example/browser-lib-checkupdate/main.go +++ b/example/browser-lib-checkupdate/main.go @@ -6,8 +6,8 @@ import ( "archive/zip" "embed" "fmt" - "github.com/energye/energy/v2/cef/autoupdate" "github.com/energye/energy/v2/cef/i18n" + "github.com/energye/energy/v2/cmd/autoupdate" "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/common/imports" "github.com/energye/energy/v2/consts" @@ -93,13 +93,9 @@ func main() { i18n.Switch(consts.LANGUAGE_zh_CN) // 开启自动更新检查 autoupdate.IsCheckUpdate(true) - // 如果 liblcl 有更新该函数将被回调 - autoupdate.CanUpdateLiblcl = func(model *autoupdate.Model, level int) { - fmt.Println(*model) + // 如果 liblcl 有更新该函数将被回调,并创建更新窗口 + autoupdate.CanUpdateLiblcl = func(model *autoupdate.Model, level int, canUpdate bool) { updateVersion := model.Versions[model.Latest] - fmt.Println(model.Versions[model.Latest]) - fmt.Println(level) - var energyLiblcl = func() (string, bool) { if common.IsWindows() { return fmt.Sprintf("Windows %d bits", strconv.IntSize), true @@ -207,110 +203,125 @@ func main() { m.UpdatePromptPanel.SetHeight(updatePanelHeight) // 更新内容 - updateContentMemo := lcl.NewMemo(m.UpdatePromptPanel) - updateContentMemo.SetParent(m.UpdatePromptPanel) + m.UpdateContentMemo = lcl.NewMemo(m.UpdatePromptPanel) + m.UpdateContentMemo.SetParent(m.UpdatePromptPanel) ucw := m.Width() / 4 - updateContentMemo.SetWidth(ucw * 3) - updateContentMemo.SetLeft((m.Width() - updateContentMemo.Width()) / 2) - updateContentMemo.SetHeight(updatePanelHeight) - updateContentMemo.SetReadOnly(true) - updateContentMemo.SetColor(colors.ClWhite) - updateContentMemo.SetScrollBars(types.SsAutoBoth) - updateContentMemo.Lines().Add(i18n.Resource("updateContent") + " " + model.Latest) - for i, content := range updateVersion.Content { - updateContentMemo.Lines().Add(" " + strconv.Itoa(i+1) + ". " + content) - } - // liblcl 下载版本URL - liblclZipName, _ := energyLiblcl() - downUrl := strings.Replace(model.Download.Url, "{url}", model.Download.Source[model.Download.SourceSelect], -1) // 使用配置的下载源 - downUrl = strings.Replace(downUrl, "{version}", updateVersion.EnergyVersion, -1) // liblcl 所属的 enregy 版本 - downUrl = strings.Replace(downUrl, "{OSARCH}", liblclZipName, -1) // 根据系统架构获取对应的文件名 - updateContentMemo.Lines().Add("") - updateContentMemo.Lines().Add(i18n.Resource("downloadURL")) - updateContentMemo.Lines().Add(downUrl) - - // 取消按钮 - //cancelBtn := lcl.NewImageButton(m) - //cancelBtn.SetParent(m) - //cancelBtn.SetImageCount(3) - //cancelBtn.SetAutoSize(true) - //cancelBtn.SetCursor(types.CrHandPoint) - //cancelBtn.Picture().LoadFromFSFile("resources/btn-cancel.png") - //cancelBtn.SetLeft(300) - //cancelBtn.SetTop(290) - //cancelBtn.SetHint(i18n.Resource("cancel")) - //cancelBtn.SetOnClick(func(lcl.IObject) { - // //m.Close() - //}) + m.UpdateContentMemo.SetWidth(ucw * 3) + m.UpdateContentMemo.SetLeft((m.Width() - m.UpdateContentMemo.Width()) / 2) + m.UpdateContentMemo.SetHeight(updatePanelHeight) + m.UpdateContentMemo.SetReadOnly(true) + m.UpdateContentMemo.SetColor(colors.ClWhite) + if !canUpdate { + m.UpdateContentMemo.Lines().Add(i18n.Resource("currentVersion") + ": " + model.CurrentVersion) + m.UpdateContentMemo.Lines().Add(i18n.Resource("latestVersion") + ": " + model.Latest) + m.UpdateContentMemo.SetEnabled(false) + } else if canUpdate { // 有更新 + m.UpdateContentMemo.SetScrollBars(types.SsAutoBoth) + m.UpdateContentMemo.Lines().Add(i18n.Resource("updateContent") + " " + model.Latest) + for i, content := range updateVersion.Content { + m.UpdateContentMemo.Lines().Add(" " + strconv.Itoa(i+1) + ". " + content) + } + // liblcl 下载版本URL + liblclZipName, _ := energyLiblcl() + downUrl := strings.Replace(model.Download.Url, "{url}", model.Download.Source[model.Download.SourceSelect], -1) // 使用配置的下载源 + downUrl = strings.Replace(downUrl, "{version}", updateVersion.EnergyVersion, -1) // liblcl 所属的 enregy 版本 + downUrl = strings.Replace(downUrl, "{OSARCH}", liblclZipName, -1) // 根据系统架构获取对应的文件名 + m.UpdateContentMemo.Lines().Add("") + m.UpdateContentMemo.Lines().Add(i18n.Resource("downloadURL")) + m.UpdateContentMemo.Lines().Add(downUrl) - // 下载 - var isNotDownload = true - // 更新下载进度条 - updateProgressBar := lcl.NewProgressBar(m) - updateProgressBar.SetParent(m) - updateProgressBar.SetTop(updatePanelHeight + m.UpdatePromptPanel.Top() + 5) - updateProgressBar.SetLeft(updateContentMemo.Left()) - updateProgressBar.SetMin(0) - updateProgressBar.SetMax(100) - updateProgressBar.SetWidth(updateContentMemo.Width()) - updateProgressBar.SetVisible(false) - // 更新按钮 - updateBtn := lcl.NewImageButton(m) - updateBtn.SetParent(m) - updateBtn.SetImageCount(3) - //updateBtn.SetAutoSize(true) - updateBtn.SetWidth(80) - updateBtn.SetHeight(50) - updateBtn.SetCursor(types.CrHandPoint) - updateBtn.Picture().LoadFromFSFile("resources/btn-update.png") - updateBtn.SetLeft(400) - updateBtn.SetTop(330) - updateBtn.SetHint(i18n.Resource("update")) - updateBtn.SetOnClick(func(lcl.IObject) { - if isNotDownload { - updateProgressBar.SetPosition(0) - updateProgressBar.SetVisible(isNotDownload) - isNotDownload = false - updateBtn.SetEnabled(isNotDownload) + // 取消按钮 + //cancelBtn := lcl.NewImageButton(m) + //cancelBtn.SetParent(m) + //cancelBtn.SetImageCount(3) + //cancelBtn.SetAutoSize(true) + //cancelBtn.SetCursor(types.CrHandPoint) + //cancelBtn.Picture().LoadFromFSFile("resources/btn-cancel.png") + //cancelBtn.SetLeft(300) + //cancelBtn.SetTop(290) + //cancelBtn.SetHint(i18n.Resource("cancel")) + //cancelBtn.SetOnClick(func(lcl.IObject) { + // //m.Close() + //}) - var savePath, _ = filepath.Split(libPath) - var fileName, _ = energyLiblcl() - var saveFilePath = filepath.Join(savePath, fileName) + ".zip" // zip + // 下载 + var isNotDownload = true + // 更新下载进度条 + updateProgressBar := lcl.NewProgressBar(m) + updateProgressBar.SetParent(m) + updateProgressBar.SetTop(updatePanelHeight + m.UpdatePromptPanel.Top() + 5) + updateProgressBar.SetLeft(m.UpdateContentMemo.Left()) + updateProgressBar.SetMin(0) + updateProgressBar.SetMax(100) + updateProgressBar.SetWidth(m.UpdateContentMemo.Width()) + updateProgressBar.SetVisible(false) + // 更新按钮 + updateBtn := lcl.NewImageButton(m) + updateBtn.SetParent(m) + updateBtn.SetImageCount(3) + //updateBtn.SetAutoSize(true) + updateBtn.SetWidth(80) + updateBtn.SetHeight(50) + updateBtn.SetCursor(types.CrHandPoint) + updateBtn.Picture().LoadFromFSFile("resources/btn-update.png") + updateBtn.SetLeft(400) + updateBtn.SetTop(335) + updateBtn.SetHint(i18n.Resource("update")) + updateBtn.SetOnClick(func(lcl.IObject) { + if isNotDownload { + updateProgressBar.SetPosition(0) + updateProgressBar.SetVisible(isNotDownload) + isNotDownload = false + updateBtn.SetEnabled(isNotDownload) - updateContentMemo.Lines().Add(i18n.Resource("beginDownload")) - updateContentMemo.Lines().Add(" " + i18n.Resource("downloadURL") + ": " + downUrl) - updateContentMemo.Lines().Add(" " + i18n.Resource("savePath") + ": " + saveFilePath) - go func() { - // 下载地址, 保存目录, 回调更新进程函数 - downloadFile(downUrl, saveFilePath, func(totalLength, processLength int64) { - var process = int32((float64(processLength) / float64(totalLength)) * 100) - lcl.ThreadSync(func() { - updateProgressBar.SetPosition(process) - if process >= 100 { - isNotDownload = true - updateBtn.SetEnabled(isNotDownload) - updateContentMemo.Lines().Add(i18n.Resource("endDownload")) - } - }) - }) - updateContentMemo.Lines().Add(i18n.Resource("extractUnZip") + ": " + filepath.Join(savePath, libname.GetDLLName())) - extractUnZip(saveFilePath, savePath, func(totalLength, processLength int64, err error) { - var process = int32((float64(processLength) / float64(totalLength)) * 100) - lcl.ThreadSync(func() { - if err != nil { - updateContentMemo.Lines().Add(i18n.Resource("updateError") + ":\n " + err.Error()) - } - if process >= 100 { - updateContentMemo.Lines().Add(i18n.Resource("extractUnZip") + ": success") - updateContentMemo.Lines().Add(i18n.Resource("updateSuccess")) - } + var savePath, _ = filepath.Split(libPath) + var fileName, _ = energyLiblcl() + var saveFilePath = filepath.Join(savePath, fileName) + ".zip" // zip + m.UpdateContentMemo.Lines().Add("---------------------------------------------------------------") + m.UpdateContentMemo.Lines().Add(i18n.Resource("beginDownload")) + m.UpdateContentMemo.Lines().Add(" " + i18n.Resource("downloadURL") + ": " + downUrl) + m.UpdateContentMemo.Lines().Add(" " + i18n.Resource("savePath") + ": " + saveFilePath) + go func() { + // 下载地址, 保存目录, 回调更新进程函数 + downloadFile(downUrl, saveFilePath, func(totalLength, processLength int64, err error) { + var process = int32((float64(processLength) / float64(totalLength)) * 100) + lcl.ThreadSync(func() { + if err != nil { + m.UpdateContentMemo.Lines().Add(i18n.Resource("downloadError") + ":\n " + err.Error()) + m.UpdateContentMemo.Lines().Add(i18n.Resource("downloadAgain")) + } else { + updateProgressBar.SetPosition(process) + if process >= 100 { + m.UpdateContentMemo.Lines().Add(i18n.Resource("endDownload") + " -> 100") + } + } + }) }) - }, libname.GetDLLName()) - }() - } - }) - - // 下载进度 + m.UpdateContentMemo.Lines().Add("---------------------------------------------------------------") + updateProgressBar.SetPosition(0) + m.UpdateContentMemo.Lines().Add(i18n.Resource("extractUnZip") + ": " + filepath.Join(savePath, libname.GetDLLName())) + // 解压释放文件 + extractUnZip(saveFilePath, savePath, func(totalLength, processLength int64, err error) { + var process = int32((float64(processLength) / float64(totalLength)) * 100) + lcl.ThreadSync(func() { + if err != nil { + m.UpdateContentMemo.Lines().Add(i18n.Resource("updateError") + ":\n " + err.Error()) + m.UpdateContentMemo.Lines().Add(i18n.Resource("updateAgain")) + } else { + updateProgressBar.SetPosition(process) + if process >= 100 { + m.UpdateContentMemo.Lines().Add(i18n.Resource("extractUnZip") + ": success -> 100") + m.UpdateContentMemo.Lines().Add(i18n.Resource("updateSuccess")) + } + } + }) + }, libname.GetDLLName()) + isNotDownload = true + updateBtn.SetEnabled(isNotDownload) + }() + } + }) + } } // run and create update form lcl.RunApp(&updateForm) @@ -320,7 +331,7 @@ func main() { } // 下载文件 -func downloadFile(url string, localPath string, callback func(totalLength, processLength int64)) error { +func downloadFile(url string, localPath string, callback func(totalLength, processLength int64, err error)) error { var ( fsize int64 buf = make([]byte, 1024*10) @@ -330,27 +341,23 @@ func downloadFile(url string, localPath string, callback func(totalLength, proce client := new(http.Client) resp, err := client.Get(url) if err != nil { - fmt.Printf("download-error=[%v]\n", err) - os.Exit(1) + callback(0, 0, err) return err } fsize, err = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 32) if err != nil { - fmt.Printf("download-error=[%v]\n", err) - os.Exit(1) + callback(0, 0, err) return err } println("Save path: [", localPath, "] file size:", fsize) file, err := os.Create(tmpFilePath) if err != nil { - fmt.Printf("download-error=[%v]\n", err) - os.Exit(1) + callback(0, 0, err) return err } defer file.Close() if resp.Body == nil { - fmt.Printf("Download-error=[body is null]\n") - os.Exit(1) + callback(0, 0, err) return nil } defer resp.Body.Close() @@ -361,7 +368,7 @@ func downloadFile(url string, localPath string, callback func(totalLength, proce if nw > 0 { written += int64(nw) } - callback(fsize, written) + callback(fsize, written, err) if err != nil { break } @@ -432,13 +439,13 @@ func extractUnZip(filePath, targetPath string, callback func(totalLength, proces callback(0, 0, err) } } else { - fmt.Printf("error: cannot open file, error=[%v]\n", err) + callback(0, 0, err) return } } } else { if err != nil { - fmt.Printf("error: cannot read zip file, error=[%v]\n", err) + callback(0, 0, err) } } } diff --git a/example/browser-lib-checkupdate/resources/locale.en-US.json b/example/browser-lib-checkupdate/resources/locale.en-US.json index 91da246f2f4c0b4a6b809f845586f11800302086..d34778d79f4373a1bd2b3d0dc2ad34c6da291780 100644 --- a/example/browser-lib-checkupdate/resources/locale.en-US.json +++ b/example/browser-lib-checkupdate/resources/locale.en-US.json @@ -3,10 +3,15 @@ "close": "close", "cancel": "cancel", "update": "update", + "currentVersion": "Current", + "latestVersion": "Latest", "updateContent": "Update Content", "downloadURL": "Update URL", + "downloadError": "Download Error", + "downloadAgain": "Please check for errors and try again", "updateSuccess": "Update Success", "updateError": "Update Error", + "updateAgain": "Please check for errors and try again", "beginDownload": "begin download", "endDownload": "end download", "savePath": "save path", diff --git a/example/browser-lib-checkupdate/resources/locale.zh-CN.json b/example/browser-lib-checkupdate/resources/locale.zh-CN.json index 26154c466b8e112963b08991bd8700475b542ae1..15e3a02fbb31f6b987d9a1d0d068712544bd9728 100644 --- a/example/browser-lib-checkupdate/resources/locale.zh-CN.json +++ b/example/browser-lib-checkupdate/resources/locale.zh-CN.json @@ -3,10 +3,15 @@ "close": "关闭", "cancel": "取消", "update": "更新", + "currentVersion": "当前", + "latestVersion": "最新", "updateContent": "更新内容", "downloadURL": "更新地址", + "downloadError": "下载失败", + "downloadAgain": "请检查错误后重试", "updateSuccess": "更新成功", "updateError": "更新失败", + "updateAgain": "请检查错误后重试", "beginDownload": "开始下载", "endDownload": "下载完成", "savePath": "保存目录",