Compare commits

...

3 Commits

Author SHA1 Message Date
Jill 05d84477e3 update deezer logo 2022-01-02 16:55:40 +03:00
Jill 75bb1caf97 fix dumb onclick stuff 2022-01-02 16:54:34 +03:00
Jill d640844c13 update deezer version 2022-01-02 16:51:32 +03:00
5 changed files with 24 additions and 28 deletions

View File

@ -18,7 +18,9 @@ searchLimit = 15
[deemix]
# the format of the song to download
# can be "FLAC", "MP3_320", "MP3_128" or "DEFAULT"
trackFormat = "FLAC"
# NOTE: if you set it to a format your account doesnt support, things will just.. silently break
# sorry
trackFormat = "MP3_128"
# templates for the folder and file names
trackNameTemplate = "%artist% - %title%"
albumTrackNameTemplate = "%tracknumber%. %artist% - %title%"
@ -36,4 +38,4 @@ localArtworkFormat = "jpg"
jpegImageQuality = 80
removeDuplicateArtists = true
removeDuplicateArtists = true

View File

@ -19,7 +19,7 @@
"author": "oatmealine",
"license": "AGPL-3.0",
"dependencies": {
"deemix": "git+https://git.freezer.life/RemixDev/deemix-js",
"deemix": "git+https://git.freezerapp.xyz/RemixDev/deemix-js",
"deezer-js": "^1.2.4",
"dotenv": "^10.0.0",
"express": "^4.17.1",

View File

@ -5,7 +5,7 @@ specifiers:
'@types/express-ws': ^3.0.1
'@types/ws': ^8.2.0
bufferutil: ^4.0.5
deemix: git+https://git.freezer.life/RemixDev/deemix-js
deemix: git+https://git.freezerapp.xyz/RemixDev/deemix-js
deezer-js: ^1.2.4
dotenv: ^10.0.0
express: ^4.17.1
@ -18,7 +18,7 @@ specifiers:
ws: ^8.2.3
dependencies:
deemix: git.freezer.life/RemixDev/deemix-js/b383190a3435d60459a63cd7567ba390d7150c8b
deemix: git.freezerapp.xyz/RemixDev/deemix-js/5c81a56d11d0e2dc4392bfcb0b0e67a88fe14ee2
deezer-js: 1.2.4
dotenv: 10.0.0
express: 4.17.1
@ -360,6 +360,13 @@ packages:
tough-cookie: 4.0.0
dev: false
/deezer-js/1.3.4:
resolution: {integrity: sha512-jPANN+mouVm7hzSjmtGRfi7I/pShBYTd/sZuiBQIYtLYp/5XR1HFdvzrxmx63fqlYhmJEKLR3/izIyotEIUfqg==}
dependencies:
got: 11.8.2
tough-cookie: 4.0.0
dev: false
/defer-to-connect/2.0.1:
resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
engines: {node: '>=10'}
@ -497,6 +504,7 @@ packages:
/formidable/1.2.2:
resolution: {integrity: sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==}
deprecated: 'Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau'
dev: false
/forwarded/0.2.0:
@ -1167,14 +1175,14 @@ packages:
resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
dev: false
git.freezer.life/RemixDev/deemix-js/b383190a3435d60459a63cd7567ba390d7150c8b:
resolution: {commit: b383190a3435d60459a63cd7567ba390d7150c8b, repo: https://git.freezer.life/RemixDev/deemix-js, type: git}
git.freezerapp.xyz/RemixDev/deemix-js/5c81a56d11d0e2dc4392bfcb0b0e67a88fe14ee2:
resolution: {commit: 5c81a56d11d0e2dc4392bfcb0b0e67a88fe14ee2, repo: https://git.freezerapp.xyz/RemixDev/deemix-js, type: git}
name: deemix
version: 3.5.5
version: 3.6.4
dependencies:
async: 3.2.1
crypto: 1.0.1
deezer-js: 1.2.4
deezer-js: 1.3.4
got: 11.8.2
metaflac-js2: 1.0.8
spotify-web-api-node: 5.0.2

View File

@ -24,7 +24,7 @@
<body>
<div id="header">
<div id="header-left">
<a href="https://deemix.app" target="_blank" class="big link"><img id="deemix" width="26" height="auto" src="https://deemix.app/assets/img/logo.85a922b8.png"> deemix</a>
<a href="https://deemix.app" target="_blank" class="big link"><img id="deemix" width="26" height="auto" src="https://deemix.app/img/logo.png"> deemix</a>
<a href="https://git.oat.zone/oat/deemix-web-frontend" target="_blank" class="big link"><img id="git" width="26" height="auto" src="https://git-scm.com/images/logos/downloads/Git-Icon-White.png"> git</a>
</div>
@ -42,4 +42,4 @@
<div id="albums"></div>
</span>
</body>
</html>
</html>

View File

@ -210,7 +210,7 @@ window.onload = () => {
<br>
<span class="small">by ${d.artist.name}</span>
</span>
<img class="album-download" width="48" height="48" src="assets/download.svg">
<img class="album-download" onclick="clearError(); startDownload(${d.id}, true)" width="48" height="48" src="assets/download.svg">
</div>
<div class="album-image-wrapper">
<img class="album-image" width="128" height="128" src="https://e-cdns-images.dzcdn.net/images/cover/${d.cover}/128x128-000000-80-0-0.jpg">
@ -224,13 +224,6 @@ window.onload = () => {
if (d.data.length === 0) return document.getElementById('albums').innerHTML = '<span class="small">Not found!</span>';
for (c of document.getElementById('albums').children) {
if (c.children[0] && c.children[0].children[1]) {
let id = c.id.split('-')[1];
c.children[0].children[1].onclick = () => {
clearError();
startDownload(id, true);
}
}
let id = c.id.split('-')[1];
if (document.getElementById('album-bottom-' + id)) {
document.getElementById('album-bottom-' + id).innerHTML = '<div class="lds-ring"><div></div><div></div><div></div><div></div></div>';
@ -248,7 +241,7 @@ window.onload = () => {
<div class="track" id="track-${d.id}">
<span>${d.artist} - ${d.title}</span>
<span>
<span class="track-download-wrapper">
<span class="track-download-wrapper" onclick="clearError(); startDownload(${d.id}, false)">
<img class="album-download" width="32" height="32" src="assets/download.svg">
</span>
${formatTime(d.duration)}
@ -256,16 +249,9 @@ window.onload = () => {
</div>
`
).join('');
for (track of document.getElementById('album-bottom-' + id).children) {
let trackId = track.id.split('-')[1];
track.children[1].children[0].onclick = () => {
clearError();
startDownload(trackId, false);
}
}
}
}
}
search.addEventListener('change', change);
};
};