Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit d3b704e

Browse files
authored
Merge pull request #315 from Moosync/dev
10.3.0
2 parents a9c3593 + 37bcd11 commit d3b704e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3369
-2389
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Build/release
33
on:
44
push:
55
tags:
6-
- "*"
6+
- '*'
77

88
branches:
9-
- "dev"
10-
- "main"
9+
- 'dev'
10+
- 'main'
1111

1212
jobs:
1313
release:
@@ -28,8 +28,8 @@ jobs:
2828
- name: Install Node.js, NPM and Yarn
2929
uses: actions/setup-node@v3
3030
with:
31-
node-version: "16"
32-
cache: "yarn"
31+
node-version: '21'
32+
cache: 'yarn'
3333

3434
- name: Get yarn cache
3535
id: yarn-cache
@@ -89,13 +89,13 @@ jobs:
8989
fi
9090
- name: setup env
9191
env:
92-
YOUTUBECLIENTID: "${{ secrets.YOUTUBECLIENTID }}"
93-
YOUTUBECLIENTSECRET: "${{ secrets.YOUTUBECLIENTSECRET }}"
94-
LASTFMAPIKEY: "${{ secrets.LASTFMAPIKEY }}"
95-
LASTFMSECRET: "${{ secrets.LASTFMSECRET }}"
96-
SPOTIFYCLIENTID: "${{ secrets.SPOTIFYCLIENTID }}"
97-
SPOTIFYCLIENTSECRET: "${{ secrets.SPOTIFYCLIENTSECRET }}"
98-
FANARTTVAPIKEY: "${{ secrets.FANARTTVAPIKEY }}"
92+
YOUTUBECLIENTID: '${{ secrets.YOUTUBECLIENTID }}'
93+
YOUTUBECLIENTSECRET: '${{ secrets.YOUTUBECLIENTSECRET }}'
94+
LASTFMAPIKEY: '${{ secrets.LASTFMAPIKEY }}'
95+
LASTFMSECRET: '${{ secrets.LASTFMSECRET }}'
96+
SPOTIFYCLIENTID: '${{ secrets.SPOTIFYCLIENTID }}'
97+
SPOTIFYCLIENTSECRET: '${{ secrets.SPOTIFYCLIENTSECRET }}'
98+
FANARTTVAPIKEY: '${{ secrets.FANARTTVAPIKEY }}'
9999
run: chmod +x setup_env.sh && . setup_env.sh
100100
shell: bash
101101

aur/moosync

Submodule moosync updated from 507b93f to 377e76c

aur/moosync-bin

Submodule moosync-bin updated from 964b1fc to 2a295ec

chocolatey/moosync.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<metadata>
55
<!-- == PACKAGE SPECIFIC SECTION == -->
66
<id>moosync</id>
7-
<version>10.1.2</version>
7+
<version>10.2.0</version>
88
<packageSourceUrl>https://github.com/Moosync/Moosync</packageSourceUrl>
99
<owners>Sahil Gupte</owners>
1010
<!-- ============================== -->
@@ -36,7 +36,7 @@
3636
- Develop own apps on top of Moosync Extension API
3737
- Available on Windows and Linux and MacOS
3838
</description>
39-
<releaseNotes>https://github.com/Moosync/Moosync/releases/tag/v10.1.2</releaseNotes>
39+
<releaseNotes>https://github.com/Moosync/Moosync/releases/tag/v10.2.0</releaseNotes>
4040
<!-- =============================== -->
4141
</metadata>
4242
<files>

chocolatey/tools/chocolateyinstall.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ErrorActionPreference = 'Stop';
22
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
3-
$url64 = 'https://github.com/Moosync/Moosync/releases/download/v10.1.2/Moosync-10.1.2-win-x64.exe'
3+
$url64 = 'https://github.com/Moosync/Moosync/releases/download/v10.2.0/Moosync-10.2.0-win-x64.exe'
44

