* test

* fix multiroom

* attempt for fix rare cast bug

* changes for local files: read below

* added pouchdb-node
* moved all logic for local files to src/main/providers/local
* added new local library section on sidebar

* removed dupe

* added caching headers

* fix

* add path menu to settings-window

* fix mxm for local

* some test

* some fix

* clear this

* clear log

* add playlist folder class

* sometest

* fix

* Auto focus search bar

* use object instead of array for albums (#1219)

* feat: 🌐 Update French language (#1218)

* add pagination for library songs

* Add 'go to' page

* Make playlist search icon use hero color

* Merge pull request #1 from vapormusic/patch-1

dont populate out-of-display doms

* both infinite and paging

* Add color to search button background

* Add shadow to follow button

* im dumb sorry

* Add brightness effect of search button

* add some delay to scroll v-observe-visibility

* some multiroom fixes

* somefixes

* [Audio] Fix VBass & Added COCS

* [Audio] COCS revision

* some fix

* fix m1 mac

* fix m1 build

* some fix regarding audiocontext

* [Audio] Fix #1207 (discussions)

Eliminates audio stuttering even when AudioContext is enabled. Make lyrics account for the extra latency introduced by Audio Lab.

* idk what I did

* apparently this no worki

* should default to 0

* expose bitrate of localfiles

* [Audio] Added CAP & Normalization behavior for local files

* smh musickit

* Expose more local files metadata + fix norm error

* pokemon gotta catch them all

* maikiwi is a clown confirmed

* pokemon gotta catch them all v2

* pokemon gotta catch them all v5

* Update zh_TW.json (#1229)

Fix errors, update zh-TW translation.

* Change No Lyrics Message in Full Screen Player (#1210)

* Modify term.noLyrics text in 5 files

* Minor change in 3 files

* Colorize sponsor buttons in about page

Co-authored-by: ctaetcsh  <48845980+ctaetcsh@users.noreply.github.com>

* max size of more info panel dynamic

* Add twitter social button for some developers in about page (#1232)

* Big Chungus Window settings (#1230)

* Initial Changes

* I suposse this is the last

* cryptofyre

* Documentation

* Revert "Big Chungus Window settings (#1230)" (#1233)

This reverts commit e133b2c38b.

* test

* Just changed it and gonna leave for debugging

* reimp e133b2c, adjustments for macOS

* resolve #1

* copied files

* readded strings to en_US

* adjustments to settings sidebar collapse

* add multiplex

* Update version.sh

* Update style.css

* dont break pls thx

* swag

* I forgot that (#1239)

* Update zh_TW.json (#1236)

Update TW language.

* Update zh_CN.json (#1240)

* because I can

* Fix cider team buttons in about page

* Update style.less

* Float right looks better

* support custom port via optional CIDER_PORT var

* Scan Local Files now 46 times faster

* Update .gitignore

* cleanups

* remove console time (1s/1600 tracks)

* fix m1

* sometest

* Update build-macos.yml

* Fix absolutely unacceptable punctuation error (#1249)

* ok

* pray

* revert mxm back to local

* Update zh_CN.json (#1242)

* Update de_DE.json (#1246)

* Musixmatch fix (thx plank ily)

* whoops

* yes

* whoops v2

* bump to e18.3.5

* don't give the lyric api id if local files

* Update afterPack.js

* ukie

* Update afterPack.js

* Update afterPack.js

* how the fuck did this not throw an error

* fix stupid svg smh

* new mediaitem scaling method

* added Maximum Element Scale

* mediaitem square artwork res now adapts to window size

* will not affect high dpi

* fix now playing artwork

* fix album genre names

before: gets genre from 1st track
now: gets genre from album data

* clamped element scale to 1.5x

* added caching for auth

* adjustment to artist page

* changed to v-show for list item vis

* Bring back mxm lyrics (Fully tested)

* fix mmx translation

* fix settings view

* remove useless args & nonexistent funcs

* fix div hell

* fixed missing end tag for local playlist

* fix divs

* Fix cider list

* the amount of brain cells that I have lost because of mxm trans

* WIP language filter

* it was fun while it lasted, goodbye MXM languages

* MXM changes

* 4am code moments

* move logic

* fix lyrics translation & allow other lang

* default store.ts mxm trans to be disabled

* this is why you dont code at 4am

* and this is why you should test your code before pushing

* added Romanized langs to mxm trans

* love how previous MXM changes are in vain till now

* stop. uploading. this.

* NEVER. CODE. AT. FOUR. AYE. EM. AGAIN.

* test

* Revert "test"

This reverts commit 256d06bbcc.

* did a funny

* did another funny

* yes

* add prime symbol to apostrophe

* Don't do anything if res != 200

* Recursive Folder Search in Cider Utils

* 4am code moment

* fix function (force recompile utils)

* did a funny there

* I need sleep

* Update zh_CN.json (#1265)

This is a big work

* Update zh_TW.json (#1260)

Update TW language.

* performant logging is enabled by default

* test getting rid of lyriccurrenttime

* set timeout can go away now

* boops forgot this

* mxm moms

* mxm moms

* Revert "mxm moms"

This reverts commit 51fc09280e.

* README download link fix

* Update vueapp.js

* Fix settings menu (#1271)

* remove unused pages

* profile page (for search for now)

* lol

* updated recordLabel with i18n and root usage

* Local Lossless Icon and more

- add Cider-profile boilerplate
- add local lossless icon
-add hover for PPE and lossless

Co-authored-by: Core <coredev-uk@users.noreply.github.com>

* no coding at 4am

* fix units for local lossless badge

* fix units for local lossless badge

* remove CAP icon for local files, cuz unsupported

* mpris overhaul

* Fix seeking in mpris

* changed am section on sidebar to v-show allowing css manipulation

* added class for css

* new effect when entering fullscreen lyrics

* fixes text wrapping on tab text

* added is-album

* linux is cooollll

* Lyrics API migration

* Update musickit to use api mirror by default

* add div for app-playback-buttons

* Add spatialization icon (#1276)

* Add spatialization icon

* that never happened

* add checkmode func to webremote

* whoops sorry

* Updated config.yml

* mogus

* fix string matching

* may Maikiwi bless your CI

* MKV3 red

* Go touch grass;

* this was so unreadable lmao

* add logic for showing spatialization icon

* add space in lossless icon

* Remove dead fallback token, add error log if capi call fails (#1289)

I tested and the fallback key you are using is dead. 401s. Unusable.

* Fix #1282

* Fix #1237

* fix default CAP

* someone played with translation code

* lmao yaz why

* stop polluting my logs you lil POST

* I18n (#1293)

* Update es_ES

* I18N

* idk this only breaking now

* added framework for c2 parity

* fixes

* Fix volume bar on miniplayer (#1297)

* Update stale-issues.yml

* removed loading bar, testing without hlscider

* overwrite restriction

* allow listennow "more like" nav to work

* garbage gone

* fix for primary-content linking

* Update README.md

Add QQ group info

* Revert back to music metadata

* gimp v2

* remove local files as experiment

* just to be safe

* world is now a better place

* meltdown avoided

* meltdown avoided

* Revert "meltdown avoided"

This reverts commit 38e6f1b7fa.

* Revert "meltdown avoided"

This reverts commit 54cc6656d6.

* Revert "world is now a better place"

This reverts commit c019bf9c63.

* remove quasar

* add some shiz (#1313)

* Update ru_RU.json

keeping russian lang actual

* ok

* Add gradient to lyric-footer

* *Commit en español Ñ (#1304)

* i hate my life (#1307)

* world is now a better place

* meltdown avoided

* meltdown avoided

* stylize new listen now childs

* full scale artwork, finally

* dynamic width for search categories

* hd all album work

* Update afterPack.js

* force hq quality

* oops

* attempt to fix

* misc cleanup

* why what

* what was i thinking

* fix duplicated text in listen now childs

* Paginate/infinite scroll for  albums, playlists (#1234)

* Infinite scroll, pagination to album, playlists

* move pagination below tracks

* Make page size configurable

* remove renderer

* Mitigate songs / album slow app issue.

* add ratings, library change to web remote (#1285)

* Add compact artist header option (#1308)

* Support compact artist header (optional)

* Add required term

Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: Maikiwi <stella@mai.kiwi>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>

* obama (#1314)

* Update ru_RU.json

keeping russian lang actual

* ok

* Add gradient to lyric-footer

* *Commit en español Ñ (#1304)

* i hate my life (#1307)

* world is now a better place

* meltdown avoided

* meltdown avoided

* stylize new listen now childs

* full scale artwork, finally

* dynamic width for search categories

* hd all album work

* Update afterPack.js

* force hq quality

* oops

* attempt to fix

* misc cleanup

* why what

* what was i thinking

* fix duplicated text in listen now childs

* Paginate/infinite scroll for  albums, playlists (#1234)

* Infinite scroll, pagination to album, playlists

* move pagination below tracks

* Make page size configurable

* remove renderer

* Mitigate songs / album slow app issue.

* add ratings, library change to web remote (#1285)

* Add compact artist header option (#1308)

* Support compact artist header (optional)

* Add required term

* improve pagination styling

Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: Maikiwi <stella@mai.kiwi>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>
Co-authored-by: yazninja <71800112+yazninja@users.noreply.github.com>

* obama episode 2. (#1317)

* Update ru_RU.json

keeping russian lang actual

* ok

* Add gradient to lyric-footer

* *Commit en español Ñ (#1304)

* i hate my life (#1307)

* world is now a better place

* meltdown avoided

* meltdown avoided

* stylize new listen now childs

* full scale artwork, finally

* dynamic width for search categories

* hd all album work

* Update afterPack.js

* force hq quality

* oops

* attempt to fix

* misc cleanup

* why what

* what was i thinking

* fix duplicated text in listen now childs

* Paginate/infinite scroll for  albums, playlists (#1234)

* Infinite scroll, pagination to album, playlists

* move pagination below tracks

* Make page size configurable

* remove renderer

* Mitigate songs / album slow app issue.

* add ratings, library change to web remote (#1285)

* Add compact artist header option (#1308)

* Support compact artist header (optional)

* Add required term

* improve pagination styling

* Disable Fullscreen view when artist/album name is clicked. (#1315)

* Disable Fullscreen view when artist/album name is clicked.

idk why this change didn't exist

* Seperate dash from album name

* Replace `$root.showSearch()` with `app.appRoute('search')`

`$root.showSearch()` prevents going back to previous page from sidebar.

* Fix Anim (#1316)

Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: Maikiwi <stella@mai.kiwi>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>
Co-authored-by: Monochromish <79590499+Monochromish@users.noreply.github.com>

* re add that i guess. github is fucked.

* aa (#1320)

* Update ru_RU.json

keeping russian lang actual

* ok

* Add gradient to lyric-footer

* *Commit en español Ñ (#1304)

* i hate my life (#1307)

* world is now a better place

* meltdown avoided

* meltdown avoided

* stylize new listen now childs

* full scale artwork, finally

* dynamic width for search categories

* hd all album work

* Update afterPack.js

* force hq quality

* oops

* attempt to fix

* misc cleanup

* why what

* what was i thinking

* fix duplicated text in listen now childs

* Paginate/infinite scroll for  albums, playlists (#1234)

* Infinite scroll, pagination to album, playlists

* move pagination below tracks

* Make page size configurable

* remove renderer

* Mitigate songs / album slow app issue.

* add ratings, library change to web remote (#1285)

* Add compact artist header option (#1308)

* Support compact artist header (optional)

* Add required term

* improve pagination styling

* Disable Fullscreen view when artist/album name is clicked. (#1315)

* Disable Fullscreen view when artist/album name is clicked.

idk why this change didn't exist

* Seperate dash from album name

* Replace `$root.showSearch()` with `app.appRoute('search')`

`$root.showSearch()` prevents going back to previous page from sidebar.

* Fix Anim (#1316)

* make tracks tab active (#1318)

* welp that wasn't it.

* Thnks (#1319)

* Thnks

* i need sleep

Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: Maikiwi <stella@mai.kiwi>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>
Co-authored-by: Monochromish <79590499+Monochromish@users.noreply.github.com>

Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: yazninja <yazlesean@gmail.com>
Co-authored-by: Pedro Galhardo <pedromgalhardo@tecnico.ulisboa.pt>
Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Co-authored-by: Erwan <24718500+ErwanGit@users.noreply.github.com>
Co-authored-by: Monochromish <chillygamer7@gmail.com>
Co-authored-by: maikirakiwi <stella@mai.kiwi>
Co-authored-by: yazninja <71800112+yazninja@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>
Co-authored-by: Nathan Ritchie <48845980+ctaetcsh@users.noreply.github.com>
Co-authored-by: Monochromish <79590499+Monochromish@users.noreply.github.com>
Co-authored-by: Gabriel Davila <56521591+mefsaal@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: 椎名アヤネ <53814845+sakura0224@users.noreply.github.com>
Co-authored-by: Jonathan Fenske <929220+jfenske89@users.noreply.github.com>
Co-authored-by: UnbreakCode <unbreakcode@gmail.com>
Co-authored-by: SoNothing <git@sonothing.com>
Co-authored-by: Core <coredev-uk@users.noreply.github.com>
Co-authored-by: Amaru8 <52407090+Amaru8@users.noreply.github.com>
Co-authored-by: rlaphoenix <pragma.exe@gmail.com>
Co-authored-by: h0ckerman <35598335+h0ckerman@users.noreply.github.com>
Co-authored-by: Pedro Galhardo <pgalhardo@icloud.com>
This commit is contained in:
cryptofyre 2022-07-27 01:05:51 -05:00 committed by GitHub
parent 57b2a86913
commit c03f408ba5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
157 changed files with 33489 additions and 10407 deletions

View file

@ -6,7 +6,10 @@ export default class mpris {
* Private variables for interaction in plugins
*/
private static utils: any;
/**
* MPRIS Service
*/
private static player: Player.Player;
/**
* Base Plugin Details (Eventually implemented into a GUI in settings)
*/
@ -15,30 +18,17 @@ export default class mpris {
public version: string = '1.0.0';
public author: string = 'Core';
/**
* MPRIS Service
*/
private static player: Player.Player;
private static mprisEvents: Object = {
"playpause": "playPause",
"play": "play",
"pause": "pause",
"next": "next",
"previous": "previous",
}
/*******************************************************************************************
* Private Methods
* ****************************************************************************************/
/**
* Runs a media event
* @param type - pausePlay, next, previous
* @private
* Runs on plugin load (Currently run on application start)
*/
private static runMediaEvent(type: string) {
console.debug(`[Plugin][${this.name}] ${type}.`);
mpris.utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.${type}()`).catch(console.error)
constructor(utils: any) {
mpris.utils = utils
console.debug(`[Plugin][${mpris.name}] Loading Complete.`);
}
/**
@ -54,7 +44,6 @@ export default class mpris {
}
}
/**
* Connects to MPRIS Service
*/
@ -63,29 +52,49 @@ export default class mpris {
const player = Player({
name: 'cider',
identity: 'Cider',
supportedUriSchemes: [],
supportedMimeTypes: [],
supportedInterfaces: ['player']
});
console.debug(`[Plugin][${mpris.name}] Successfully connected.`);
console.debug(`[${mpris.name}:connect] Successfully connected.`);
const pos_atr = {durationInMillis: 0};
player.getPosition = function () {
const durationInMicro = pos_atr.durationInMillis * 1000;
const percentage = parseFloat("0") || 0;
return durationInMicro * percentage;
const renderer = mpris.utils.getWindow().webContents
const loopType: { [key: string]: number; } = {
'none': 0,
'track': 1,
'playlist': 2,
}
for (const [key, value] of Object.entries(mpris.mprisEvents)) {
player.on(key, function () {
mpris.runMediaEvent(value)
});
}
player.on('next', () => mpris.utils.playback.next())
player.on('previous', () => mpris.utils.playback.previous())
player.on('playpause', () => mpris.utils.playback.playPause())
player.on('play', () => mpris.utils.playback.play())
player.on('pause', () => mpris.utils.playback.pause())
player.on('quit', () => mpris.utils.getApp().exit())
player.on('position', (args: { position: any; }) => mpris.utils.playback.seek(args.position / 1000 / 1000))
player.on('loopStatus', (status: string) => renderer.executeJavaScript(`app.mk.repeatMode = ${loopType[status.toLowerCase()]}`))
player.on('shuffle', () => renderer.executeJavaScript('app.mk.shuffleMode = (app.mk.shuffleMode === 0) ? 1 : 0'))
player.on('quit', function () {
process.exit();
});
mpris.utils.getIPCMain().on('mpris:playbackTimeDidChange', (event: any, time: number) => {
player.getPosition = () => time;
})
mpris.utils.getIPCMain().on('repeatModeDidChange', (_e: any, mode: number) => {
switch (mode) {
case 0:
player.loopStatus = Player.LOOP_STATUS_NONE;
break;
case 1:
player.loopStatus = Player.LOOP_STATUS_TRACK;
break;
case 2:
player.loopStatus = Player.LOOP_STATUS_PLAYLIST;
break;
}
})
mpris.utils.getIPCMain().on('shuffleModeDidChange', (_e: any, mode: number) => {
player.shuffle = mode === 1
})
mpris.player = player;
}
@ -93,9 +102,9 @@ export default class mpris {
/**
* Update M.P.R.I.S Player Attributes
*/
private static updatePlayer(attributes: any) {
private static updateMetaData(attributes: any) {
const MetaData = {
mpris.player.metadata = {
'mpris:trackid': mpris.player.objectPath(`track/${attributes.playParams.id.replace(/[.]+/g, "")}`),
'mpris:length': attributes.durationInMillis * 1000, // In microseconds
'mpris:artUrl': (attributes.artwork.url.replace('/{w}x{h}bb', '/512x512bb')).replace('/2000x2000bb', '/35x35bb'),
@ -103,33 +112,12 @@ export default class mpris {
'xesam:album': `${attributes.albumName}`,
'xesam:artist': [`${attributes.artistName}`],
'xesam:genre': attributes.genreNames
}
if (mpris.player.metadata["mpris:trackid"] === MetaData["mpris:trackid"]) {
return
}
mpris.player.metadata = MetaData;
};
}
/**
* Update M.P.R.I.S Player State
* @private
* @param attributes
*/
private static updatePlayerState(attributes: any) {
switch (attributes.status) {
case true: // Playing
mpris.player.playbackStatus = Player.PLAYBACK_STATUS_PLAYING;
break;
case false: // Paused
mpris.player.playbackStatus = Player.PLAYBACK_STATUS_PAUSED;
break;
default:
mpris.player.playbackStatus = Player.PLAYBACK_STATUS_STOPPED;
break
}
}
/*******************************************************************************************
* Public Methods
* ****************************************************************************************/
/**
* Clear state
@ -143,26 +131,12 @@ export default class mpris {
mpris.player.playbackStatus = Player.PLAYBACK_STATUS_STOPPED;
}
/*******************************************************************************************
* Public Methods
* ****************************************************************************************/
/**
* Runs on plugin load (Currently run on application start)
*/
constructor(utils: any) {
mpris.utils = utils
console.debug(`[Plugin][${mpris.name}] Loading Complete.`);
}
/**
* Runs on app ready
*/
@mpris.linuxOnly
onReady(_: any): void {
console.debug(`[Plugin][${mpris.name}] Ready.`);
console.debug(`[${mpris.name}:onReady] Ready.`);
}
/**
@ -187,9 +161,8 @@ export default class mpris {
* @param attributes Music Attributes (attributes.status = current state)
*/
@mpris.linuxOnly
onPlaybackStateDidChange(attributes: object): void {
console.debug(`[Plugin][${mpris.name}] onPlaybackStateDidChange.`);
mpris.updatePlayerState(attributes)
onPlaybackStateDidChange(attributes: any): void {
mpris.player.playbackStatus = attributes?.status ? Player.PLAYBACK_STATUS_PLAYING : Player.PLAYBACK_STATUS_PAUSED
}
/**
@ -198,8 +171,7 @@ export default class mpris {
*/
@mpris.linuxOnly
onNowPlayingItemDidChange(attributes: object): void {
console.debug(`[Plugin][${mpris.name}] onMetadataDidChange.`);
mpris.updatePlayer(attributes);
mpris.updateMetaData(attributes);
}
}