Call Failed
'); - } - - // clear the playlist - $("#clear").on('click', function() { - MSTREAMPLAYER.clearPlaylist(); - }); - - - - - /////////////////////////////////////// File Explorer - function loadFileExplorer(){ - resetPanel('File Explorer', 'scrollBoxHeight1'); - $('#directory_bar').show(); - - // Reset file explorer vars - fileExplorerArray = []; - fileExplorerScrollPosition = []; - - //send this directory to be parsed and displayed - senddir(0); - } - - // Load up the file explorer - $('.get_file_explorer').on('click', loadFileExplorer); - - // when you click on a directory, go to that directory - $("#filelist").on('click', 'div.dirz', function() { - //get the id of that class - var nextDir = $(this).attr("id"); - fileExplorerArray.push(nextDir); - - // Save the scroll position - var scrollPosition = $('#filelist').scrollTop(); - fileExplorerScrollPosition.push(scrollPosition); - - // pass this value along - senddir(0); - }); - - // when you click the back directory - $(".backButton").on('click', function() { - if(fileExplorerArray.length != 0){ - // remove the last item in the array - fileExplorerArray.pop(); - // Get the scroll postion - var scrollPosition = fileExplorerScrollPosition.pop(); - - senddir(scrollPosition); - } - }); - - // send a new directory to be parsed. - function senddir(scrollPosition){ - // Construct the directory string - var directoryString = ""; - for (var i = 0; i < fileExplorerArray.length; i++) { - directoryString += fileExplorerArray[i] + "/"; - } - - MSTREAMAPI.dirparser(directoryString, false, function(response, error){ - if(error !== false){ - boilerplateFailure(response, error); - } - // Set any directory views - $('.directoryName').html('/' + directoryString); - // hand this data off to be printed on the page - printdir(response); - // Set scroll postion - $('#filelist').scrollTop(scrollPosition); - }); - } - - - // function that will recieve JSON array of a directory listing. It will then make a list of the directory and tack on classes for functionality - function printdir(response){ - currentBrowsingList = response.contents; - - // clear the list - $('#filelist').empty(); - $('#search_folders').val(''); - - // TODO: create an object of everything that the user can easily sort through - var searchObject = []; - - //parse through the json array and make an array of corresponding divs - var filelist = []; - $.each(currentBrowsingList, function() { - if(this.type=='directory'){ - filelist.push(''+this.name+'
');
- }else{
- if(this.artist!=null || this.title!=null){
- filelist.push('♬ '+this.artist+' - '+this.title+'
');
- }else{
- filelist.push('♫ '+this.name+'
');
- }
- }
- });
-
- // Post the html to the filelist div
- $('#filelist').html(filelist);
- }
-
- // when you click 'add directory', add entire directory to the playlist
- $("#addall").on('click', function() {
- //make an array of all the mp3 files in the curent directory
- var elems = document.getElementsByClassName('filez');
- var arr = jQuery.makeArray(elems);
-
- //loop through array and add each file to the playlist
- $.each( arr, function() {
- MSTREAMPLAYER.addSongWizard($(this).data("file_location"), {}, true);
- });
- });
-
-
- // Search Files
- $('#search_folders').on('keyup', function(){
- if($(this).val().length>1){
- var searchVal = $(this).val();
-
- var path = ""; // Construct the directory string
- for (var i = 0; i < fileExplorerArray.length; i++) {
- path += fileExplorerArray[i] + "/";
- }
-
- var filelist = [];
- $.each(currentBrowsingList, function() {
- var lowerCase = this.name.toLowerCase();
-
- if (lowerCase.indexOf( searchVal.toLowerCase() ) !== -1) {
- if(this.type=='directory'){
- filelist.push(''+this.name+'
');
- }else{
- if(this.artist!=null || this.title!=null){
- filelist.push('♬ '+this.artist+' - '+this.title+'
');
- }else{
- filelist.push('♫ '+this.name+'
');
- }
- }
- }
- });
- }
-
- // Post the html to the filelist div
- $('#filelist').html(filelist);
- });
-
- $('#search-explorer').on('click', function(){
- // Hide Filepath
- $('#search_folders').toggleClass( 'hide' );
- // Show Search Input
- $('.directoryName').toggleClass( 'hide' );
-
- if(!$('#search_folders').hasClass('hide')){
- $( "#search_folders" ).focus();
- }
- });
-
-
- ////////////////////////////////////// Share playlists
- $('#share_playlist_form').on('submit', function(e){
- e.preventDefault();
-
- $('#share_it').prop("disabled",true);
- var shareTimeInDays = $('#share_time').val();
-
- // Check for special characters
- if(/^[0-9]*$/.test(shareTimeInDays) == false) {
- console.log('don\'t do that');
- $('#share_it').prop("disabled",false);
- return false;
- }
-
- //loop through array and add each file to the playlist
- var stuff = [];
- for (let i = 0; i < MSTREAMPLAYER.playlist.length; i++) {
- //Do something
- stuff.push(MSTREAMPLAYER.playlist[i].filepath);
- }
-
- if(stuff.length == 0){
- $('#share_it').prop("disabled",false);
- return;
- }
-
- MSTREAMAPI.makeShared(stuff, shareTimeInDays, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- $('#share_it').prop("disabled",false);
- var adrs = window.location.protocol + '//' + window.location.host + '/shared/playlist/' + response.id;
- $('.share-textarea').val(adrs);
- });
- });
-
-
- ////////////////////////////////////// Save/Load playlists
- // Save a new playlist
- $('#save_playlist_form').on('submit', function(e){
- e.preventDefault();
-
- // Check for special characters
- if(/^[a-zA-Z0-9-_ ]*$/.test(title) == false) {
- console.log('don\'t do that');
- return false;
- }
-
- if(MSTREAMPLAYER.playlist.length == 0){
- // TODO: Alert user nothing was saved
- return;
- }
-
- $('#save_playlist').prop("disabled",true);
- var title = $('#playlist_name').val();
-
- //loop through array and add each file to the playlist
- var songs = [];
- for (let i = 0; i < MSTREAMPLAYER.playlist.length; i++) {
- songs.push(MSTREAMPLAYER.playlist[i].filepath);
- }
-
- MSTREAMAPI.savePlaylist(title, songs, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- $('#save_playlist').prop("disabled",false);
- $('#close_save_playlist').trigger("click");
- });
- });
-
- // Get all playlists
- $('.get_all_playlists').on('click', function(){
- resetPanel('Playlists', 'scrollBoxHeight2');
-
- MSTREAMAPI.getAllPlaylists( function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- // loop through the json array and make an array of corresponding divs
- var playlists = [];
- $.each(response, function() {
- playlists.push(''+this.name+'x
');
- });
-
- // Add playlists to the left panel
- $('#filelist').html(playlists);
- });
- });
-
- // delete playlist
- $("#filelist").on('click', '.deletePlaylist', function(){
- // Get Playlist ID
- var playlistname = $(this).data('playlistname');
- var that = this;
-
- MSTREAMAPI.deletePlaylist(playlistname, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- $(that).parent().remove();
- });
- });
-
- // load up a playlist
- $("#filelist").on('click', '.playlistz', function() {
- var playlistname = $(this).data('playlistname');
- var name = $(this).html();
-
- MSTREAMAPI.loadPlaylist(playlistname, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- // Add the playlist name to the modal
- $('#playlist_name').val(name);
-
- // Clear the playlist
- MSTREAMPLAYER.clearPlaylist();
-
- // Append the playlist items to the playlist
- $.each( response, function(i ,item) {
- MSTREAMPLAYER.addSongWizard(item.filepath , {}, true);
- });
- });
- });
-
- /////////////// Download Playlist
- $('#downloadPlaylist').click(function(){
- // Loop through array and add each file to the playlist
- var downloadFiles = [];
- for (let i = 0; i < MSTREAMPLAYER.playlist.length; i++) {
- downloadFiles.push(MSTREAMPLAYER.playlist[i].filepath);
- }
-
- // Use key if necessary
- if( MSTREAMAPI.currentServer.token){
- $("#downform").attr("action", "download?token=" + MSTREAMAPI.currentServer.token);
- }
-
- $('').attr({
- type: 'hidden',
- name: 'fileArray',
- value: JSON.stringify(downloadFiles),
- }).appendTo('#downform');
-
- //submit form
- $('#downform').submit();
- // clear the form
- $('#downform').empty();
- });
-
- ///////////////////////////// Database Management
- // The Manage DB panel
- $('#manage_database').on('click', function(){
- resetPanel('Database Management', 'scrollBoxHeight2');
-
- MSTREAMAPI.dbStatus( function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- // If there is an error
- if(response.error){
- $('#filelist').html('The database returned the following error:
' + response.error + '
'); - return; - } - // Add Beets Msg - if(response.dbType == 'beets' || response.dbType == 'beets-default' ){ - $('#filelist').append('
Powered by Beets DB
');
- }
- // if the DB is locked
- if(response.locked){
- $('#filelist').append('The database is currently being built. Currently ' + response.totalFileCount + ' files are in the DB
'); - return; - } - // If you got this far the db is made and working - $('#filelist').append('Your DB has ' + response.totalFileCount + ' files
'); - }); - }); - - // Build the database - $('body').on('click', '#build_database', function(){ - $(this).prop("disabled", true); - - MSTREAMAPI.dbScan( function(response, error){ - if(error !== false){ - return boilerplateFailure(response, error); - } - // Append the check db button so the user can start checking right away - $('#filelist').append(''); - }); - }); - - // Check DB build progress - $('body').on('click', '#check_db_progress', function(){ - MSTREAMAPI.dbStatus( function(response, error){ - if(error !== false){ - return boilerplateFailure(response, error); - } - $( "#db_progress_report" ).remove(); - - // if file_count is 0, report that the the build script is not done counting files - if(response.file_count == 0){ - $('#filelist').append('The create database script is still counting the files in the music collection. This operation can take some time. Try again in a bit
'); - return; - } - - // Append newtag with id of "db_progress_report" - $('#filelist').append('
Progress: '+ response.files_in_db +'/'+ response.file_count +'
'); - }); - }); - - - //////////////////////////////////// Sort by Albums - //Load up album explorer - $('.get_all_albums').on('click', function(){ - resetPanel('Albums', 'scrollBoxHeight2'); - - MSTREAMAPI.albums( function(response, error){ - if(error !== false){ - return boilerplateFailure(response, error); - } - //parse through the json array and make an array of corresponding divs - var albums = []; - $.each(response.albums, function(index, value) { - albums.push(''+value+'
');
- });
-
- $('#filelist').html(albums);
- });
- });
-
- // Load up album-songs
- $("#filelist").on('click', '.albumz', function() {
- var album = $(this).data('album');
-
- MSTREAMAPI.albumSongs(album, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- //clear the list
- $('#filelist').empty();
-
- //parse through the json array and make an array of corresponding divs
- var filelist = [];
- $.each(response, function() {
- if(this.metadata.title){
- filelist.push('♫ '+this.metadata.title+'
');
- }
- else{
- filelist.push('♬ '+this.metadata.filename+'
');
- }
- });
-
- $('#filelist').html(filelist);
- });
- });
-
- /////////////////////////////////////// Artists
- // Load up album-songs
- $('.get_all_artists').on('click', function(){
- resetPanel('Artists', 'scrollBoxHeight2');
-
- MSTREAMAPI.artists( function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- //parse through the json array and make an array of corresponding divs
- var artists = [];
- $.each(response.artists, function(index,value) {
- artists.push(''+value+'
');
- });
-
- $('#filelist').html(artists);
- });
- });
-
-
- $("#filelist").on('click', '.artistz', function() {
- var artist = $(this).data('artist');
-
- MSTREAMAPI.artistAlbums(artist, function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- //clear the list
- $('#filelist').empty();
-
- var albums = [];
- $.each(response.albums, function(index, value) {
- albums.push(''+value+'
');
- });
-
- $('#filelist').html(albums);
- $('.panel_one_name').html('Artists->Albums');
- });
- });
-
-
- ///////////////////////////// Search Function
- // Setup the search interface
- $('#search_database').on('click', function(){
- resetPanel('Search', 'scrollBoxHeight1');
- $('#search_container').show();
- });
-
- // Auto Search
- $('#search_it').on('keyup', function(){
- // TODO: Put this on some kind of time delay. That way rapid keystrokes won't spam the server
- if($(this).val().length>1){
- MSTREAMAPI.search($(this).val(), function(response, error){
- if(error !== false){
- return boilerplateFailure(response, error);
- }
- var htmlString = '';
-
- if(response.artists.length > 0){
- htmlString += 'Artists
'; - $.each(response.artists, function(index, value) { - htmlString += ''+value+'
';
- });
- }
-
- if(response.albums.length > 0){
- htmlString += 'Albums
'; - $.each(response.albums, function(index, value) { - htmlString += ''+value+'
';
- });
- }
-
- $('#filelist').html(htmlString);
- });
- }
- });
-
-
- //////////////////////// Jukebox Mode
- function setupJukeboxPanel(){
- // Hide the directory bar
- resetPanel('Jukebox Mode', 'scrollBoxHeight2');
-
- var newHtml;
- if(JUKEBOX.stats.live !== false && JUKEBOX.connection !== false){
- newHtml = createJukeboxPanel();
- }else{
- newHtml = '\
- \
-
\
-
Jukebox Mode allows you to control this page remotely
\
- \
- \
- 
';
- }
-
- // Add the content
- $('#filelist').html(newHtml);
- }
-
- // The jukebox panel
- $('#jukebox_mode').on('click', function(){
- setupJukeboxPanel();
- });
-
- // Setup Jukebox
- $('body').on('click', '.jukebox_connect', function(){
- $(this).prop("disabled", true);
- $(this).hide();
- $('.jukebox-loading').toggleClass('hide');
-
- JUKEBOX.createWebsocket( MSTREAMAPI.currentServer.token, function(){
- // Wait a while and display the status
- setTimeout(function(){
- // TODO: Check that status has changed
- setupJukeboxPanel();
- },1800);
- });
- });
-
- function createJukeboxPanel(){
- var returnHtml = '
\ - \ - \ -
';
- }
-
- // Add the content
- $('#filelist').html(newHtml);
- }
-
- // The jukebox panel
- $('#jukebox_mode').on('click', function(){
- setupJukeboxPanel();
- });
-
- // Setup Jukebox
- $('body').on('click', '.jukebox_connect', function(){
- $(this).prop("disabled", true);
- $(this).hide();
- $('.jukebox-loading').toggleClass('hide');
-
- JUKEBOX.createWebsocket( MSTREAMAPI.currentServer.token, function(){
- // Wait a while and display the status
- setTimeout(function(){
- // TODO: Check that status has changed
- setupJukeboxPanel();
- },1800);
- });
- });
-
- function createJukeboxPanel(){
- var returnHtml = ''; - - if(JUKEBOX.stats.error !== false){ - return returnHtml + 'An error occurred. Please refresh the page and try again
'; - } - - if(JUKEBOX.stats.adminCode){ - returnHtml += 'Code: ' + JUKEBOX.stats.adminCode + '
'; - } - if(JUKEBOX.stats.guestCode){ - returnHtml += 'Guest Code: ' + JUKEBOX.stats.guestCode + '
'; - } - - var adrs = window.location.protocol + '//' + window.location.host + '/remote'; - returnHtml += 'Remote Jukebox Controls: ' + adrs + '';
-
- return returnHtml + '';
- }
-
-});
diff --git a/webapp2/js/mstream.jukebox.js b/webapp2/js/mstream.jukebox.js
deleted file mode 100644
index 9d4a636..0000000
--- a/webapp2/js/mstream.jukebox.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var JUKEBOX = (function () {
- let mstreamModule = {};
-
- mstreamModule.connection = false;
-
- // jukebox global variable
- mstreamModule.stats = {
- // connection: false,
- live: false,
- guestCode: false,
- adminCode: false,
- error: false,
- accessAddress: false
- };
-
- // TODO: Move token to the api library
- mstreamModule.createWebsocket = function(accessKey, callback){
- if(mstreamModule.stats.live ===true ){
- return false;
- }
- mstreamModule.stats.live = true;
- // if user is running mozilla then use it's built-in WebSocket
- window.WebSocket = window.WebSocket || window.MozWebSocket;
-
- // if browser doesn't support WebSocket, just show some notification and exit
- if (!window.WebSocket) {
- // TODO: Make a warning
- return;
- }
-
- // TODO: Check if websocket has already been created
-
- // open connection
- var l = window.location;
- var wsLink = ((l.protocol === "https:") ? "wss://" : "ws://") + l.host + l.pathname;
- mstreamModule.connection = new WebSocket(wsLink + 'jukebox/open-connection?token=' + accessKey);
-
-
-
- mstreamModule.connection.onopen = function () {
- callback();
- };
-
- mstreamModule.connection.onerror = function (error) {
- // TODO: Error Code
- console.log('CONNECTION ERROR!!!!!!!!!!!!');
- };
-
- // most important part - incoming messages
- mstreamModule.connection.onmessage = function (message) {
- // try to parse JSON message. Because we know that the server always returns
- // JSON this should work without any problem but we should make sure that
- // the message is not chunked or otherwise damaged.
- try {
- var json = JSON.parse(message.data);
- } catch (e) {
- return;
- }
-
- // Handle Code
- if(json.code){
- mstreamModule.stats.adminCode = json.code;
- }
- if(json.guestCode){
- mstreamModule.stats.guestCode = json.guestCode;
- }
-
-
- if(!json.command){
- return;
- }
-
- if(json.command === 'next'){
- MSTREAMPLAYER.nextSong();
- return;
- }
- if( json.command === 'playPause'){
- MSTREAMPLAYER.playPause();
- }
- if( json.command === 'previous'){
- MSTREAMPLAYER.previousSong();
- return;
- }
- if( json.command === 'addSong' && json.file){
- MSTREAMPLAYER.addSongWizard(json.file, {}, true);
- }
- };
- }
-
-
- // TODO: Finish this at some point
- // mstreamModule.commandList = {
- // 'next': MSTREAMPLAYER.nextSong(),
- // 'playPause': MSTREAMPLAYER.playPause(),
- // 'previous': MSTREAMPLAYER.previousSong(),
- // }
-
-
-
-
- return mstreamModule;
-}());
diff --git a/webapp2/js/mstream.player.js b/webapp2/js/mstream.player.js
deleted file mode 100644
index f55caae..0000000
--- a/webapp2/js/mstream.player.js
+++ /dev/null
@@ -1,765 +0,0 @@
-var MSTREAMPLAYER = (function () {
- let mstreamModule = {};
-
-
- // Playlist variables
- mstreamModule.positionCache = {val:-1};
- // var currentSong;
- mstreamModule.playlist = [];
-
-
- // The audioData looks like this
- // var song = {
- // "url":"vPath/path/to/song.mp3?token=xxx",
- // "filepath": "path/to/song.mp3"
- // }
-
-
-
- mstreamModule.addSong = function(audioData){
- if(!audioData.url || audioData.url == false){
- return false;
- }
-
- // Handle shuffle
- if(mstreamModule.playerStats.shuffle === true){
- var pos = Math.floor(Math.random() * (shuffleCache.length + 1));
- shuffleCache.splice(pos, 0, song);
- }
-
- return addSongToPlaylist(audioData);
- }
-
- function addSongToPlaylist(song){
- mstreamModule.playlist.push(song);
-
- // If this the first song in the list
- if(mstreamModule.playlist.length === 1){
- mstreamModule.positionCache.val = 0;
- return goToSong(mstreamModule.positionCache.val);
- }
-
- // TODO: Check if we are at the end of the playlist and nothing is playing.
- // Start playing if this condition is met
-
- // Cache song if appropriate
- var oPlayer = getOtherPlayer();
- if(oPlayer.playerObject === false && mstreamModule.playlist[mstreamModule.positionCache.val + 1]){
- // setCachedSong(mstreamModule.positionCache.val + 1);
-
- clearTimeout(cacheTimer);
- cacheTimer = setTimeout(function(){ setCachedSong(mstreamModule.positionCache.val + 1) } , 3000);
- }
-
- return true;
- }
-
-
-
- mstreamModule.clearAndPlay = function(song){
- // Clear playlist
- mstreamModule.playlist = [];
-
- return addSong(song);
- }
-
- mstreamModule.clearPlaylist = function(){
- while(mstreamModule.playlist.length > 0) {mstreamModule.playlist.pop();}
- mstreamModule.positionCache.val = -1;
-
- clearEnd();
-
- // Clear shuffle as well
- if(mstreamModule.playerStats.shuffle === true){
- // Clear Shuffle Cache
- while(shuffleCache.length > 0) {shuffleCache.pop();}
- }
-
- return true;
- }
-
- mstreamModule.nextSong = function(){
- // Stop the current song
- return goToNextSong();
- }
- mstreamModule.previousSong = function(){
- return goToPreviousSong();
- }
-
-
- mstreamModule.goToSongAtPosition = function(position){
- if(!mstreamModule.playlist[position]){
- return false;
- }
-
-
- clearEnd();
-
- mstreamModule.positionCache.val = position;
- return goToSong(mstreamModule.positionCache.val);
- }
-
- // TODO: Log Failures
- mstreamModule.removeSongAtPosition = function(position, sanityCheckUrl){
- // Check that position is filled
- if (position > mstreamModule.playlist.length || position < 0) {
- return false;
- }
- // If sanityCheckUrl, check that url are the same
- if(sanityCheckUrl && sanityCheckUrl != mstreamModule.playlist[position].url){
- return false;
- }
-
- var removedSong = mstreamModule.playlist[position];
-
- // Remove song
- mstreamModule.playlist.splice(position, 1);
-
-
- if(mstreamModule.playerStats.shuffle === true){
- // Remove song from shuffle Cache
- for(var i=0, len=shuffleCache.length; i < len; i++){
- // Check if this is the current song
- if(removedSong === shuffleCache[i]){
- shuffleCache.splice(i, 1);
- }
- }
- for(var i=0, len=shufflePrevious.length; i < len; i++){
- // Check if this is the current song
- if(removedSong === shufflePrevious[i]){
- shufflePrevious.splice(i, 1);
- }
- }
-
- }
-
- // Handle case where user removes current song and it's the last song in the playlist
- if(position === mstreamModule.positionCache.val && position === mstreamModule.playlist.length ){
- clearEnd();
- // Go to random song if random is set
- if(mstreamModule.playerStats.shuffle === true){
- goToNextSong();
- }else if(mstreamModule.playerStats.shouldLoop === true){ // Loop is loop is set
- mstreamModule.positionCache.val = 0;
- goToSong(mstreamModule.positionCache.val);
- }else{ // Reset to start is nothing is set
- mstreamModule.positionCache.val = -1;
- }
- }else if(position === mstreamModule.positionCache.val){ // User removes currently playing song
- // Go to next song
- clearEnd();
-
- // If random is set, go to random song
- if(mstreamModule.playerStats.shuffle === true){
- goToNextSong();
- }else{
- goToSong(mstreamModule.positionCache.val);
- }
-
- }else if( position < mstreamModule.positionCache.val){
- // Lower positioncache by 1 if necessary
- mstreamModule.positionCache.val--;
- }else if( position === (mstreamModule.positionCache.val + 1) ){
- // setCachedSong(mstreamModule.positionCache.val + 1);
- clearTimeout(cacheTimer);
- cacheTimer = setTimeout(function(){ setCachedSong(mstreamModule.positionCache.val + 1) } , 3000);
- }
- }
-
- mstreamModule.getCurrentSong = function(){
- var lPlayer = getCurrentPlayer();
- return lPlayer.songObject;
- }
-
- function goToPreviousSong(){
- // TODO: If random is set, go to previous song from cache
- if(mstreamModule.playerStats.shuffle === true){
- // TODO: Check that there is a previous song to go back to
- if(shufflePrevious.length <= 1){
- return;
- }
-
- // Pop a song and go to the last song
- var nextSong = shufflePrevious.pop();
- shuffleCache.push(nextSong);
-
- var currentSong = shufflePrevious[shufflePrevious.length-1];
-
- // Reset position cache
- for(var i=0, len=mstreamModule.playlist.length; i < len; i++){
- // Check if this is the current song
- if(currentSong === mstreamModule.playlist[i]){
- mstreamModule.positionCache.val = i;
- }
- }
- clearEnd();
-
- goToSong(mstreamModule.positionCache.val );
- return;
- }
-
- // Make sure there is a previous song
- if(mstreamModule.positionCache.val === 0 || mstreamModule.positionCache.val === -1){
- return false;
- }
-
- // Set previous song and play
- clearEnd();
- mstreamModule.positionCache.val--;
- return goToSong(mstreamModule.positionCache.val);
- }
-
- function goToNextSong(){
- // If random is set, go to random song
- if(mstreamModule.playerStats.shuffle === true){
- // Chose a random value
- var nextSong = shuffleCache.pop();
-
- // Prevent same song from playing twice after a re-shuffle
- if(nextSong === mstreamModule.getCurrentSong()){
- console.log('DUPEEEEE');
- shuffleCache.unshift(nextSong);
- nextSong = shuffleCache.pop();
- }
-
- if(shuffleCache.length === 0){
- newShuffle();
- }
-
-
- // Reset position cache
- for(var i=0, len=mstreamModule.playlist.length; i < len; i++){
- // Check if this is the current song
- if(nextSong === mstreamModule.playlist[i]){
- mstreamModule.positionCache.val = i;
- }
- }
- clearEnd();
-
- goToSong(mstreamModule.positionCache.val );
-
- // Remove duplicates from shuffle previous
- for(var i=0, len=shufflePrevious.length; i < len; i++){
- // Check if this is the current song
- if(nextSong === shufflePrevious[i]){
- shufflePrevious.splice(i, 1);
- }
- }
-
- shufflePrevious.push(nextSong);
-
- // Load selected song
- return;
- }
-
- // Check if the next song exists
- if(!mstreamModule.playlist[mstreamModule.positionCache.val + 1]){
-
- // If loop is set and no other song, go back to first song
- if(mstreamModule.playerStats.shouldLoop === true && mstreamModule.playlist.length > 0){
- mstreamModule.positionCache.val = 0;
- clearEnd();
-
- return goToSong(mstreamModule.positionCache.val);
- }
-
- return false;
- }
-
-
- // Load up next song
- mstreamModule.positionCache.val++;
- clearEnd();
- return goToSong(mstreamModule.positionCache.val);
- }
-
-
- function getCurrentPlayer(){
- if(curP === 'A'){
- return playerA;
- }else if(curP === 'B'){
- return playerB;
- }
-
- return false;
- }
-
- function getOtherPlayer(){
- if(curP === 'A'){
- return playerB;
- }else if(curP === 'B'){
- return playerA;
- }
-
- return false;
- }
-
- function flipFlop(){
- if(curP === 'A'){
- curP = 'B';
- }else if(curP === 'B'){
- curP = 'A';
- }
-
- return curP;
- }
-
-
- function goToSong(position){
- if(!mstreamModule.playlist[position]){
- return false;
- }
-
- var localPlayerObject = getCurrentPlayer();
- var otherPlayerObject = getOtherPlayer();
-
- // Stop the current song
- if(localPlayerObject.playerType === 'aurora' ){
- localPlayerObject.playerObject.stop();
- }else if(localPlayerObject.playerType === 'howler'){
- localPlayerObject.playerObject.unload();
- }
-
- // Reset Duration
- mstreamModule.playerStats.duration = 0;
- mstreamModule.playerStats.currentTime = 0;
-
- // TODO: Handle situation where next song is same as current song
-
- // Song is cached
- if(otherPlayerObject.songObject === mstreamModule.playlist[position]){
- // console.log('USING CACHED SONG');
- flipFlop();
- // Play
- mstreamModule.playPause();
-
- }else{
- // console.log('DID NOT USE CACHE');
- setMedia(mstreamModule.playlist[position], localPlayerObject, true);
- }
-
- var lPlayer = getCurrentPlayer();
- var curSong = lPlayer.songObject;
- // TODO: Handle instace where metadata is empty
- // mstreamModule.playerStats.metadata = curSong.metadata;
- if(curSong.metadata){
- mstreamModule.resetCurrentMetadata();
- }
-
-
- // TODO: This is a mess, figure out a better way
- var newOtherPlayerObject = getOtherPlayer();
- newOtherPlayerObject.playerType = false;
- newOtherPlayerObject.playerObject = false;
- newOtherPlayerObject.songObject= false;
-
- // Cache next song
- // The timer prevents excessive cachign when the user starts button mashing
- // setCachedSong(position + 1);
- clearTimeout(cacheTimer);
- cacheTimer = setTimeout(function(){ setCachedSong(position + 1) } , 3000);
- return true;
- }
-
-
- mstreamModule.resetCurrentMetadata = function() {
- var lPlayer = getCurrentPlayer();
- var curSong = lPlayer.songObject;
- // TODO: Handle instace where metadata is empty
- // mstreamModule.playerStats.metadata = curSong.metadata;
- if(curSong.metadata){
- mstreamModule.playerStats.metadata.artist = curSong.metadata.artist;
- mstreamModule.playerStats.metadata.album = curSong.metadata.album;
- mstreamModule.playerStats.metadata.track = curSong.metadata.track;
- mstreamModule.playerStats.metadata.title = curSong.metadata.title;
- mstreamModule.playerStats.metadata.year = curSong.metadata.year;
- mstreamModule.playerStats.metadata['album-art'] = curSong.metadata['album-art'];
- }
-
- console.log( mstreamModule.playerStats.metadata)
- }
-
-
- mstreamModule.resetPositionCache = function(){
- var len;
-
- var lPlayer = getCurrentPlayer();
- var curSong = lPlayer.songObject;
-
- for(var i=0, len=mstreamModule.playlist.length; i < len; i++){
- // Check if this is the current song
- if(curSong === mstreamModule.playlist[i]){
- mstreamModule.positionCache.val = i;
- return;
- }
- }
-
- // No song found, reset
- mstreamModule.positionCache.val = -1;
- }
-
-
-
- // ========================= Aurora Player ===============
- // Shell for interacting with Aurora
- function AVPlayerPlay(){
- var localPlayer = getCurrentPlayer();
-
- if(localPlayer.playerObject.playing){
- return;
- }
- localPlayer.playerObject.play();
- mstreamModule.playerStats.playing = true;
-
- }
- function AVPlayerPause(){
- var localPlayer = getCurrentPlayer();
-
- localPlayer.playerObject.pause();
- mstreamModule.playerStats.playing = false;
-
- }
- function AVPlayerPlayPause(){
- var localPlayer = getCurrentPlayer();
-
- // TODO: Check that media is loaded
- if(localPlayer.playerObject.playing){
- localPlayer.playerObject.pause();
- mstreamModule.playerStats.playing = false;
- }else{
- localPlayer.playerObject.play();
- mstreamModule.playerStats.playing = true;
- }
- }
- // ========================================================
-
-
-
-
-
- // ========================= Howler Player ===============
- function howlPlayerPlay(){
- var localPlayer = getCurrentPlayer();
- mstreamModule.playerStats.playing = true;
-
- localPlayer.playerObject.play();
- }
- function howlPlayerPause(){
- var localPlayer = getCurrentPlayer();
- mstreamModule.playerStats.playing = false;
-
- localPlayer.playerObject.pause();
- }
- function howlPlayerPlayPause(){
- var localPlayer = getCurrentPlayer();
-
- // TODO: Check that media is loaded
- if(localPlayer.playerObject.playing()){
- mstreamModule.playerStats.playing = false;
- localPlayer.playerObject.pause();
- }else{
- localPlayer.playerObject.play();
- mstreamModule.playerStats.playing = true;
-
- }
- }
- // ========================================================
-
-
-
- // ========================= Youtube Player ===============
- var YTPlayer;
- // TODO:
- // ========================================================
-
-
- function clearEnd(){
- var localPlayer = getCurrentPlayer();
-
- if(localPlayer.playerType === 'aurora' ){
- localPlayer.playerObject.on("end", function() {
- return
- }, false);
- }else if(localPlayer.playerType === 'howler'){
- localPlayer.playerObject.off('end');
- }
- }
-
-
-
- // Player
- // Event: On Song end
- // Set Media
- // Play, pause, skip, etc
- mstreamModule.playPause = function(){
- var localPlayer = getCurrentPlayer();
-
- if(localPlayer.playerType === 'aurora' ){
- return AVPlayerPlayPause();
- }else if(localPlayer.playerType === 'howler'){
- return howlPlayerPlayPause();
- }
- }
-
-
- mstreamModule.playerStats = {
- duration:0,
- currentTime:0,
- playing: false,
- repeat: false,
- shuffle:false,
- metadata: {
- "artist": false,
- "album": false,
- "track": false,
- "title": false,
- "year": false,
- "album-art": false,
- "filepath": false,
- }
- }
-
- var playerA = {
- playerType: false,
- playerObject: false,
- songObject: false
- }
- var playerB = {
- playerType: false,
- playerObject: false,
- songObject: false
- }
-
- var curP = 'A';
-
- function setMedia(song, player, play){
-
-
- if(song.url.indexOf('.flac') !== -1 && Howler.codecs('flac') === false ){
- // Set via aurora
- player.playerType = 'aurora';
-
-
- player.playerObject = AV.Player.fromURL(song.url);
- player.playerObject.on("end", function() {
- callMeOnStreamEnd();
- }, false);
- // Handle error event
- player.playerObject.on("error", function(e) {
- // TODO: GO TO NEXT SONG
- }, false);
- player.playerObject.on("metadata", function() {
- // Move this to metadata ???
- if(play == true){
- AVPlayerPlay();
- }
- }, false);
-
- player.playerObject.preload();
-
-
-
-
- }else{
- player.playerType = 'howler';
-
- player.playerObject = new Howl({
- src: [song.url],
- html5: true, // Force to HTML5. Otherwise streaming will suck
- // onplay: function() { },
- onload: function() {
-
- },
- onend: function() {
- callMeOnStreamEnd();
- },
- onpause: function() {
- },
- onstop: function() {
- },
- onplay: function(){
- }
- });
-
- if(play == true){
- howlPlayerPlay();
- }
- }
-
- player.songObject = song;
- }
-
-
-
- function callMeOnStreamEnd(){
- mstreamModule.playerStats.playing= false;
-
- // Go to next song
- goToNextSong();
- }
-
-
-
-
-
-// NOTE: Seektime is in seconds
-mstreamModule.seek = function(seekTime){
- var lPlayer = getCurrentPlayer();
- if(lPlayer.playerType === 'aurora' ){
- // Do nothing, auroradoesn't support seeking right now
- return false;
- }else if(lPlayer.playerType === 'howler'){
- // Check that the seek number is less than the duration
- if(seekTime < 0 || seekTime > lPlayer.playerObject._duration){
- return false;
- }
-
- lPlayer.playerObject.seek(seektime)
- }
-
-}
-
-mstreamModule.seekByPercentage = function(percentage){
- if(percentage < 0 || percentage > 99){
- return false;
- }
- var lPlayer = getCurrentPlayer();
-
- if(lPlayer.playerType === 'aurora' ){
- // Do nothing, auroradoesn't support seeking
- return false;
- }else if(lPlayer.playerType === 'howler'){
- var seektime = (percentage * lPlayer.playerObject._duration)/ 100;
- lPlayer.playerObject.seek(seektime)
- }
-
-}
-
-
-
- var timers = {};
-
- function startTime(interval) {
- if (timers.sliderUpdateInterval) { clearInterval(timers.sliderUpdateInterval); }
-
-
- timers.sliderUpdateInterval = setInterval( function(){
- var lPlayer = getCurrentPlayer();
-
- if(lPlayer.playerType === 'aurora' ){
- mstreamModule.playerStats.duration = lPlayer.playerObject.duration / 1000;
- mstreamModule.playerStats.currentTime = lPlayer.playerObject.currentTime / 1000;
- }else if(lPlayer.playerType === 'howler'){
- mstreamModule.playerStats.currentTime = lPlayer.playerObject.seek();
- mstreamModule.playerStats.duration = lPlayer.playerObject._duration;
-
- }else{
- // NO PLAYER, set default values
- mstreamModule.playerStats.currentTime = 0;
- mstreamModule.playerStats.duration = 0;
- }
-
- }, interval);
- }
- startTime(100);
-
- function clearTimer(){
- clearInterval(timers.sliderUpdateInterval);
- }
-
-
- // Timer for caching. Helps prevent excess cahing due to button mashing
- var cacheTimer;
- function setCachedSong(position){
-
- console.log(' ATTEMPTING TO CACHE');
- if(!mstreamModule.playlist[position]){
- console.log(' FAILED TO CACHE');
- return false;
- }
-
- var oPlayer = getOtherPlayer();
- setMedia(mstreamModule.playlist[position], oPlayer, false);
- console.log(' IT CACHED!!!!!!');
- console.log(mstreamModule.playlist[position]);
-
- return true;
- }
-
-
- // Loop
- mstreamModule.playerStats.shouldLoop = false;
- mstreamModule.setRepeat = function(newValue){
- if(typeof(newValue) != "boolean"){
- return false;
- }
- mstreamModule.playerStats.shouldLoop = newValue;
- return newValue;
- }
- mstreamModule.toggleRepeat = function(){
- mstreamModule.playerStats.shouldLoop = !mstreamModule.playerStats.shouldLoop;
- return mstreamModule.playerStats.shouldLoop;
- }
-
- // Random Song
- mstreamModule.playerStats.shuffle = false;
- shuffleCache = []; // Cache the last 5 songs played to avoid repeats
- shufflePrevious = [];
- mstreamModule.setShuffle = function(newValue){
- if(typeof(newValue) != "boolean"){
- return false;
- }
-
- if(newValue===true){
- newShuffle();
- }else{
- turnShuffleOff();
- }
-
- mstreamModule.playerStats.shuffle = newValue;
- return true;
- }
- mstreamModule.toggleShuffle = function(){
- mstreamModule.playerStats.shuffle = !mstreamModule.playerStats.shuffle;
- if(mstreamModule.playerStats.shuffle === true){
- newShuffle();
- }else{
- turnShuffleOff();
- }
- return mstreamModule.playerStats.shuffle;
- }
-
- function newShuffle(){
- shuffleCache = shuffle(mstreamModule.playlist.slice(0));
- }
-
- function turnShuffleOff(){
- shufflePrevious = [];
- shuffleCache = [];
- }
-
- function shuffle(array) {
- var currentIndex = array.length
- , temporaryValue
- , randomIndex
- ;
-
- // While there remain elements to shuffle...
- while (0 !== currentIndex) {
-
- // Pick a remaining element...
- randomIndex = Math.floor(Math.random() * currentIndex);
- currentIndex -= 1;
-
- // And swap it with the current element.
- temporaryValue = array[currentIndex];
- array[currentIndex] = array[randomIndex];
- array[randomIndex] = temporaryValue;
- }
-
- return array;
- }
-
- // Return an object that is assigned to Module
- return mstreamModule;
-}());
diff --git a/webapp2/js/mstream.vue-browser.js b/webapp2/js/mstream.vue-browser.js
deleted file mode 100644
index 549d126..0000000
--- a/webapp2/js/mstream.vue-browser.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var VUEBROWSER = function() {
-
- // Auto Focus
- Vue.directive('focus', {
- // When the bound element is inserted into the DOM...
- inserted: function (el) {
- // Focus the element
- el.focus()
- }
- });
-
-
- var loginPanel = new Vue({
- el: '#login-overlay',
- data: {
- needToLogin: false,
- error: false,
- errorMessage: 'Login Failed',
- pending: false
- },
- methods: {
- submitCode: function(e){
- // Get Code
- this.pending = true;
- var that = this;
- MSTREAMAPI.login($('#login-username').val(), $('#login-password').val(), function(response, error){
- if(error !== false){
- // Alert the user
- that.pending = false;
- that.error = true;
- return;
- }
-
- // Eye-candy: change the error message
- that.errorMessage = "Welcome To mStream!";
-
- // Add the token to the cookies
- Cookies.set('token', response.token);
-
- // Add the token the URL calls
- MSTREAMAPI.updateCurrentServer($('#login-username').val(), response.token, response.vPath)
-
- // TODO: Add function to load up either the file browser or artist panel
-
- // Remove the overlay
- $('.login-overlay').fadeOut( "slow" ); // TDO: Figure out how to use Vue to fade the modal in and out
- that.pending = false;
- that.needToLogin = false;
- });
- }
- }
- });
-
-
- function testIt(token){
- if(token){
- MSTREAMAPI.currentServer.token = token;
- }
-
- MSTREAMAPI.ping( function(response, error){
- if(error !== false){
- // NOTE: There needs to be a split here
- // For the webapp we simply display the login panel
- loginPanel.needToLogin = true;
- // TODO: Move this transitionstuff to vue
- $('.login-overlay').fadeIn( "slow" );
- // For electron we need to alert the user that user it failed and guide them to the login form
-
- return;
- }
- // set vPath
- MSTREAMAPI.currentServer.vPath = response.vPath;
-
- // TODO: Add function to load up either the file browser or artist panel
-
- });
- }
-
- // NOTE: There needs to be a split here
- // For the normal webap we just get the token
- // var token = Cookies.get('token');
- testIt(Cookies.get('token'));
- // For electron we need to pull it from wherever electron stores things
-
-
-};
diff --git a/webapp2/js/mstream.vue-player-controls.js b/webapp2/js/mstream.vue-player-controls.js
deleted file mode 100644
index 9ac16aa..0000000
--- a/webapp2/js/mstream.vue-player-controls.js
+++ /dev/null
@@ -1,235 +0,0 @@
-var VUEPLAYER = function() {
-
- // Template for playlist items
- Vue.component('playlist-item', {
- template: '\
- \
- {{ comtext }} X\
- \
- ',
-
- props: [ 'index', 'song'],
-
- // We need the positionCache to track the currently playing song
- data: function(){
- return {
- positionCache: MSTREAMPLAYER.positionCache,
- }
- },
-
- // Methods used by playlist item events
- methods: {
- // Go to a song on item click
- goToSong: function(event){
- MSTREAMPLAYER.goToSongAtPosition(this.index);
- },
- // Remove song
- removeSong: function(event){
- MSTREAMPLAYER.removeSongAtPosition(this.index, false);
- }
- },
-
- computed: {
- comtext: function() {
- var returnThis = this.song.filepath;
-
- if(this.song.metadata.title){
- returnThis = this.song.metadata.title;
- if(this.song.metadata.artist){
- returnThis = this.song.metadata.artist + ' - ' + returnThis;
- }
-
- }
-
- return returnThis;
- }
- }
- });
-
- // Code to update playlist
- var playlistElement = new Vue({
- el: '#playlist',
- data: {
- playlist: MSTREAMPLAYER.playlist,
- },
- methods: {
- // checkMove is called when a drag-and-drop action happens
- checkMove: function (event) {
- MSTREAMPLAYER.resetPositionCache();
- }
- }
- });
-
-
- var progressBar = new Vue({
- el: '#mstream-player',
- data: {
- playerStats: MSTREAMPLAYER.playerStats,
- playlist: MSTREAMPLAYER.playlist,
- positionCache: MSTREAMPLAYER.positionCache,
- met: MSTREAMPLAYER.playerStats.metadata
- },
- computed: {
- imgsrc: function () {
- return "/public/img/"+(this.playerStats.playing ? 'pause' : 'play')+"-white.svg";
- },
- widthcss: function ( ) {
- if(this.playerStats.duration === 0){
- return "width:0";
- }
-
- var percentage = 100 - (( this.playerStats.currentTime / this.playerStats.duration) * 100);
- return "width:calc(100% - "+percentage+"%)";
- },
-
- showTime: function(){
- if (this.playerStats.duration === 0) {
- return '';
- }
-
- var curr = this.playerStats.duration - this.playerStats.currentTime;
- var minutes = Math.floor(curr / 60);
- var secondsToCalc = Math.floor(curr % 60) + '';
- var currentText = minutes + ':' + (secondsToCalc.length < 2 ? '0' + secondsToCalc : secondsToCalc);
-
- return currentText;
- },
-
- currentSongText: function(){
- // TODO: Handle metadata
-
- // Call these vars so updates cahnge whenever they do
- var posit = this.positionCache.val;
- var plist = this.playlist;
- var playerStats = this.playerStats;
- var titleX = this.met.title;
- var metx = this.met;
-
-
-
- var currentSong = MSTREAMPLAYER.getCurrentSong();
-
- if(currentSong === false){
- return '\u00A0\u00A0\u00A0Welcome To mStream!\u00A0\u00A0\u00A0';
- }
-
- // Get current song straight from the source
- var returnText = '';
- if(playerStats.metadata && titleX){
- returnText = titleX;
- if(playerStats.metadata.artist){
- returnText = playerStats.metadata.artist + ' - ' + returnText;
- }
- }else{
- // Use filepath instead
- var filepathArray = currentSong.filepath.split("/");
- returnText = filepathArray[filepathArray.length-1]
- }
-
- console.log(MSTREAMPLAYER.playerStats.metadata);
-
-
- return '\u00A0\u00A0\u00A0' + returnText + '\u00A0\u00A0\u00A0';
- }
- },
- methods: {
- toggleRepeat: function(){
- MSTREAMPLAYER.toggleRepeat();
- },
- toggleShuffle: function(){
- MSTREAMPLAYER.toggleShuffle();
- }
- }
- });
-
-
- var metadataPanel = new Vue({
- el: '#metadata-panel',
- data: {
- meta: MSTREAMPLAYER.playerStats.metadata
- },
- computed: {
- albumArtPath: function(){
- if(!this.meta['album-art']){
- return '/public/img/default.png';
- }
- return '/album-art/' + this.meta['album-art'];
- }
- }
-
- });
-
-
-
-
-
- // Button Events
- document.getElementById( "progress-bar" ).addEventListener("click",function(event) {
- var relativeClickPosition = event.clientX - this.getBoundingClientRect().left;
- var totalWidth = this.getBoundingClientRect().width;
- var percentage = (relativeClickPosition / totalWidth) * 100;
- // Set Player time
- MSTREAMPLAYER.seekByPercentage(percentage);
- });
-
- // Button Events
- document.getElementById( "next-button" ).addEventListener("click",function() {
- MSTREAMPLAYER.nextSong();
- });
- document.getElementById( "play-pause-button" ).addEventListener("click", function() {
- MSTREAMPLAYER.playPause();
- });
- document.getElementById("previous-button").addEventListener("click", function(){
- MSTREAMPLAYER.previousSong();
- });
-
- // This makes the title text scroll back and forth
- var scrollTimer;
- var scrollRight = true; //Track Scroll Direction
- function startTime(interval) {
- if (scrollTimer) { clearInterval(scrollTimer); }
-
- scrollTimer = setInterval( function(){
- // Get the max scroll distance
- var maxScrollLeft = document.getElementById('title-text').scrollWidth - document.getElementById('title-text').clientWidth;
-
- // Change the scroll direction if necessary
- // TODO: Pause for a second when these conditions are hit
- if(document.getElementById('title-text').scrollLeft > (maxScrollLeft - 1)){
- scrollRight = false;
- }
- if(document.getElementById('title-text').scrollLeft === 0){
- scrollRight = true;
- }
-
- // Do the scroll
- if(scrollRight === true){
- document.getElementById('title-text').scrollLeft = document.getElementById('title-text').scrollLeft + 2;
- }else{
- document.getElementById('title-text').scrollLeft = document.getElementById('title-text').scrollLeft - 2;
- }
- }, interval);
- }
- startTime(50);
-
-
-
- // Change spacebar behviour to Play/PauseListen to every key press user makes
- // Useful for adding media functionality to certain keys
- window.addEventListener("keydown", function(event){
- // Use default behavior if user is in a form
- var element = event.target.tagName.toLowerCase();
- if(element == 'input' || element == 'textarea'){
- return;
- }
-
- // Check the key
- switch (event.keyCode) {
- case 32: //SpaceBar
- event.preventDefault();
- MSTREAMPLAYER.playPause();
- break;
- }
- return false;
- }, false);
-};
diff --git a/webapp2/mstream.html b/webapp2/mstream.html
deleted file mode 100644
index e449de9..0000000
--- a/webapp2/mstream.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- mStream Media Player - All your media. Everywhere you go.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The rest of the webapp goes here
-
-
diff --git a/webapp2/mstreamdb.lite b/webapp2/mstreamdb.lite
deleted file mode 100644
index f3228d4..0000000
Binary files a/webapp2/mstreamdb.lite and /dev/null differ
\
- {{ comtext }} X\
-
\
- ',
-
- props: [ 'index', 'song'],
-
- // We need the positionCache to track the currently playing song
- data: function(){
- return {
- positionCache: MSTREAMPLAYER.positionCache,
- }
- },
-
- // Methods used by playlist item events
- methods: {
- // Go to a song on item click
- goToSong: function(event){
- MSTREAMPLAYER.goToSongAtPosition(this.index);
- },
- // Remove song
- removeSong: function(event){
- MSTREAMPLAYER.removeSongAtPosition(this.index, false);
- }
- },
-
- computed: {
- comtext: function() {
- var returnThis = this.song.filepath;
-
- if(this.song.metadata.title){
- returnThis = this.song.metadata.title;
- if(this.song.metadata.artist){
- returnThis = this.song.metadata.artist + ' - ' + returnThis;
- }
-
- }
-
- return returnThis;
- }
- }
- });
-
- // Code to update playlist
- var playlistElement = new Vue({
- el: '#playlist',
- data: {
- playlist: MSTREAMPLAYER.playlist,
- },
- methods: {
- // checkMove is called when a drag-and-drop action happens
- checkMove: function (event) {
- MSTREAMPLAYER.resetPositionCache();
- }
- }
- });
-
-
- var progressBar = new Vue({
- el: '#mstream-player',
- data: {
- playerStats: MSTREAMPLAYER.playerStats,
- playlist: MSTREAMPLAYER.playlist,
- positionCache: MSTREAMPLAYER.positionCache,
- met: MSTREAMPLAYER.playerStats.metadata
- },
- computed: {
- imgsrc: function () {
- return "/public/img/"+(this.playerStats.playing ? 'pause' : 'play')+"-white.svg";
- },
- widthcss: function ( ) {
- if(this.playerStats.duration === 0){
- return "width:0";
- }
-
- var percentage = 100 - (( this.playerStats.currentTime / this.playerStats.duration) * 100);
- return "width:calc(100% - "+percentage+"%)";
- },
-
- showTime: function(){
- if (this.playerStats.duration === 0) {
- return '';
- }
-
- var curr = this.playerStats.duration - this.playerStats.currentTime;
- var minutes = Math.floor(curr / 60);
- var secondsToCalc = Math.floor(curr % 60) + '';
- var currentText = minutes + ':' + (secondsToCalc.length < 2 ? '0' + secondsToCalc : secondsToCalc);
-
- return currentText;
- },
-
- currentSongText: function(){
- // TODO: Handle metadata
-
- // Call these vars so updates cahnge whenever they do
- var posit = this.positionCache.val;
- var plist = this.playlist;
- var playerStats = this.playerStats;
- var titleX = this.met.title;
- var metx = this.met;
-
-
-
- var currentSong = MSTREAMPLAYER.getCurrentSong();
-
- if(currentSong === false){
- return '\u00A0\u00A0\u00A0Welcome To mStream!\u00A0\u00A0\u00A0';
- }
-
- // Get current song straight from the source
- var returnText = '';
- if(playerStats.metadata && titleX){
- returnText = titleX;
- if(playerStats.metadata.artist){
- returnText = playerStats.metadata.artist + ' - ' + returnText;
- }
- }else{
- // Use filepath instead
- var filepathArray = currentSong.filepath.split("/");
- returnText = filepathArray[filepathArray.length-1]
- }
-
- console.log(MSTREAMPLAYER.playerStats.metadata);
-
-
- return '\u00A0\u00A0\u00A0' + returnText + '\u00A0\u00A0\u00A0';
- }
- },
- methods: {
- toggleRepeat: function(){
- MSTREAMPLAYER.toggleRepeat();
- },
- toggleShuffle: function(){
- MSTREAMPLAYER.toggleShuffle();
- }
- }
- });
-
-
- var metadataPanel = new Vue({
- el: '#metadata-panel',
- data: {
- meta: MSTREAMPLAYER.playerStats.metadata
- },
- computed: {
- albumArtPath: function(){
- if(!this.meta['album-art']){
- return '/public/img/default.png';
- }
- return '/album-art/' + this.meta['album-art'];
- }
- }
-
- });
-
-
-
-
-
- // Button Events
- document.getElementById( "progress-bar" ).addEventListener("click",function(event) {
- var relativeClickPosition = event.clientX - this.getBoundingClientRect().left;
- var totalWidth = this.getBoundingClientRect().width;
- var percentage = (relativeClickPosition / totalWidth) * 100;
- // Set Player time
- MSTREAMPLAYER.seekByPercentage(percentage);
- });
-
- // Button Events
- document.getElementById( "next-button" ).addEventListener("click",function() {
- MSTREAMPLAYER.nextSong();
- });
- document.getElementById( "play-pause-button" ).addEventListener("click", function() {
- MSTREAMPLAYER.playPause();
- });
- document.getElementById("previous-button").addEventListener("click", function(){
- MSTREAMPLAYER.previousSong();
- });
-
- // This makes the title text scroll back and forth
- var scrollTimer;
- var scrollRight = true; //Track Scroll Direction
- function startTime(interval) {
- if (scrollTimer) { clearInterval(scrollTimer); }
-
- scrollTimer = setInterval( function(){
- // Get the max scroll distance
- var maxScrollLeft = document.getElementById('title-text').scrollWidth - document.getElementById('title-text').clientWidth;
-
- // Change the scroll direction if necessary
- // TODO: Pause for a second when these conditions are hit
- if(document.getElementById('title-text').scrollLeft > (maxScrollLeft - 1)){
- scrollRight = false;
- }
- if(document.getElementById('title-text').scrollLeft === 0){
- scrollRight = true;
- }
-
- // Do the scroll
- if(scrollRight === true){
- document.getElementById('title-text').scrollLeft = document.getElementById('title-text').scrollLeft + 2;
- }else{
- document.getElementById('title-text').scrollLeft = document.getElementById('title-text').scrollLeft - 2;
- }
- }, interval);
- }
- startTime(50);
-
-
-
- // Change spacebar behviour to Play/PauseListen to every key press user makes
- // Useful for adding media functionality to certain keys
- window.addEventListener("keydown", function(event){
- // Use default behavior if user is in a form
- var element = event.target.tagName.toLowerCase();
- if(element == 'input' || element == 'textarea'){
- return;
- }
-
- // Check the key
- switch (event.keyCode) {
- case 32: //SpaceBar
- event.preventDefault();
- MSTREAMPLAYER.playPause();
- break;
- }
- return false;
- }, false);
-};
diff --git a/webapp2/mstream.html b/webapp2/mstream.html
deleted file mode 100644
index e449de9..0000000
--- a/webapp2/mstream.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
- The rest of the webapp goes here
-
-
diff --git a/webapp2/mstreamdb.lite b/webapp2/mstreamdb.lite
deleted file mode 100644
index f3228d4..0000000
Binary files a/webapp2/mstreamdb.lite and /dev/null differ