55
$packageArgs = @{
66
packageName = $env:ChocolateyPackageName
@@ -10,7 +10,7 @@ $packageArgs = @{
1010

1111
softwareName = 'Moosync*'
1212

13-
checksum64 = '02f4eb018e92ea4aded9d5547a00f4a43a5cb66362b9c12f285c643434d56eb1'
13+
checksum64 = 'a8b6e2e27192999592e2888c2e3121924e9df9355fb9e3ce63741a6a6444a362'
1414
checksumType64 = 'sha256'
1515

1616
validExitCodes = @(0, 3010, 1641)

package.json

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "moosync",
3-
"version": "10.2.0",
3+
"version": "10.3.0",
44
"private": true,
55
"author": "Ovenoboyo <ovenoboyo@gmail.com>",
66
"description": "Moosync is a customizable desktop music player with a clean interface",
@@ -17,131 +17,131 @@
1717
"postuninstall": "patch-package && electron-builder install-app-deps"
1818
},
1919
"dependencies": {
20-
"@babel/core": "^7.23.2",
21-
"@babel/eslint-parser": "^7.22.15",
20+
"@babel/core": "^7.23.7",
21+
"@babel/eslint-parser": "^7.23.3",
2222
"@babel/plugin-proposal-class-properties": "^7.18.6",
2323
"@babel/plugin-syntax-bigint": "^7.8.3",
24-
"@babel/plugin-transform-runtime": "^7.23.2",
25-
"@babel/preset-env": "^7.23.2",
26-
"@babel/preset-typescript": "^7.23.2",
27-
"@babel/types": "^7.23.0",
24+
"@babel/plugin-transform-runtime": "^7.23.7",
25+
"@babel/preset-env": "^7.23.8",
26+
"@babel/preset-typescript": "^7.23.3",
27+
"@babel/types": "^7.23.6",
2828
"@googleapis/oauth2": "^1.0.5",
29-
"@imengyu/vue3-context-menu": "^1.3.3",
30-
"@napi-rs/cli": "^2.16.3",
29+
"@imengyu/vue3-context-menu": "^1.3.6",
30+
"@napi-rs/cli": "^2.18.0",
3131
"@openid/appauth": "^1.3.1",
32-
"@types/adm-zip": "^0.5.3",
33-
"@types/better-sqlite3": "^7.6.6",
34-
"@types/electron-devtools-installer": "^2.2.4",
35-
"@types/ini": "^1.3.32",
36-
"@types/jest": "^29.5.6",
37-
"@types/js-yaml": "^4.0.8",
38-
"@types/markdown-it": "^13.0.5",
39-
"@types/node": "^20.8.7",
40-
"@types/tail": "^2.2.2",
41-
"@types/usetube": "^2.1.1",
42-
"@types/uuid": "^9.0.6",
43-
"@types/webpack-env": "^1.18.3",
44-
"@types/webrtc": "0.0.39",
45-
"@types/yt-player": "^3.5.3",
46-
"@typescript-eslint/eslint-plugin": "^6.9.0",
47-
"@typescript-eslint/parser": "^6.9.0",
32+
"@types/adm-zip": "^0.5.5",
33+
"@types/better-sqlite3": "^7.6.8",
34+
"@types/electron-devtools-installer": "^2.2.5",
35+
"@types/ini": "^4.1.0",
36+
"@types/jest": "^29.5.11",
37+
"@types/js-yaml": "^4.0.9",
38+
"@types/markdown-it": "^13.0.7",
39+
"@types/node": "^20.11.5",
40+
"@types/tail": "^2.2.3",
41+
"@types/usetube": "^2.1.2",
42+
"@types/uuid": "^9.0.7",
43+
"@types/webpack-env": "^1.18.4",
44+
"@types/webrtc": "0.0.42",
45+
"@types/yt-player": "^3.5.4",
46+
"@typescript-eslint/eslint-plugin": "^6.19.1",
47+
"@typescript-eslint/parser": "^6.19.1",
4848
"@voerro/vue-tagsinput": "^2.7.1",
4949
"@vue/cli-plugin-babel": "^5.0.8",
5050
"@vue/cli-plugin-typescript": "^5.0.8",
5151
"@vue/cli-service": "^5.0.8",
52-
"@vue/compat": "^3.3.6",
53-
"@vue/compiler-sfc": "^3.3.6",
52+
"@vue/compat": "^3.4.15",
53+
"@vue/compiler-sfc": "^3.4.15",
5454
"@vue/eslint-config-typescript": "^12.0.0",
5555
"adm-zip": "^0.5.10",
5656
"animate.css": "^4.1.1",
57-
"axios": "^1.5.1",
57+
"axios": "^1.6.5",
5858
"axios-rate-limit": "^1.3.0",
59-
"axios-retry": "^3.8.0",
59+
"axios-retry": "^4.0.0",
6060
"babel-loader": "^9.1.3",
61-
"better-sqlite3": "^9.0.0",
62-
"better-sqlite3-helper": "^3.1.6",
61+
"better-sqlite3": "^9.3.0",
62+
"better-sqlite3-helper": "^3.1.7",
6363
"bootstrap-vue": "^2.23.1",
6464
"buffer": "^6.0.3",
6565
"bufferutil": "4.0.8",
66-
"copy-webpack-plugin": "^11.0.0",
67-
"core-js": "^3.33.1",
68-
"croner": "^7.0.4",
66+
"copy-webpack-plugin": "^12.0.2",
67+
"core-js": "^3.35.1",
68+
"croner": "^8.0.0",
6969
"cross-env": "^7.0.3",
70-
"dashjs": "^4.7.2",
70+
"dashjs": "^4.7.3",
7171
"deepmerge": "^4.3.1",
72-
"dotenv": "^16.3.1",
73-
"electron": "27.0.2",
72+
"dotenv": "^16.4.0",
73+
"electron": "28.1.4",
7474
"electron-devtools-installer": "^3.2.0",
7575
"electron-store": "^8.1.0",
76-
"electron-updater": "^6.1.4",
77-
"eslint": "^8.52.0",
78-
"eslint-config-prettier": "^9.0.0",
79-
"eslint-plugin-prettier": "^5.0.1",
76+
"electron-updater": "^6.1.7",
77+
"eslint": "^8.56.0",
78+
"eslint-config-prettier": "^9.1.0",
79+
"eslint-plugin-prettier": "^5.1.3",
8080
"eslint-plugin-unused-imports": "^3.0.0",
81-
"eslint-plugin-vue": "^9.17.0",
81+
"eslint-plugin-vue": "^9.20.1",
8282
"events": "^3.3.0",
83-
"fast-xml-parser": "^4.3.2",
83+
"fast-xml-parser": "^4.3.3",
8484
"file-reader-reverse": "^1.0.2",
85-
"hash-wasm": "^4.10.0",
86-
"hls.js": "^1.4.12",
85+
"hash-wasm": "^4.11.0",
86+
"hls.js": "^1.5.1",
8787
"ini": "^4.1.1",
8888
"jest": "^29.7.0",
8989
"jest-environment-node": "^29.7.0",
9090
"js-yaml": "^4.1.0",
9191
"librespot-node": "git+https://github.com/Moosync/librespot-node.git",
9292
"localforage": "^1.10.0",
9393
"loglevel": "^1.8.1",
94-
"markdown-it": "^13.0.2",
94+
"markdown-it": "^14.0.0",
9595
"md5-wasm": "^2.0.0",
9696
"media-controller": "git+https://github.com/Moosync/MediaController.git",
97-
"music-metadata": "^8.1.4",
97+
"music-metadata": "^7.14.0",
9898
"node-stream-zip": "^1.15.0",
9999
"node-youtube-music": "^0.10.3",
100100
"patch-package": "^8.0.0",
101-
"prettier": "3.0.3",
101+
"prettier": "3.2.4",
102102
"qs": "^6.11.2",
103-
"reflect-metadata": "^0.1.13",
103+
"reflect-metadata": "^0.2.1",
104104
"replace": "^1.2.2",
105-
"sass": "~1.69.4",
106-
"sass-loader": "13.3.2",
105+
"sass": "~1.70.0",
106+
"sass-loader": "14.0.0",
107107
"scanner-native": "git+https://github.com/Moosync/file-scanner.git",
108108
"semver": "^7.5.4",
109-
"socket.io-client": "^4.7.2",
109+
"socket.io-client": "^4.7.4",
110110
"sponsorblock-api": "^0.2.4",
111111
"stream-browserify": "^3.0.0",
112112
"strip-ansi": "^7.1.0",
113113
"threads": "^1.7.0",
114114
"threads-plugin": "^1.4.0",
115115
"toad-scheduler": "^3.0.0",
116-
"ts-jest": "^29.1.1",
117-
"ts-loader": "^9.5.0",
118-
"ts-node": "^10.9.1",
116+
"ts-jest": "^29.1.2",
117+
"ts-loader": "^9.5.1",
118+
"ts-node": "^10.9.2",
119119
"tslib": "^2.6.2",
120-
"typescript": "5.2.2",
120+
"typescript": "5.3.3",
121121
"uuid": "^9.0.1",
122122
"vm2": "git+https://github.com/patriksimek/vm2.git",
123-
"vue": "^3.3.6",
124-
"vue-accessible-color-picker": "^4.1.4",
123+
"vue": "^3.4.15",
124+
"vue-accessible-color-picker": "^5.0.1",
125125
"vue-auto-routing": "^1.0.1",
126126
"vue-class-component": "^7.2.6",
127127
"vue-cli": "^2.9.6",
128128
"vue-cli-plugin-auto-routing": "~1.3.0",
129129
"vue-cli-plugin-electron-builder": "^3.0.0-alpha.4",
130130
"vue-facing-decorator": "^3.0.4",
131-
"vue-i18n": "9.5.0",
131+
"vue-i18n": "9.9.0",
132132
"vue-inline-svg": "^2.1.3",
133133
"vue-property-decorator": "^9.1.2",
134134
"vue-router": "~4.2.5",
135135
"vue-slider-component": "^4.0.0-beta.9",
136136
"vue-toasted": "^1.1.28",
137137
"vue-typeahead-bootstrap": "^2.12.0",
138138
"vue-virtual-scroller": "2.0.0-beta.8",
139-
"vue3-colorpicker": "^2.2.2",
140-
"vue3-toastify": "^0.1.14",
139+
"vue3-colorpicker": "^2.2.3",
140+
"vue3-toastify": "^0.2.1",
141141
"vuedraggable": "^2.24.3",
142142
"vuex": "~4.1.0",
143143
"vuex-class-component": "^2.3.6",
144-
"webpack-bundle-analyzer": "^4.9.1",
144+
"webpack-bundle-analyzer": "^4.10.1",
145145
"webpack-cli": "^5.1.4",
146146
"webpack5-externals-plugin": "^1.0.4",
147147
"yt-player": "^3.6.1",
@@ -150,7 +150,7 @@
150150
"ytsr": "^3.8.4"
151151
},
152152
"devDependencies": {
153-
"electron-builder": "^24.6.4",
153+
"electron-builder": "^24.9.1",
154154
"rome": "12.1.3"
155155
},
156156
"browserslist": [
@@ -159,13 +159,14 @@
159159
"not dead"
160160
],
161161
"resolutions": {
162-
"electron-builder": "24.6.4",
163-
"node-abi": "^3.51.0",
162+
"electron-builder": "24.9.1",
163+
"node-abi": "^3.52.0",
164164
"webpack": "^5.89.0",
165-
"better-sqlite3": "^9.0.0",
165+
"better-sqlite3": "^9.2.2",
166166
"nan": "^2.18.0",
167167
"@vue/cli-service": "^5.0.8",
168-
"@achrinza/node-ipc": "^10.1.9"
168+
"@achrinza/node-ipc": "^10.1.10",
169+
"@achrinza/event-pubsub": "^5.0.10"
169170
},
170171
"whiteListedModules": [
171172
"threads"

src/icons/CrossIcon.vue

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<template>
22
<svg viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg" @click="$emit('click', $event)">
3-
<path
4-
d="M7.25 0.75L0.75 7.25M0.75 0.75L7.25 7.25"
5-
:stroke="color"
6-
stroke-width="1.5"
7-
stroke-linecap="round"
8-
stroke-linejoin="round"
9-
/>
3+
<path d="M7.25 0.75L0.75 7.25M0.75 0.75L7.25 7.25" :stroke="color" stroke-width="1.5" stroke-linecap="round"
4+
stroke-linejoin="round" />
105
</svg>
116
</template>
127

@@ -22,3 +17,9 @@ export default class CrossIcon extends Vue {
2217
color!: string
2318
}
2419
</script>
20+
21+
22+
<style lang="sass" scoped>
23+
svg
24+
cursor: pointer
25+
</style>

src/mainWindow/App.vue

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ import { convertProxy } from '@/utils/ui/common'
7979
export default class App extends mixins(ThemeHandler, PlayerControls, KeyHandlerMixin, JukeboxMixin, ProviderMixin) {
8080
async created() {
8181
this.fetchProviderExtensions()
82-
this.registerNotifier()
8382
this.setLanguage()
8483
this.listenPreferenceChanges()
8584
this.listenExtensionEvents()
@@ -283,20 +282,6 @@ export default class App extends mixins(ThemeHandler, PlayerControls, KeyHandler
283282
vxm.playlist.playlists = playlists
284283
}
285284
286-
private registerNotifier() {
287-
window.NotifierUtils.registerMainProcessNotifier((obj) => {
288-
vxm.notifier.emit(obj)
289-
if (obj.id === 'started-scan' || obj.id === 'completed-scan') {
290-
if (obj.id === 'completed-scan') {
291-
vxm.themes.refreshPage = true
292-
}
293-
toast(obj.message, {
294-
type: obj.id === 'completed-scan' ? 'success' : 'default'
295-
})
296-
}
297-
})
298-
}
299-
300285
private getFileName(path: string) {
301286
const li = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'))
302287
const fileName = path.substring(li + 1)
@@ -429,9 +414,10 @@ export default class App extends mixins(ThemeHandler, PlayerControls, KeyHandler
429414
430415
if (data.type === 'show-toast') {
431416
const parsedData = data.data as { message: string; duration: number; type: ToastType }
417+
console.log(parsedData)
432418
toast(parsedData.message, {
433419
autoClose: Math.max(parsedData.duration, 5000),
434-
type: parsedData.type
420+
type: parsedData.type,
435421
})
436422
window.ExtensionUtils.replyToRequest({ ...data, data: true })
437423
}
@@ -446,7 +432,6 @@ export default class App extends mixins(ThemeHandler, PlayerControls, KeyHandler
446432
this.lastUpdateRequest[packageName] = undefined
447433
}
448434
449-
console.log('updating', packageName, 'in 500ms')
450435
const timeout = setTimeout(() => {
451436
this.lastUpdateRequest[packageName] = undefined
452437
vxm.providers.updateExtensionProvider(packageName)

0 commit comments

Comments
 (0)