okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Core 2022-02-01 04:40:14 +00:00
commit 4590e90037
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
6 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -315,3 +315,4 @@ src/renderer/workbox-962786f2.js.map
*.p12 *.p12
keys.sh keys.sh
.yarnrc.yml

7
package.json
View file

@ -13,13 +13,14 @@
}, },
"homepage": "https://cider.sh/", "homepage": "https://cider.sh/",
"buildResources": "resources", "buildResources": "resources",
"packageManager": "yarn@3.1.1",
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"watch": "tsc --watch", "watch": "tsc --watch",
"start": "run-script-os", "start": "run-script-os",
"start:win32": "npm run build && set ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:win32": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:linux": "npm run build && export ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:linux": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:darwin": "npm run build && export ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:darwin": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"pack": "electron-builder --dir", "pack": "electron-builder --dir",
"dist": "npm run build && electron-builder", "dist": "npm run build && electron-builder",
"dist:all": "npm run build && electron-builder -mwl", "dist:all": "npm run build && electron-builder -mwl",

1
src/i18n/README.md
View file

@ -16,5 +16,4 @@ Several changes have been made to configuration options and will be listed below
been modified, the ones not mentioned in the list need modifying. been modified, the ones not mentioned in the list need modifying.
* `settings.option.experimental.closeButtonBehaviour`: Changed to `close_button_hide` - Should be "Close Button Should Hide the Application". `.quit`, `.minimizeTaskbar` and `.minimizeTray` have been removed. Translations done for en_US. * `settings.option.experimental.closeButtonBehaviour`: Changed to `close_button_hide` - Should be "Close Button Should Hide the Application". `.quit`, `.minimizeTaskbar` and `.minimizeTray` have been removed. Translations done for en_US.
* `term.loadingPlaylist`: Added for `en_US` and `en_PISS`.
* `action.update`: Added for `en_US`. * `action.update`: Added for `en_US`.

1
src/i18n/en_PISS.jsonc
View file

@ -124,7 +124,6 @@
"term.videos": "piss videos 😳", "term.videos": "piss videos 😳",
"term.menu": "piss menu", "term.menu": "piss menu",
"term.check": "piss!", "term.check": "piss!",
"term.loadingPlaylist": "pissing all over your songs hold on just a second im almost done...",
// Home // Home
"home.title": "piss central", "home.title": "piss central",

1
src/i18n/en_US.jsonc
View file

@ -124,7 +124,6 @@
"term.videos": "Videos", "term.videos": "Videos",
"term.menu": "Menu", "term.menu": "Menu",
"term.check": "Check", "term.check": "Check",
"term.loadingPlaylist": "Loading playlist...", // Text shown at the bottom of a playlist's body while loading song pages
// Home // Home
"home.title": "Home", "home.title": "Home",

7
src/renderer/views/pages/cider-playlist.ejs
View file

@ -6,7 +6,7 @@
<div class="spinner"></div> <div class="spinner"></div>
</div> </div>
</template> </template>
<template> <template v-if="app.playlists.loadingState == 1">
<div class="playlist-display" <div class="playlist-display"
:style="{ :style="{
'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '', '--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '',
@ -133,10 +133,6 @@
v-for="(item,index) in data.relationships.tracks.data"></mediaitem-list-item> v-for="(item,index) in data.relationships.tracks.data"></mediaitem-list-item>
</draggable> </draggable>
<div class="mt-3" v-if="app.playlists.loadingState != 1">
<div class="spinner" style="width: 25px; height: 25px;"></div>
<span>{{$root.getLz("term.loadingPlaylist")}}</span>
</div>
</div> </div>
</div> </div>
@ -481,7 +477,6 @@
const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item)); let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
console.log(query);
app.mk.stop().then(function () { app.mk.stop().then(function () {
app.mk.setQueue({[truekind]: [id]}).then(function () { app.mk.setQueue({[truekind]: [id]}).then(function () {
app.mk.play().then(function () { app.mk.play().then(function () {