From a640b9010d0c412c945a042897f24359ca9135d4 Mon Sep 17 00:00:00 2001 From: jcorporation Date: Fri, 24 Aug 2018 11:11:27 +0100 Subject: [PATCH] Feat: handling of update database events --- dist/htdocs/css/mympd.min.css | 2 +- dist/htdocs/index.html | 2 +- dist/htdocs/js/mympd.min.js | 42 +++++++++++++++--------------- htdocs/css/mympd.css | 11 ++++++++ htdocs/index.html | 48 +++++++++++++++++++++-------------- htdocs/js/mympd.js | 34 +++++++++++++++++++++++-- src/mpd_client.c | 40 +++++++++++++++++++++++------ src/mpd_client.h | 1 + src/mympd.c | 2 +- 9 files changed, 130 insertions(+), 52 deletions(-) diff --git a/dist/htdocs/css/mympd.min.css b/dist/htdocs/css/mympd.min.css index b16af33..0e7b9f3 100644 --- a/dist/htdocs/css/mympd.min.css +++ b/dist/htdocs/css/mympd.min.css @@ -1 +1 @@ -html{position:relative;min-height:100%}body{margin-bottom:60px;padding-top:50px;padding-bottom:50px;background-color:#888}main{padding-top:20px}footer{position:absolute;bottom:0}button{overflow:hidden}#BrowseBreadrumb{overflow:auto;white-space:nowrap}#BrowseBreadcrumb>li>a{cursor:pointer}.card{min-height:350px}@media only screen and (max-width:576px){.header-logo{display:none!important}}.clickable{cursor:pointer}.tblnum,.tblaction{width:30px}small{color:#aaa}.card-footer-playback{padding:0}.album-cover{background-size:cover;border:1px solid black;border-radius:5px;overflow:hidden;width:240px;height:240px;background-color:#eee;float:left;margin-right:20px;margin-bottom:20px}.album-desc{min-width:240px;float:left}.hide{display:none!important}.pull-right{float:right!important}.card-toolbar{margin-bottom:10px}.card-toolbar>div,.card-toolbar>form{margin-bottom:5px}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(/assets/MaterialIcons-Regular.eot);src:local('Material Icons'),local('MaterialIcons-Regular');src:url(/assets/MaterialIcons-Regular.woff2) format('woff2'),url(/assets/MaterialIcons-Regular.woff) format('woff'),url(/assets/MaterialIcons-Regular.ttf) format('truetype')}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:18px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;vertical-align:top;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:'liga'}.material-icons-small{font-size:16px}.color-darkgrey,.color-darkgrey:hover{color:#6c757d!important}#btn-outputs-block>button{margin-bottom:10px}#btn-outputs-block>button:last-child{margin-bottom:0}.card-body{overflow-x:hidden}.progressBarPlay{font-size:22px}#counter{cursor:text}#volumeBar{margin-top:2px;width:160px}.title-icon{float:left;margin-right:5px;font-size:1.8rem}.header-logo{font-size:2rem;float:left;margin-right:5px}.letters>button{width:28px;height:28px}.col-md{max-width:250px;min-width:250px}a.card-img-top{overflow:hidden;display:block}button.active{color:#fff;background-color:#28a745!important;border-color:#28a745!important}button.active-fg-green{color:#28a745!important}button.active-fg-red{color:#bd2130!important}div#alertBox{position:fixed;top:50px;right:10px;width:80%;max-width:400px;z-index:1000;opacity:0;visibility:visible;transition:opacity .5s ease-in}div.alertBoxActive{opacity:1!important;visibility:visible!important;transition:opacity .5s ease-in}.popover-content{padding-top:4px;padding-bottom:4px}.opacity05{opacity:.5}caption{caption-side:top;font-size:120%;font-weight:bold;color:black}.dragover>td{border-top:25px solid transparent}[draggable]{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;user-select:none;-khtml-user-drag:element;-webkit-user-drag:element} \ No newline at end of file +html{position:relative;min-height:100%}body{margin-bottom:60px;padding-top:50px;padding-bottom:50px;background-color:#888}main{padding-top:20px}footer{position:absolute;bottom:0}button{overflow:hidden}#BrowseBreadrumb{overflow:auto;white-space:nowrap}#BrowseBreadcrumb>li>a{cursor:pointer}.card{min-height:350px}@media only screen and (max-width:576px){.header-logo{display:none!important}}.clickable{cursor:pointer}.tblnum,.tblaction{width:30px}small{color:#aaa}.card-footer-playback{padding:0}.album-cover{background-size:cover;border:1px solid black;border-radius:5px;overflow:hidden;width:240px;height:240px;background-color:#eee;float:left;margin-right:20px;margin-bottom:20px}.album-desc{min-width:240px;float:left}.hide{display:none!important}.pull-right{float:right!important}.card-toolbar{margin-bottom:10px}.card-toolbar>div,.card-toolbar>form{margin-bottom:5px}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(/assets/MaterialIcons-Regular.eot);src:local('Material Icons'),local('MaterialIcons-Regular');src:url(/assets/MaterialIcons-Regular.woff2) format('woff2'),url(/assets/MaterialIcons-Regular.woff) format('woff'),url(/assets/MaterialIcons-Regular.ttf) format('truetype')}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:18px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;vertical-align:top;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:'liga'}.material-icons-small{font-size:16px}.color-darkgrey,.color-darkgrey:hover{color:#6c757d!important}#btn-outputs-block>button{margin-bottom:10px}#btn-outputs-block>button:last-child{margin-bottom:0}.card-body{overflow-x:hidden}.progressBarPlay{font-size:22px}#counter{cursor:text}#volumeBar{margin-top:2px;width:160px}.title-icon{float:left;margin-right:5px;font-size:1.8rem}.header-logo{font-size:2rem;float:left;margin-right:5px}.letters>button{width:28px;height:28px}.col-md{max-width:250px;min-width:250px}a.card-img-top{overflow:hidden;display:block}button.active{color:#fff;background-color:#28a745!important;border-color:#28a745!important}button.active-fg-green{color:#28a745!important}button.active-fg-red{color:#bd2130!important}div#alertBox{position:fixed;top:50px;right:10px;width:80%;max-width:400px;z-index:1000;opacity:0;visibility:visible;transition:opacity .5s ease-in}div.alertBoxActive{opacity:1!important;visibility:visible!important;transition:opacity .5s ease-in}.popover-content{padding-top:4px;padding-bottom:4px}.opacity05{opacity:.5}caption{caption-side:top;font-size:120%;font-weight:bold;color:black}.dragover>td{border-top:25px solid transparent}[draggable]{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;user-select:none;-khtml-user-drag:element;-webkit-user-drag:element}@keyframes changewidth{0%{width:0%}to{width:100%}}.updateDBprogressAnimate{animation-duration:2s;animation-name:changewidth;animation-iteration-count:infinite} \ No newline at end of file diff --git a/dist/htdocs/index.html b/dist/htdocs/index.html index 7949841..61d036e 100644 --- a/dist/htdocs/index.html +++ b/dist/htdocs/index.html @@ -1 +1 @@ -myMPD
Playback

Artist

Album

  
Queue
#TitleArtistAlbumDuration
PlaylistLast modified
Playlist List
#TitleArtistAlbumDuration
Artist
TitleArtistAlbumDuration
Search
TitleArtistAlbumDuration
\ No newline at end of file +myMPD
Playback

Artist

Album

  
Queue
#TitleArtistAlbumDuration
PlaylistLast modified
Playlist List
#TitleArtistAlbumDuration
Artist
TitleArtistAlbumDuration
Search
TitleArtistAlbumDuration
\ No newline at end of file diff --git a/dist/htdocs/js/mympd.min.js b/dist/htdocs/js/mympd.min.js index 5b0090a..e1172b1 100644 --- a/dist/htdocs/js/mympd.min.js +++ b/dist/htdocs/js/mympd.min.js @@ -9,7 +9,7 @@ var socket,lastSong="",lastState,currentSong={},playstate="",settings={},alertTi scrollPos:0}},current:{app:"Playback",tab:void 0,view:void 0,page:0,filter:"",search:"",scrollPos:0},last:{app:void 0,tab:void 0,view:void 0,filter:"",search:"",scrollPos:0}},domCache={};domCache.navbarBottomBtns=document.getElementById("navbar-bottom").getElementsByTagName("div");domCache.navbarBottomBtnsLen=domCache.navbarBottomBtns.length;domCache.panelHeadingBrowse=document.getElementById("panel-heading-browse").getElementsByTagName("a");domCache.panelHeadingBrowseLen=domCache.panelHeadingBrowse.length; domCache.counter=document.getElementById("counter");domCache.volumePrct=document.getElementById("volumePrct");domCache.volumeControl=document.getElementById("volumeControl");domCache.volumeIcon=document.getElementById("volumeIcon");domCache.btnsPlay=document.getElementsByClassName("btnPlay");domCache.btnsPlayLen=domCache.btnsPlay.length;domCache.btnPrev=document.getElementById("btnPrev");domCache.btnNext=document.getElementById("btnNext");domCache.progressBar=document.getElementById("progressBar"); domCache.volumeBar=document.getElementById("volumeBar");domCache.outputs=document.getElementById("outputs");domCache.btnAdd=document.getElementById("nav-add2homescreen");domCache.currentTrack=document.getElementById("currentTrack");domCache.currentArtist=document.getElementById("currentArtist");domCache.currentAlbum=document.getElementById("currentAlbum");domCache.currentCover=document.getElementById("currentCover");domCache.btnVoteUp=document.getElementById("btnVoteUp");domCache.btnVoteDown=document.getElementById("btnVoteDown"); -var modalConnectionError=new Modal(document.getElementById("modalConnectionError")),modalSettings=new Modal(document.getElementById("modalSettings")),modalSavequeue=new Modal(document.getElementById("modalSaveQueue")),modalSongDetails=new Modal(document.getElementById("modalSongDetails")),modalAddToPlaylist=new Modal(document.getElementById("modalAddToPlaylist")),modalRenamePlaylist=new Modal(document.getElementById("modalRenamePlaylist")); +var modalConnectionError=new Modal(document.getElementById("modalConnectionError")),modalSettings=new Modal(document.getElementById("modalSettings")),modalSavequeue=new Modal(document.getElementById("modalSaveQueue")),modalSongDetails=new Modal(document.getElementById("modalSongDetails")),modalAddToPlaylist=new Modal(document.getElementById("modalAddToPlaylist")),modalRenamePlaylist=new Modal(document.getElementById("modalRenamePlaylist")),modalUpdateDB=new Modal(document.getElementById("modalUpdateDB")); function appPrepare(a){if(app.current.app!=app.last.app||app.current.tab!=app.last.tab||app.current.view!=app.last.view){for(var b=0;bSongdetails':""));void 0==a.Popover&&(new Popover(a,{trigger:"click",template:'"}),b=a.Popover,a.addEventListener("shown.bs.popover",function(a){document.getElementsByClassName("popover-content")[0].addEventListener("click",function(a){a.preventDefault();a.stopPropagation();a=JSON.parse(a.target.getAttribute("data-href").replace(/'/g,'"'));if("function"===typeof window[a.cmd])switch(a.cmd){case "sendAPI":sendAPI.apply(null, $jscomp.arrayFromIterable(a.options));break;default:window[a.cmd].apply(null,$jscomp.arrayFromIterable(a.options))}},!1)},!1),b.show())} function sendAPI(a,b){var c=new XMLHttpRequest;c.open("POST","/api",!0);c.setRequestHeader("Content-type","application/json");c.onreadystatechange=function(){if(4==c.readyState)if(""!=c.responseText){var e=JSON.parse(c.responseText);"error"==e.type?(showNotification("Error",e.data,e.data,"danger"),console.log("Error: "+e.data)):"result"==e.type&&"ok"!=e.data?showNotification(e.data,"","","success"):void 0!=b&&"function"==typeof b&&b(e)}else console.log("Empty response for request: "+JSON.stringify(a))}; -c.send(JSON.stringify(a))}function openLocalPlayer(){window.open("/player.html#"+settings.mpdstream,"LocalPlayer")}function updateDB(){sendAPI({cmd:"MPD_API_UPDATE_DB"});showNotification("Updating MPD Database...","","","success")}function clickPlay(){"play"!=playstate?sendAPI({cmd:"MPD_API_SET_PLAY"}):sendAPI({cmd:"MPD_API_SET_PAUSE"})}function clickStop(){sendAPI({cmd:"MPD_API_SET_STOP"})}function clickPrev(){sendAPI({cmd:"MPD_API_SET_PREV"})} -function clickNext(){sendAPI({cmd:"MPD_API_SET_NEXT"})}function delQueueSong(a,b,c){"range"==a?sendAPI({cmd:"MPD_API_RM_RANGE",data:{start:b,end:c}}):"single"==a&&sendAPI({cmd:"MPD_API_RM_TRACK",data:{track:b}})}function delPlaylist(a){sendAPI({cmd:"MPD_API_RM_PLAYLIST",data:{uri:a}});sendAPI({cmd:"MPD_API_GET_PLAYLISTS",data:{offset:app.current.page,filter:app.current.filter}},parsePlaylists)} +c.send(JSON.stringify(a))}function openLocalPlayer(){window.open("/player.html#"+settings.mpdstream,"LocalPlayer")}function updateDB(){sendAPI({cmd:"MPD_API_UPDATE_DB"});updateDBstarted()}function updateDBstarted(){document.getElementById("updateDBfinished").innerText="";document.getElementById("updateDBfooter").classList.add("hide");modalUpdateDB.show();document.getElementById("updateDBprogress").classList.add("updateDBprogressAnimate")} +function updateDBfinished(a){"update_database"==a?document.getElementById("updateDBfinished").innerText="Database successfully updated":"update_finished"==a&&(document.getElementById("updateDBfinished").innerText="Database update finished.");a=document.getElementById("updateDBprogress");a.classList.remove("updateDBprogressAnimate");a.style.width="100%";document.getElementById("updateDBfooter").classList.remove("hide")} +function clickPlay(){"play"!=playstate?sendAPI({cmd:"MPD_API_SET_PLAY"}):sendAPI({cmd:"MPD_API_SET_PAUSE"})}function clickStop(){sendAPI({cmd:"MPD_API_SET_STOP"})}function clickPrev(){sendAPI({cmd:"MPD_API_SET_PREV"})}function clickNext(){sendAPI({cmd:"MPD_API_SET_NEXT"})}function delQueueSong(a,b,c){"range"==a?sendAPI({cmd:"MPD_API_RM_RANGE",data:{start:b,end:c}}):"single"==a&&sendAPI({cmd:"MPD_API_RM_TRACK",data:{track:b}})} +function delPlaylist(a){sendAPI({cmd:"MPD_API_RM_PLAYLIST",data:{uri:a}});sendAPI({cmd:"MPD_API_GET_PLAYLISTS",data:{offset:app.current.page,filter:app.current.filter}},parsePlaylists)} function confirmSettings(){var a=!0,b=document.getElementById("inputCrossfade");if(!b.getAttribute("disabled")){var c=parseInt(b.value);isNaN(c)?(b.classList.add("is-invalid"),a=!1):b.value=c}settings.mixramp&&(b=document.getElementById("inputMixrampdb"),b.getAttribute("disabled")||(c=parseFloat(b.value),isNaN(c)?(b.classList.add("is-invalid"),a=!1):b.value=c),b=document.getElementById("inputMixrampdelay"),b.getAttribute("disabled")||("nan"==b.value&&(b.value="-1"),c=parseFloat(b.value),isNaN(c)? (b.classList.add("is-invalid"),a=!1):b.value=c));1==a?(a=document.getElementById("selectReplaygain"),sendAPI({cmd:"MPD_API_SET_SETTINGS",data:{consume:document.getElementById("btnConsume").classList.contains("active")?1:0,random:document.getElementById("btnRandom").classList.contains("active")?1:0,single:document.getElementById("btnSingle").classList.contains("active")?1:0,repeat:document.getElementById("btnRepeat").classList.contains("active")?1:0,replaygain:a.options[a.selectedIndex].value,crossfade:document.getElementById("inputCrossfade").value, mixrampdb:1==settings.mixramp?document.getElementById("inputMixrampdb").value:settings.mixrampdb,mixrampdelay:1==settings.mixramp?document.getElementById("inputMixrampdelay").value:settings.mixrampdelay,notificationWeb:document.getElementById("btnnotifyWeb").classList.contains("active")?1:0,notificationPage:document.getElementById("btnnotifyPage").classList.contains("active")?1:0}},getSettings),modalSettings.hide()):document.getElementById("settingsFrm").classList.add("was-validated")} diff --git a/htdocs/css/mympd.css b/htdocs/css/mympd.css index e6ca4a3..d9c33d8 100644 --- a/htdocs/css/mympd.css +++ b/htdocs/css/mympd.css @@ -249,3 +249,14 @@ caption { -khtml-user-drag: element; -webkit-user-drag: element; } + +@keyframes changewidth { + from { width: 0%; } + to { width: 100%; } +} + +.updateDBprogressAnimate { + animation-duration: 2s; + animation-name: changewidth; + animation-iteration-count: infinite; +} diff --git a/htdocs/index.html b/htdocs/index.html index f493823..2dd2a50 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -533,14 +533,34 @@ + + @@ -589,9 +609,7 @@
playlist_addRename playlist
- +
@@ -619,9 +637,7 @@
- +
@@ -712,9 +728,7 @@
- +

myMPD – MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS

@@ -749,9 +763,7 @@
save Save Queue
- +
@@ -777,9 +789,7 @@
music_note Song Details
- +
diff --git a/htdocs/js/mympd.js b/htdocs/js/mympd.js index 7fed8e0..a497250 100644 --- a/htdocs/js/mympd.js +++ b/htdocs/js/mympd.js @@ -90,6 +90,7 @@ var modalSavequeue = new Modal(document.getElementById('modalSaveQueue')); var modalSongDetails = new Modal(document.getElementById('modalSongDetails')); var modalAddToPlaylist = new Modal(document.getElementById('modalAddToPlaylist')); var modalRenamePlaylist = new Modal(document.getElementById('modalRenamePlaylist')); +var modalUpdateDB = new Modal(document.getElementById('modalUpdateDB')); //var mainMenu = new Dropdown(document.getElementById('mainMenu')); //var volumeMenu = new Dropdown(document.getElementById('volumeIcon')); @@ -320,6 +321,10 @@ function appInit() { document.getElementById('modalAbout').addEventListener('shown.bs.modal', function () { sendAPI({"cmd": "MPD_API_GET_STATS"}, parseStats); }); + + document.getElementById('modalUpdateDB').addEventListener('hidden.bs.modal', function () { + document.getElementById('updateDBprogress').classList.remove('updateDBprogressAnimate'); + }); document.getElementById('modalSaveQueue').addEventListener('shown.bs.modal', function () { var plName = document.getElementById('saveQueueName'); @@ -688,6 +693,13 @@ function webSocketConnect() { case 'update_outputs': sendAPI({"cmd": "MPD_API_GET_OUTPUTS"}, parseOutputs); break; + case 'update_started': + updateDBstarted(); + break; + case 'update_database': + case 'update_finished': + updateDBfinished(obj.type); + break; case 'error': showNotification(obj.data, '', '', 'danger'); break; @@ -1554,7 +1566,7 @@ function showAddToPlaylist(uri) { document.getElementById('addToPlaylistFrm').classList.add('hide'); document.getElementById('addToPlaylistLabel').innerText = 'Add Stream'; } - modalAddToPlaylist.show(); + modalAddToPlaylist.show(); sendAPI({"cmd": "MPD_API_GET_PLAYLISTS","data": {"offset": 0, "filter": "-"}}, getAllPlaylists); } @@ -1747,7 +1759,25 @@ function openLocalPlayer() { function updateDB() { sendAPI({"cmd": "MPD_API_UPDATE_DB"}); - showNotification('Updating MPD Database...', '', '', 'success'); + updateDBstarted(); +} + +function updateDBstarted() { + document.getElementById('updateDBfinished').innerText = ''; + document.getElementById('updateDBfooter').classList.add('hide'); + modalUpdateDB.show(); + document.getElementById('updateDBprogress').classList.add('updateDBprogressAnimate'); +} + +function updateDBfinished(idleEvent) { + if (idleEvent == 'update_database') + document.getElementById('updateDBfinished').innerText = 'Database successfully updated'; + else if (idleEvent == 'update_finished') + document.getElementById('updateDBfinished').innerText = 'Database update finished.'; + var updateDBprogress = document.getElementById('updateDBprogress'); + updateDBprogress.classList.remove('updateDBprogressAnimate'); + updateDBprogress.style.width = '100%'; + document.getElementById('updateDBfooter').classList.remove('hide'); } function clickPlay() { diff --git a/src/mpd_client.c b/src/mpd_client.c index 573956d..4e953bc 100644 --- a/src/mpd_client.c +++ b/src/mpd_client.c @@ -57,7 +57,7 @@ void callback_mympd(struct mg_connection *nc, const struct mg_str msg) { int je, int_buf, int_rc; float float_buf; char *p_charbuf1, *p_charbuf2, *p_charbuf3; - struct mympd_state { int a; int b; } state = { .a = 0, .b = 0 }; + struct mympd_state { int a; int b; } state = { .a = 0, .b = 1 }; enum mpd_cmd_ids cmd_id; struct pollfd fds[1]; int pollrc; @@ -116,7 +116,7 @@ void callback_mympd(struct mg_connection *nc, const struct mg_str msg) { je = json_scanf(msg.p, msg.len, "{data: {notificationWeb: %d, notificationPage: %d}}", &state.a, &state.b); if (je == 2) { char tmp_file[200]; - snprintf(tmp_file, 199, "%s.tmp", config.statefile); + snprintf(tmp_file, 200, "%s.tmp", config.statefile); json_fprintf(tmp_file, "{notificationWeb: %d, notificationPage: %d}", state.a, state.b); rename(tmp_file, config.statefile); } @@ -577,7 +577,7 @@ void mympd_parse_idle(struct mg_mgr *s, int idle_bitmask) { len = snprintf(mpd.buf, MAX_SIZE, "{\"type\": \"update_options\"}"); break; case MPD_IDLE_UPDATE: - len = snprintf(mpd.buf, MAX_SIZE, "{\"type\": \"update_update\"}"); + len = mympd_get_updatedb_state(mpd.buf); break; case MPD_IDLE_STICKER: len = snprintf(mpd.buf, MAX_SIZE, "{\"type\": \"update_sticker\"}"); @@ -678,6 +678,30 @@ void mympd_idle(struct mg_mgr *s, int timeout) { } } +int mympd_get_updatedb_state(char *buffer) { + struct mpd_status *status; + int len; + struct json_out out = JSON_OUT_BUF(buffer, MAX_SIZE); + + status = mpd_run_status(mpd.conn); + if (!status) { + printf("MPD mpd_run_status: %s\n", mpd_connection_get_error_message(mpd.conn)); + mpd.conn_state = MPD_FAILURE; + return 0; + } + if (mpd_status_get_update_id(status) == 1) + len = json_printf(&out, "{type: update_started, data: {}}"); + else + len = json_printf(&out, "{type: update_finished, data: {}}"); + + mpd_status_free(status); + + if (len > MAX_SIZE) + printf("Buffer truncated\n"); + return len; +} + + void mympd_get_sticker(const char *uri, t_sticker *sticker) { struct mpd_pair *pair; char *crap; @@ -745,7 +769,7 @@ void mympd_count_song_uri(const char *uri, char *name, int value) { old_value = 999; else if (old_value < 0) old_value = 0; - snprintf(v, 3, "%d", old_value); + snprintf(v, 4, "%d", old_value); #ifdef DEBUG fprintf(stderr, "STICKER_COUNT_SONG: \"%s\" -> %s: %s\n", uri, name, v); #endif @@ -756,7 +780,7 @@ void mympd_count_song_uri(const char *uri, char *name, int value) { void mympd_like_song_uri(const char *uri, int value) { if (uri == NULL || strncasecmp("http:", uri, 5) == 0 || strncasecmp("https:", uri, 6) == 0) return; - char v[3]; + char v[2]; if (value > 2) value = 2; else if (value < 0) @@ -774,7 +798,7 @@ void mympd_last_played_song_uri(const char *uri) { if (uri == NULL || strncasecmp("http:", uri, 5) == 0 || strncasecmp("https:", uri, 6) == 0) return; char v[20]; - snprintf(v, 19, "%lu", time(NULL)); + snprintf(v, 20, "%lu", time(NULL)); if (!mpd_run_sticker_set(mpd.conn, "song", uri, "lastPlayed", v)) LOG_ERROR_AND_RECOVER("mpd_send_sticker_set"); } @@ -868,11 +892,11 @@ int mympd_put_settings(char *buffer) { je = json_scanf(content, strlen(content), "{notificationWeb: %d, notificationPage: %d}", &state.a, &state.b); if (je != 2) { state.a = 0; - state.b = 0; + state.b = 1; } } else { state.a = 0; - state.b = 0; + state.b = 1; } status = mpd_run_status(mpd.conn); diff --git a/src/mpd_client.h b/src/mpd_client.h index f014ab7..e6f7263 100644 --- a/src/mpd_client.h +++ b/src/mpd_client.h @@ -169,6 +169,7 @@ void mympd_like_song_uri(const char *uri, int value); void mympd_last_played_song_uri(const char *uri); void mympd_last_played_song_id(int song_id); void mympd_get_sticker(const char *uri, t_sticker *sticker); +int mympd_get_updatedb_state(char *buffer); int mympd_put_state(char *buffer, int *current_song_id, int *next_song_id, int *last_song_id, unsigned *queue_version, unsigned *queue_length); int mympd_put_outputs(char *buffer); int mympd_put_current_song(char *buffer); diff --git a/src/mympd.c b/src/mympd.c index 38bc457..67a92b0 100644 --- a/src/mympd.c +++ b/src/mympd.c @@ -213,7 +213,7 @@ int main(int argc, char **argv) { mg_mgr_init(&mgr, NULL); if (config.ssl == true) { - snprintf(s_redirect, 249, "https://%s:%s/", hostname, config.sslport); + snprintf(s_redirect, 250, "https://%s:%s/", hostname, config.sslport); nc_http = mg_bind(&mgr, config.webport, ev_handler_http); if (nc_http == NULL) { printf("Error listening on port %s\n", config.webport);