From fcf8cfa4e00e3f139571c3260c64b40e01c13257 Mon Sep 17 00:00:00 2001 From: Picorims Date: Thu, 2 Feb 2023 23:30:36 +0100 Subject: [PATCH 1/8] fix(changelogs): rename 0.3.2-indev to beta --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5831723..dd398596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This document is based on Keep a Changelog 1.0.0 https://keepachangelog.com/en/1.0.0/ -## 0.3.2-indev (2023-02-02) +## 0.3.2-beta (2023-02-02) ### Changed - The side panel is now resizable. From 7cd971d3d0cd478117524e01c0a19688806b023b Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 17:55:20 +0100 Subject: [PATCH 2/8] chore(app): change version number --- CHANGELOG.md | 2 ++ js/index.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd398596..f2560121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This document is based on Keep a Changelog 1.0.0 https://keepachangelog.com/en/1.0.0/ +## 0.3.3-beta (????-??-??) + ## 0.3.2-beta (2023-02-02) ### Changed diff --git a/js/index.js b/js/index.js index e324b431..32f2d262 100644 --- a/js/index.js +++ b/js/index.js @@ -19,7 +19,7 @@ const {ipcRenderer} = require("electron"); /** @type {String} current build version*/ -const software_version = "0.3.2-beta"; +const software_version = "0.3.3-indev"; /** @type {String} current build type */ let working_dir; //working directory for user, temp, logs... let root_dir; //root of the app (where main.js is located, and html/css folders) diff --git a/package-lock.json b/package-lock.json index 4b4b8bc2..8ada005b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "wav2bar", - "version": "0.3.2-beta", + "version": "0.3.3-indev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wav2bar", - "version": "0.3.2-beta", + "version": "0.3.3-indev", "license": "GPL-3.0-or-later", "dependencies": { "colors": "^1.4.0", diff --git a/package.json b/package.json index 05efc9a1..263a71dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wav2bar", - "version": "0.3.2-beta", + "version": "0.3.3-indev", "description": "A tool to create and export audio visualization mainly for the music industry", "main": "main.js", "scripts": { From 42a75689833a9e735c282b07d6f44e07775242bb Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 18:06:24 +0100 Subject: [PATCH 3/8] fix(ui): fix open logs folder causing path error --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index 30da1f92..681ba372 100644 --- a/main.js +++ b/main.js @@ -575,6 +575,7 @@ ipcMain.handle("open-local-html", async (event, link) => { * @param {String} path_to_open */ ipcMain.handle("open-folder-in-file-explorer", async (event, path_to_open) => { + if (process.platform === "win32") path_to_open = path_to_open.replaceAll("/","\\"); main_log.warn(`opening ${path_to_open}.`); var regexp = new RegExp(/^\.\//); if (regexp.test(path_to_open)) path_to_open = path.join(__dirname, path_to_open); From 0c31a7d9b4b80c9825aa76bf722defde6d15379a Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 18:48:28 +0100 Subject: [PATCH 4/8] fix(ui): fix bind not always loading properly --- index.html | 2 +- .../web_ui_input_field/web_ui_input_field.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index ee945c28..4c57dc49 100644 --- a/index.html +++ b/index.html @@ -173,7 +173,7 @@ --> diff --git a/js/ui_components/web_ui_input_field/web_ui_input_field.js b/js/ui_components/web_ui_input_field/web_ui_input_field.js index 0c0bfdfd..b1a07afc 100644 --- a/js/ui_components/web_ui_input_field/web_ui_input_field.js +++ b/js/ui_components/web_ui_input_field/web_ui_input_field.js @@ -49,14 +49,17 @@ export class WebUIInputField extends WebUICustomComponent { props: {...PROPS_DEFAULTS}, }); + this.onDOMReadyOnce(() => { + this.bindProps(PROPS.value, bind_input, bind_input.PROPS.value); + this.bindProps(PROPS.type, bind_input, bind_input.PROPS.type); + this.bindProps(PROPS.name, label_block, label_block.PROPS.name); + }); + /** @type {uiComponents.WebUIBindInput} */ let bind_input = this._shadow_root.querySelector(".ui-input-field-bind"); - this.bindProps(PROPS.value, bind_input, bind_input.PROPS.value); - this.bindProps(PROPS.type, bind_input, bind_input.PROPS.type); /** @type {uiComponents.WebUILabelBlock} */ let label_block = this._shadow_root.querySelector(".ui-input-field-label"); - this.bindProps(PROPS.name, label_block, label_block.PROPS.name); // /** @type {HTMLInputElement} */ let input = this._shadow_root.querySelector(".ui-input-field-input"); From fb96a049d218f6166208059fbf390c88a857dd87 Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 19:23:21 +0100 Subject: [PATCH 5/8] docs(release): add release instructions to the development guidelines --- docs/DEVELOPMENT_GUIDELINES.md | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/docs/DEVELOPMENT_GUIDELINES.md b/docs/DEVELOPMENT_GUIDELINES.md index e5d75c22..15f8c1a3 100644 --- a/docs/DEVELOPMENT_GUIDELINES.md +++ b/docs/DEVELOPMENT_GUIDELINES.md @@ -16,6 +16,7 @@ - [Documenting](#documenting) - [Creating UI components](#ui-components) - [Versioning and Git](#versioning-and-git) +- [Doing a release](#doing-a-release) - [Questions or concerns ?](#questions-or-context) - [FAQ](#faq) @@ -372,6 +373,64 @@ It is (again) arguably not as convenient as a framework introducing custom synta > Note: **Do NOT use Git LFS!** It caused many issues in the past and should not be touched or used anymore. + + +## Doing a release + +1) verify the version number and type **( /!\ indev -> beta /!\ )** in: + - package.json (/!\/!\/!\/!\ including in package makers!!! /!\/!\/!\/!\) + - package.lock.json + - index.js +2) update CHANGELOG.md + +3) comment out the `openDevTools` line in window functions in main.js +4) do necessary fixes + +5) push to master + +6) `npm run make` (for local testing or manual builds) +7) test the maked files (if not ok go back to #4) + +8) tag locally (`git tag -a v1.4 -m "my version 1.4"`) +9) commit the tag (`git push origin --tags` or `git push origin tag_name`) +> **to get rid of a tag:** +> - `git tag -d v1.4-lw` +> - `git push origin --delete ` +10) + - **local build:** + - Do the GitHub release with appropriate packages and the right tag (source code already managed BUT without node modules) + - **CI build:** + - Wait for the tag CI action to finish. It will produce a release draft for the tag, with built packages attached to it. +11) Fill the release information: +```md +[description] + +# Changelog +- a +- b + +# Known issues +- a +- b + +# Note on Betas +Wav2Bar is currently in beta, which means that things actively change (UI, saves, etc.)! Please **backup your saves**, especially when updating Wav2Bar. + +# Note for Linux +Right now Linux is not very well supported, but I try my best to make it better bit by bit. For now you should be able to use Wav2Bar without much problem by using the zipped version or using the source code after installing the dependencies (see the README or the wiki). There are some predefined (but not tested) configs to make some other linux packages that you can try. + +# Note for Mac +Mac is not supported at this moment, but you can give it a try using the source code (see the README or the wiki). + + +# Support +For bug reports, please use the issues section of GitHub. For other support, use the discussions section or go over to my Discord server (https://discord.gg/EVGzfdP) +``` + +12) Update the website links and release numbers (hard coded, yes I know what you will say, and it is OK as is for me right now). +13) OPTIONAL : Blog post +14) Do an archive of the Git repository and GitHub assets + ## Questions or concerns ? From 30527bba33bec3c475ac34792309e041758b39df Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 19:26:23 +0100 Subject: [PATCH 6/8] fix(docs): fix slash issue in development guidelines --- docs/DEVELOPMENT_GUIDELINES.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/DEVELOPMENT_GUIDELINES.md b/docs/DEVELOPMENT_GUIDELINES.md index 15f8c1a3..9d071aa7 100644 --- a/docs/DEVELOPMENT_GUIDELINES.md +++ b/docs/DEVELOPMENT_GUIDELINES.md @@ -378,10 +378,10 @@ It is (again) arguably not as convenient as a framework introducing custom synta ## Doing a release 1) verify the version number and type **( /!\ indev -> beta /!\ )** in: - - package.json (/!\/!\/!\/!\ including in package makers!!! /!\/!\/!\/!\) - - package.lock.json - - index.js -2) update CHANGELOG.md + - `package.json` + - `package.lock.json` + - `index.js` +2) update [CHANGELOG.md](../CHANGELOG.md) 3) comment out the `openDevTools` line in window functions in main.js 4) do necessary fixes From d7e225673cbcef47bd235c399883fd9982c57e77 Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 19:32:13 +0100 Subject: [PATCH 7/8] chore(application): release 0.3.3 --- CHANGELOG.md | 6 +++++- js/index.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2560121..c7a823b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ This document is based on Keep a Changelog 1.0.0 https://keepachangelog.com/en/1.0.0/ -## 0.3.3-beta (????-??-??) +## 0.3.3-beta (2023-02-04) + +### Fixed +- Fixed: FPS, screen size and JPEG export inputs are completely broken (MSI installation) (#59) +- Fixed: The open logs folder is broken (#58) ## 0.3.2-beta (2023-02-02) diff --git a/js/index.js b/js/index.js index 32f2d262..7213dd23 100644 --- a/js/index.js +++ b/js/index.js @@ -19,7 +19,7 @@ const {ipcRenderer} = require("electron"); /** @type {String} current build version*/ -const software_version = "0.3.3-indev"; +const software_version = "0.3.3-beta"; /** @type {String} current build type */ let working_dir; //working directory for user, temp, logs... let root_dir; //root of the app (where main.js is located, and html/css folders) diff --git a/package-lock.json b/package-lock.json index 8ada005b..b6ce3d20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "wav2bar", - "version": "0.3.3-indev", + "version": "0.3.3-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wav2bar", - "version": "0.3.3-indev", + "version": "0.3.3-beta", "license": "GPL-3.0-or-later", "dependencies": { "colors": "^1.4.0", diff --git a/package.json b/package.json index 263a71dd..8d6e790e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wav2bar", - "version": "0.3.3-indev", + "version": "0.3.3-beta", "description": "A tool to create and export audio visualization mainly for the music industry", "main": "main.js", "scripts": { From 05745eae1cee7cf0bfc8da80b9433b59b378650b Mon Sep 17 00:00:00 2001 From: Picorims Date: Sat, 4 Feb 2023 19:36:55 +0100 Subject: [PATCH 8/8] fix(docs): update release guidelines --- docs/DEVELOPMENT_GUIDELINES.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/DEVELOPMENT_GUIDELINES.md b/docs/DEVELOPMENT_GUIDELINES.md index 9d071aa7..e67efcaa 100644 --- a/docs/DEVELOPMENT_GUIDELINES.md +++ b/docs/DEVELOPMENT_GUIDELINES.md @@ -391,17 +391,19 @@ It is (again) arguably not as convenient as a framework introducing custom synta 6) `npm run make` (for local testing or manual builds) 7) test the maked files (if not ok go back to #4) -8) tag locally (`git tag -a v1.4 -m "my version 1.4"`) -9) commit the tag (`git push origin --tags` or `git push origin tag_name`) +8) merge the release from `develop` to `main` + +9) tag locally on `main` (`git tag -a v1.4 -m "my version 1.4"`) +10) commit the tag (`git push origin --tags` or `git push origin tag_name`) > **to get rid of a tag:** > - `git tag -d v1.4-lw` > - `git push origin --delete ` -10) +11) - **local build:** - Do the GitHub release with appropriate packages and the right tag (source code already managed BUT without node modules) - **CI build:** - Wait for the tag CI action to finish. It will produce a release draft for the tag, with built packages attached to it. -11) Fill the release information: +12) Fill the release information: ```md [description] @@ -427,9 +429,9 @@ Mac is not supported at this moment, but you can give it a try using the source For bug reports, please use the issues section of GitHub. For other support, use the discussions section or go over to my Discord server (https://discord.gg/EVGzfdP) ``` -12) Update the website links and release numbers (hard coded, yes I know what you will say, and it is OK as is for me right now). -13) OPTIONAL : Blog post -14) Do an archive of the Git repository and GitHub assets +13) Update the website links and release numbers (hard coded, yes I know what you will say, and it is OK as is for me right now). +14) OPTIONAL : Blog post +15) Do an archive of the Git repository and GitHub assets