Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release v0.1.52 #90

Merged
merged 6 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 45 additions & 40 deletions app/static/js/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ function setLoading(loading, fallback) {
*/
function playPauser(audioEl) {
const __play = () => {
audioEl.muted = null;
audioEl.play();
const songEl = document.getElementById(
"song-" + playerState.playlist.songs[playerState.currentSongIdx].yt_id,
Expand Down Expand Up @@ -217,10 +218,8 @@ function playPauser(audioEl) {
*/
function stopper(audioEl) {
return () => {
if (!audioEl.paused) {
audioEl.pause();
audioEl.currentTime = 0;
}
audioEl.pause();
audioEl.currentTime = 0;
const songEl = document.getElementById(
"song-" + playerState.playlist.songs[playerState.currentSongIdx].yt_id,
);
Expand Down Expand Up @@ -265,7 +264,7 @@ function shuffler(state) {
state.playlist.songs.push(...extraSongs);
__shuffleArray(state.playlist.songs);
let sIdx = 0;
if (!!audioPlayerEl.src) {
if (!!audioPlayerEl.childNodes.length) {
sIdx = state.playlist.songs.findIndex((s) => s.yt_id === songYtId);
if (sIdx !== -1) {
[state.playlist.songs[sIdx], state.playlist.songs[0]] = [
Expand All @@ -280,11 +279,9 @@ function shuffler(state) {
const __toggleShuffle = () => {
state.shuffled = !state.shuffled;
if (state.shuffled) {
const src = audioPlayerEl.childNodes.item(0);
shuffle(
audioPlayerEl.src.substring(
audioPlayerEl.src.lastIndexOf("/") + 1,
audioPlayerEl.src.length - 4,
),
src.src.substring(src.src.lastIndexOf("/") + 1, src.src.length - 4),
);
} else {
const tmp = state.playlist.songs.sort((si, sj) => si.order - sj.order);
Expand All @@ -298,14 +295,12 @@ function shuffler(state) {
if (tmp[tmp.length - 1].yt_id !== tmp[tmp.length - 2]) {
state.playlist.songs.push(tmp[tmp.length - 1]);
}
if (!!audioPlayerEl.src) {
if (!!src) {
console.log("src", src.src);
state.currentSongIdx = state.playlist.songs.findIndex(
(s) =>
s.yt_id ===
audioPlayerEl.src.substring(
audioPlayerEl.src.lastIndexOf("/") + 1,
audioPlayerEl.src.length - 4,
),
src.src.substring(src.src.lastIndexOf("/") + 1, src.src.length - 4),
);
}
}
Expand Down Expand Up @@ -625,9 +620,18 @@ async function playSong(song) {
audioPlayerEl.removeChild(audioPlayerEl.childNodes.item(0));
}
const src = document.createElement("source");
src.src = `${location.protocol}//${location.host}/muzikkx/${song.yt_id}.mp3`;
src.setAttribute("type", "audio/mpeg");
src.setAttribute(
"src",
`${location.protocol}//${location.host}/muzikkx/${song.yt_id}.mp3`,
);
audioPlayerEl.appendChild(src);

if (isSafari()) {
setTimeout(80);
}
audioPlayerEl.load();

// song's details setting, yada yada
{
if (song.title) {
Expand Down Expand Up @@ -668,12 +672,6 @@ async function playSong(song) {
songImageExpandedEl.innerHTML = "";
}
}
{
setTimeout(75);
audioPlayerEl.load();
setTimeout(75);
audioPlayerEl.load();
}
setMediaSessionMetadata(song);
playMuzikk();
await updateSongPlays();
Expand Down Expand Up @@ -912,6 +910,10 @@ function setMediaSessionMetadata(song) {
});
}

function isSafari() {
return navigator.userAgent.toLowerCase().includes("safari");
}

const [toggleLoop, handleLoop, checkLoop] = looper();
const [playMuzikk, pauseMuzikk, togglePP] = playPauser(audioPlayerEl);
const stopMuzikk = stopper(audioPlayerEl);
Expand Down Expand Up @@ -972,6 +974,24 @@ loopExpandEl?.addEventListener("click", toggleLoop);
}
})();

function setDuration(duration) {
if (Number.isNaN(duration) || !Number.isFinite(duration)) {
duration = 0;
}
songSeekBarEl.max = Math.ceil(duration);
songSeekBarEl.value = 0;
if (!!songSeekBarExpandedEl) {
songSeekBarExpandedEl.max = Math.ceil(duration);
songSeekBarExpandedEl.value = 0;
}
if (!!songDurationEl) {
songDurationEl.innerHTML = Utils.formatTime(duration);
}
if (!!songDurationExpandedEl) {
songDurationExpandedEl.innerHTML = Utils.formatTime(duration);
}
}

audioPlayerEl.addEventListener("loadeddata", (event) => {
if (!!playPauseToggleEl) playPauseToggleEl.disabled = null;
if (!!playPauseToggleExapndedEl) playPauseToggleExapndedEl.disabled = null;
Expand All @@ -984,31 +1004,16 @@ audioPlayerEl.addEventListener("loadeddata", (event) => {
if (!!loopEl) loopEl.disabled = null;
if (!!loopExpandEl) loopExpandEl.disabled = null;

// set duration AAA
{
let duration = event.target.duration;
if (isNaN(duration)) {
duration = 0;
}
songSeekBarEl.max = Math.ceil(duration);
songSeekBarEl.value = 0;
if (!!songSeekBarExpandedEl) {
songSeekBarExpandedEl.max = Math.ceil(duration);
songSeekBarExpandedEl.value = 0;
}
if (!!songDurationEl) {
songDurationEl.innerHTML = Utils.formatTime(duration);
}
if (!!songDurationExpandedEl) {
songDurationExpandedEl.innerHTML = Utils.formatTime(duration);
}
}
setDuration(event.target.duration);

setLoading(false, Player.icons.pause);
});

audioPlayerEl.addEventListener("timeupdate", (event) => {
const currentTime = Math.floor(event.target.currentTime);
if (isSafari()) {
setDuration(currentTime);
}
if (songCurrentTimeEl) {
songCurrentTimeEl.innerHTML = Utils.formatTime(currentTime);
}
Expand Down
1 change: 1 addition & 0 deletions app/views/components/player/player.templ
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ templ PlayerSticky() {
id="audio-player"
controls
preload="none"
muted
></audio>
///
<style>
Expand Down
23 changes: 23 additions & 0 deletions nginx/dankmuzikk.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
server {
listen 80;
listen [::]:80;
server_name dankmuzikk.com;

location ~ ^/(.*)$ {
set $upstream http://127.0.0.1:20251;
proxy_read_timeout 180;
proxy_connect_timeout 180;
proxy_send_timeout 180;
# required headers for safari :)
proxy_set_header Connection "keep-alive";
proxy_set_header Range "bytes=0-";
proxy_set_header Icy-Metadata "0";
proxy_pass_request_headers on;
proxy_pass $upstream/$1$is_args$args;
}

location / {
proxy_pass http://127.0.0.1:20251;
}
}