From 194406eed6af3db2dea3372559672a462238f347 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 7 Apr 2023 20:59:30 +0900 Subject: [PATCH 1/7] rename non-usable artifacts #1551 --- package.json | 1 + script/afterAllArtifactBuild.js | 27 +++++++++++++++++++++++++++ script/testAfterAllArtifactBuild.js | 11 +++++++++++ 3 files changed, 39 insertions(+) create mode 100644 script/afterAllArtifactBuild.js create mode 100644 script/testAfterAllArtifactBuild.js diff --git a/package.json b/package.json index b8c22900..e679eb69 100644 --- a/package.json +++ b/package.json @@ -138,6 +138,7 @@ "appId": "no.mifi.losslesscut", "artifactName": "${productName}-${os}-${arch}.${ext}", "afterSign": "electron-builder-notarize", + "afterAllArtifactBuild": "./script/afterAllArtifactBuild.js", "mac": { "hardenedRuntime": true, "appId": "no.mifi.losslesscut-mac", diff --git a/script/afterAllArtifactBuild.js b/script/afterAllArtifactBuild.js new file mode 100644 index 00000000..70fa4e32 --- /dev/null +++ b/script/afterAllArtifactBuild.js @@ -0,0 +1,27 @@ +const { join, dirname, basename } = require('path'); +const { rename } = require('fs/promises'); + +module.exports = async (buildResult) => { + const newArtifactPaths = []; + + // eslint-disable-next-line no-restricted-syntax + for (const artifactPath of buildResult.artifactPaths) { + const artifactName = basename(artifactPath); + + // Because many people try to download these files but get confused by it + if (['LosslessCut-win-x64.appx', 'LosslessCut-mac-universal.pkg'].includes(artifactName)) { + const newPath = join(dirname(artifactPath), `${artifactName}-DO-NOT-DOWNLOAD`); + // eslint-disable-next-line no-await-in-loop + await rename(artifactPath, newPath); + newArtifactPaths.push(newPath); + } else { + newArtifactPaths.push(artifactPath); + } + } + + // console.log(newArtifactPaths) + + // this seems to be the only way to do it + // eslint-disable-next-line no-param-reassign + buildResult.artifactPaths = newArtifactPaths; +}; diff --git a/script/testAfterAllArtifactBuild.js b/script/testAfterAllArtifactBuild.js new file mode 100644 index 00000000..d35fa69c --- /dev/null +++ b/script/testAfterAllArtifactBuild.js @@ -0,0 +1,11 @@ +const afterAllArtifactBuild = require('./afterAllArtifactBuild'); + +afterAllArtifactBuild({ + outDir: '/path/to/lossless-cut/dist', + artifactPaths: [ + '/path/to/lossless-cut/dist/LosslessCut-mac-arm64.dmg.blockmap', + '/path/to/lossless-cut/dist/LosslessCut-mac-arm64.dmg', + '/path/to/lossless-cut/dist/LosslessCut-mac-universal.pkg', + '/path/to/lossless-cut/dist/LosslessCut-win-x64.appx', + ], +}); From 3ee97d885911dec30156c556e4bf81a057b041bc Mon Sep 17 00:00:00 2001 From: taozi1996 <1273133941@qq.com> Date: Wed, 5 Apr 2023 14:03:02 +0000 Subject: [PATCH 2/7] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (636 of 636 strings) Translation: LosslessCut/LosslessCut Translate-URL: https://hosted.weblate.org/projects/losslesscut/losslesscut/zh_Hans/ --- public/locales/zh_Hans/translation.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/locales/zh_Hans/translation.json b/public/locales/zh_Hans/translation.json index b0673bc5..df3cbffd 100644 --- a/public/locales/zh_Hans/translation.json +++ b/public/locales/zh_Hans/translation.json @@ -783,6 +783,11 @@ "Show informational notifications": "显示信息通知", "Input has {{numStreamsTotal}} tracks": "输入有 {{numStreamsTotal}} 条轨道", "Keeping {{numStreamsToCopy}} tracks": "保留{{numStreamsToCopy}} 条轨道", - "Export mode for {{segments}} segments": "{{segments}} 片段的导出模式", - "The media file referenced by the project file you tried to open does not exist in the same directory as the project file: {{mediaFileName}}": "您试图打开的项目文件引用的媒体文件与项目文件不在同一目录中： {{mediaFileName}}" + "Export mode for {{segments}} segments": "{{segments}} 个片段的导出模式", + "The media file referenced by the project file you tried to open does not exist in the same directory as the project file: {{mediaFileName}}": "您试图打开的项目文件引用的媒体文件与项目文件不在同一目录中： {{mediaFileName}}", + "Prefer strong colors": "偏好强烈的色彩", + "Title": "标题", + "User interface": "用户界面", + "Combine selected segments": "合并所选片段", + "Copy selected segments times to clipboard": "将所选片段时间复制到剪贴板" } From f17241a29174b68ae8d7d7ed0cea24cae3f58851 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 7 Apr 2023 21:10:31 +0900 Subject: [PATCH 3/7] 3.55.0 --- no.mifi.losslesscut.appdata.xml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/no.mifi.losslesscut.appdata.xml b/no.mifi.losslesscut.appdata.xml index e1029069..118326e8 100644 --- a/no.mifi.losslesscut.appdata.xml +++ b/no.mifi.losslesscut.appdata.xml @@ -18,6 +18,7 @@ https://github.com/mifi/lossless-cut/issues https://paypal.me/mifino/usd + diff --git a/package.json b/package.json index e679eb69..43f85117 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "LosslessCut", "description": "The swiss army knife of lossless video/audio editing", "copyright": "Copyright © 2021 ${author}", - "version": "3.54.0", + "version": "3.55.0", "main": "public/electron.js", "homepage": "./", "scripts": { From d08c335833dc92d466d4d7b6c0b2a4f0144cf601 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 7 Apr 2023 21:18:49 +0900 Subject: [PATCH 4/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 854f5383..2ec2703f 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ First export each track as individual files. Then use Handbrake or similar to re ## Download -If you want to support my continued work on LosslessCut, and you want the advantage of a secure and simple installation process with automatic updates, consider getting it from your favorite store: +If you want to support my continued work on LosslessCut, and you want the advantage of a secure and simple installation process with automatic, stable updates, consider getting it from your favorite store: Mac App Store MS badge @@ -117,7 +117,7 @@ If you prefer to download the executables manually, this will of course always b - Linux: [x64 tar.bz2](https://github.com/mifi/lossless-cut/releases/latest/download/LosslessCut-linux-x64.tar.bz2) / [x64 AppImage](https://github.com/mifi/lossless-cut/releases/latest/download/LosslessCut-linux-x86_64.AppImage) / [arm64 tar.bz2](https://github.com/mifi/lossless-cut/releases/latest/download/LosslessCut-linux-arm64.tar.bz2) / [Raspberry Pi armv7l](https://github.com/mifi/lossless-cut/releases/latest/download/LosslessCut-linux-armv7l.tar.bz2) - [More releases](https://github.com/mifi/lossless-cut/releases) (note that APPX for Windows and PKG for MacOS **do not work**) -If you find LosslessCut useful, I'm very thankful for [donations](https://github.com/mifi/lossless-cut#donate-). +If you find LosslessCut useful, I'm very thankful for [your support](https://github.com/mifi/lossless-cut#donate-). **What's the difference between App Stores and GitHub download?** [Please see FAQ](issues.md#app-stores-and-github-difference) From 7da308c7d1431224e75f79d872454fc3da24c2c8 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 7 Apr 2023 21:31:54 +0900 Subject: [PATCH 5/7] Revert "rename non-usable artifacts #1551" This reverts commit 194406eed6af3db2dea3372559672a462238f347. --- package.json | 1 - script/afterAllArtifactBuild.js | 27 --------------------------- script/testAfterAllArtifactBuild.js | 11 ----------- 3 files changed, 39 deletions(-) delete mode 100644 script/afterAllArtifactBuild.js delete mode 100644 script/testAfterAllArtifactBuild.js diff --git a/package.json b/package.json index 43f85117..88731f81 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,6 @@ "appId": "no.mifi.losslesscut", "artifactName": "${productName}-${os}-${arch}.${ext}", "afterSign": "electron-builder-notarize", - "afterAllArtifactBuild": "./script/afterAllArtifactBuild.js", "mac": { "hardenedRuntime": true, "appId": "no.mifi.losslesscut-mac", diff --git a/script/afterAllArtifactBuild.js b/script/afterAllArtifactBuild.js deleted file mode 100644 index 70fa4e32..00000000 --- a/script/afterAllArtifactBuild.js +++ /dev/null @@ -1,27 +0,0 @@ -const { join, dirname, basename } = require('path'); -const { rename } = require('fs/promises'); - -module.exports = async (buildResult) => { - const newArtifactPaths = []; - - // eslint-disable-next-line no-restricted-syntax - for (const artifactPath of buildResult.artifactPaths) { - const artifactName = basename(artifactPath); - - // Because many people try to download these files but get confused by it - if (['LosslessCut-win-x64.appx', 'LosslessCut-mac-universal.pkg'].includes(artifactName)) { - const newPath = join(dirname(artifactPath), `${artifactName}-DO-NOT-DOWNLOAD`); - // eslint-disable-next-line no-await-in-loop - await rename(artifactPath, newPath); - newArtifactPaths.push(newPath); - } else { - newArtifactPaths.push(artifactPath); - } - } - - // console.log(newArtifactPaths) - - // this seems to be the only way to do it - // eslint-disable-next-line no-param-reassign - buildResult.artifactPaths = newArtifactPaths; -}; diff --git a/script/testAfterAllArtifactBuild.js b/script/testAfterAllArtifactBuild.js deleted file mode 100644 index d35fa69c..00000000 --- a/script/testAfterAllArtifactBuild.js +++ /dev/null @@ -1,11 +0,0 @@ -const afterAllArtifactBuild = require('./afterAllArtifactBuild'); - -afterAllArtifactBuild({ - outDir: '/path/to/lossless-cut/dist', - artifactPaths: [ - '/path/to/lossless-cut/dist/LosslessCut-mac-arm64.dmg.blockmap', - '/path/to/lossless-cut/dist/LosslessCut-mac-arm64.dmg', - '/path/to/lossless-cut/dist/LosslessCut-mac-universal.pkg', - '/path/to/lossless-cut/dist/LosslessCut-win-x64.appx', - ], -}); From 6fa2465ef5286d60b0f6a2d66a49564f4b40881c Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 7 Apr 2023 21:34:03 +0900 Subject: [PATCH 6/7] 3.55.1 --- no.mifi.losslesscut.appdata.xml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/no.mifi.losslesscut.appdata.xml b/no.mifi.losslesscut.appdata.xml index 118326e8..89b726b5 100644 --- a/no.mifi.losslesscut.appdata.xml +++ b/no.mifi.losslesscut.appdata.xml @@ -18,6 +18,7 @@ https://github.com/mifi/lossless-cut/issues https://paypal.me/mifino/usd + diff --git a/package.json b/package.json index 88731f81..9d1f7bd4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "LosslessCut", "description": "The swiss army knife of lossless video/audio editing", "copyright": "Copyright © 2021 ${author}", - "version": "3.55.0", + "version": "3.55.1", "main": "public/electron.js", "homepage": "./", "scripts": { From 0685d19ba5c40457f9cbb3f8c709c5d9fec2741f Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Sat, 8 Apr 2023 15:51:47 +0900 Subject: [PATCH 7/7] Update bug.yml --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 050af432..f75064b7 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -1,5 +1,5 @@ name: 🐛 Bug report -description: Describe a problem or bug with LosslessCut +description: Describe a bug in LosslessCut (not related to a specific file) body: - type: checkboxes id: initial-checklist