Version 0.5.0 29.05.2023_01

Final file changes for release 0.5.0

.vs/VSWorkspaceState.json

@@ -3,10 +3,10 @@
     "",
     "\\app",
     "\\app\\data",
+    "\\app\\html",
     "\\app\\js",
-    "\\docs",
-    "\\docs\\css"
+    "\\docs"
   ],
-  "SelectedNode": "\\app\\js\\index.js",
+  "SelectedNode": "\\docs\\index.html",
   "PreviewInSolutionExplorer": false
 }

LICENSE.txt

@@ -2,7 +2,7 @@ ISC License
 
 
 
-Copyright (c) 2020, Geoff Peerless
+Copyright (c) 2023, Geoff Peerless
 
 
 

UPDATE LOG.txt

@@ -87,9 +87,12 @@
 6. Animation added when displaying large album artwork.
 7. Minor bug fixes in playlist and search functions.
 
-**** VERSION 0.4.1 UPDATES ****
+**** VERSION 0.5.0 UPDATES ****
 1. Bug fix when fetching album info from wikidata.
 2. Database Edit Cancel button rerouted back to artist albums instead of homepage.
 3. Link added from artists album page to display all songs for an artist.
+4. Small redsign of the main menu.
+5. Pi-PLayer functions added to the top menu bar. See the website for full details about the new Peerless-Pi-Player.
+
 
 

app/data/pi_data.json

@@ -1 +1 @@
-{"artist":"Peerless-Pi-Player", "album":"It's Music To Your Ears", "track":"", "playTime":"", "favourite":" ", "timeStamp":"Mon May 15 2023 10:33:58 GMT+0100 (British Summer Time)"}
+{"artist":"Peerless-Pi-Player", "album":"It's Music To Your Ears", "track":"", "playTime":"", "favourite":" ", "timeStamp":"Sun May 28 2023 21:17:51 GMT+0100 (British Summer Time)"}

app/html/newreleases.html

@@ -22,7 +22,16 @@ <h2 id="numberNewReleases"></h2>
             <ul id="ulNewReleases"></ul>
         </div>
     </div>
+
+    <div class="divCredits">
+        <p><i>Data supplied by spotify.com</i></p>
+        <br />
+        <br />
+    </div>
+
 </div>
 
+
+
 <!-- Link to page's Javascript file-->
 <script src="./js/newreleases.js" type="text/javascript"></script>

app/html/recommendations.html

@@ -14,6 +14,11 @@ <h2 style="margin-right: 1em;" id="recommendsDetails"></h2>
     </div>
 </div>
 
+<div class="divCredits">
+    <p><i>Data supplied by spotify.com</i></p>
+    <br />
+    <br />
+</div>
 
 <!-- Link to page's Javacript file-->
 <script src="./js/recommendations.js" type="text/javascript"></script>

app/html/userguide.html

@@ -22,6 +22,7 @@ <h2>Quick Menu</h2>
         <span class="anchor" id="started"></span>
         <h2>1. Getting Started</h2>
         <div class="help">
+            <h3>1.1 First Things First</h3>
             <ol type="1">
                 <li>
                     On the menu bar click on <b>File</b> and then <b>Settings.</b> This will take you to the Settings page where you can customise the app.
@@ -336,6 +337,7 @@ <h3>4.7 Smart Playlist</h3>
         <span class="anchor" id="adding"></span>
         <h2>5. Adding Music to Peerless Player</h2>
         <div class="help">
+            <h3>5.1 How to Add Music</h3>
             <ol type="1">
                 <li>
                     Add a ripped CD or music download to your Music directory with music files in .mp3 .m4a .flac or (.wav not recommended) format. If the artist is new to your music collection, add the artist folder containing the album folder or if the artist already exists, add the album folder to the existing artist folder in your music directory.
@@ -380,6 +382,7 @@ <h2>5. Adding Music to Peerless Player</h2>
         <span class="anchor" id="editing"></span>
         <h2>6. Editing Music in the Database</h2>
         <div class="help">
+            <h3>6.1 How to Edit Music</h3>
             <ol type="1">
                 <li>
                     To edit an album in the database, display the album and click on the <b>Edit</b> button next to the album artwork.
@@ -409,6 +412,7 @@ <h2>6. Editing Music in the Database</h2>
         <span class="anchor" id="deleting"></span>
         <h2>7. Deleting Music from the Database</h2>
         <div class="help">
+            <h3>7.1 How to Delete Music</h3>
             <ol type="1">
                 <li>
                     To delete an album from the database, display the album and click on the <b>Edit</b> button next to the album artwork.
@@ -434,6 +438,7 @@ <h2>7. Deleting Music from the Database</h2>
         <span class="anchor" id="settings"></span>
         <h2>8. App Settings</h2>
         <div class="help">
+            <h3>8.1 Personalise Your Player</h3>
             <ol type="1">
                 <li>
                     From the <b>File</b> menu, click on <b>Settings</b>, to display the App Settings page. From here you can change the below settings.
@@ -451,6 +456,7 @@ <h2>8. App Settings</h2>
         <span class="anchor" id="sync"></span>
         <h2>9. Syncing External Music Directory</h2>
         <div class="help">
+            <h3>9.1 Sync Your Music</h3>
             <ol type="1">
                 <li>
                     Insert your SD card/USB drive and from the <b>File</b> menu or <b>Database Functions</b> click on <b>Sync External Directory</b>.

app/js/index.js

@@ -331,7 +331,7 @@ ipcRenderer.on('Help Release', (event) => {
     $('#okModalText').empty();
     $(".modalFooter").empty();
     $('.modalHeader').append('<span id="btnXModal">&times;</span><h2>Release Notes Version: ' + global_Version + '</h2>');
-    $('#okModalText').append("<div class='modalIcon'><img src='./graphics/peerless_player_thumb.png'></div><p>1. Music recommendations added to artist page.<br>2. New music releases function added to player menu.<br>3. Back To Top button added to all pages once scrolled.<br>4. Error handling added to ajax remote server requests.<br>5. Smooth srcolling added to A - Z menu.<br>6. Animation added when displaying large album artwork.<br>7. Minor bug fixes in playlist and search functions.<br></p >");//<br> &nbsp
+    $('#okModalText').append("<div class='modalIcon'><img src='./graphics/peerless_player_thumb.png'></div><p>1. Bug fix when fetching album info from wikidata.<br>2. Database Edit Cancel button rerouted back to artist albums instead of homepage.<br>3. Link added from artists album page to display all songs for an artist.<br>4. Small redsign of the main menu.<br>5. Pi-Player functions added to the top menu bar. See the website for full details about the new Peerless-Pi-Player.<br></p >");//<br> &nbsp
     var buttons = $("<button class='btnContent' id='btnOkModal'>OK</button>");
     $('.modalFooter').append(buttons);
     $("#btnOkModal").focus();

docs/index.html

@@ -65,7 +65,7 @@ <h3>A desktop app to organise, listen and explore your off-line music collection
             <div class="container">
                 <div class="divLeft">
                     <!-- ###### LATEST RELEASE DOWNLOAD ####### -->
-                    <a href="https://github.com/MrPeerless/peerless-player/releases/download/v0.4.0/peerless-player-Setup-0.4.0.exe"><img src="./graphics/download.png" /></a>
+                    <a href="https://github.com/MrPeerless/peerless-player/releases/download/v0.5.0/peerless-player-Setup-0.5.0.exe"><img src="./graphics/download.png" /></a>
 
                 </div>
                 <div class="divMiddle">

docs/pages_news.html

@@ -39,9 +39,22 @@
         <h1>Peerless Player News</h1>
         <br />
 
+        <h2>Latest Release: Version 0.5.0</h2>
+        <br />
+        <div class="divSingle">
+            <h3>May 2023 - What's New</h3>
+            <br />
+            <p><b>Release Date: 29.05.2023</b></p>
+            <p>The Peerless-Pi-Player project has been completed and Peerless Player has been updated to connect to a Peerless-Pi-Player so you can view album art and track details of the current playing song in Peerless Player on a remote screen, such as your flat-screen TV or remote monitor using a Raspberry Pi. For more details please see the Pi-Player page of this website.</p><br />
+            <p>The number of songs on the artist&apos;s album page above the biography button has been linked to display a table of all the artist&apos;s songs. This table can be sorted and filtered as required.</p><br />
+            <p>There have been a few bug fixes and small changes. A bug while fetching album information from Wikidata has been fixed. There has been a small redesign of the main top menu and when editing the database, the cancel button will now take you back to the artist&apos;s album page instead of the home page.</p><br />
+            <p>Security updates. Sqlite3 bumped from 5.1.4 to 5.1.5 and http-cache-semantics bumped from 4.1.0 to 4.1.1.</p><br />
+        </div>
+        <br />
+        <br />
+
         <h2>Peerless-Pi-Player</h2>
         <br />
-
         <div class="divSingle">
             <h3>April 2023 - Coming Soon</h3>
             <br />

docs/pages_pi-player.html

@@ -82,7 +82,7 @@ <h3>Hardware</h3>
                 <li>Raspberry Pi 3 or above.</li>
                 <li>Official Raspberry Pi Power Supply.</li>
                 <li>16gb Micro SD Card or above.</li>
-                <li>A case of your choice. I have used the Pibow 3 A+ Coupé.</li>
+                <li>A case of your choice. I have used the Pibow 3 A+ Coupe.</li>
                 <li>HDMI cable.</li>
             </ul>
         </div>

docs/pages_userguide.html

@@ -786,7 +786,7 @@ <h3>11.2 Menu Options</h3>
                         Open Pi-Player. Click to open the Pi-Player in a full screen Chromium browser on your remote screen.
                     </li>
                     <li>
-                        Re-Send Track data. Click if you need to resend data from Peerless player to the Pi-Player. For example if you open Pi-Player while a song is playing, it won’t update until the next song is played.
+                        Re-Send Track data. Click if you need to resend data from Peerless player to the Pi-Player. For example if you open Pi-Player while a song is playing, it will not update until the next song is played.
                     </li>
                     <li>
                         Close Pi-Player. Click to close the Pi-Player.

main.js

@@ -1022,9 +1022,6 @@ ipcMain.on('ssh_artworkfile', (event, data) => {
     var artworkFile;
     var newDate = Date().toLocaleString();
 
-    // Location of file on HP Desktop
-    //const fileToReceive = "/Users/geoff/Documents/Tunes/pi-player/graphics/folder.jpg"
-
     // Location of file on pi-player
     const fileToReceive = "/home/" + userName + "/Documents/pi-player/graphics/tempFolder.jpg"
 
@@ -1046,7 +1043,9 @@ ipcMain.on('ssh_artworkfile', (event, data) => {
     fs.writeFileSync("./app/data/pi_data.json", jsonData)
 
     // Send art file first
-    sendFile([fileToSend, fileToReceive, ipAddress, userName, password])
+    if (ipAddress) {
+        sendFile([fileToSend, fileToReceive, ipAddress, userName, password])
+    }  
 });
 
 // Function to send files by sftp to pi-player
@@ -1076,7 +1075,6 @@ function sendFile(data) {
 
             writeStream.on('close', function () {
                 if (fileToReceive == "/home/" + userName + "/Documents/pi-player/graphics/tempFolder.jpg") {
-                    console.log("Transfer folder.jpg complete")
                     shellCommand(['mv /home/' + userName + '/Documents/pi-player/graphics/tempFolder.jpg /home/' + userName + '/Documents/pi-player/graphics/folder.jpg\n', ipAddress, userName, password])
                     conn.end();
                 }
@@ -1123,7 +1121,6 @@ function shellCommand(data) {
 
     // Connection successful
     conn.on('ready', () => {
-        console.log('Shell Client Stream :: ready');
         conn.shell(false, { pty: true }, function (err, stream) {
             if (err) throw err;
             stream.on('close', function () {
@@ -1151,87 +1148,3 @@ function shellCommand(data) {
         password: password
     });
 };
-
-
-
-
-/*
-// Connect to remote server using SSH
-const { Client } = require('ssh2');
-const conn = new Client();
-
-// Connection error handling
-conn.on('error', function (e) {
-    console.log("ERROR connecting :: " + e);
-});
-
-// Connection successful
-conn.on('ready', () => {
-    conn.sftp(function (err, sftp) {
-        if (err) throw err;
-        // Get length of array of files to send
-        let filesToSendLength = filesToSend.length;
-
-        var i = 0; 
-        function sendFiles() {
-            setTimeout(function () {
-
-                // Local directory path
-                var readStream = fs.createReadStream(filesToSend[i]);
-                // Remote directory location; include the file name
-                var writeStream = sftp.createWriteStream(filesToRecieve[i]);
-
-                writeStream.on('close', function () {
-                    console.log("- file transferred succesfully")
-                    if (filesToRecieve[i - 1] == "/home/geoff/Documents/pi-player/graphics/tempFolder.jpg") {
-                        console.log("Transfer folder.jpg complete")
-                        shellCommand(['mv /home/geoff/Documents/pi-player/graphics/tempFolder.jpg /home/geoff/Documents/pi-player/graphics/folder.jpg\n', ipAddress, userName, password])
-                    }
-                });
-
-                writeStream.on('end', function () {
-                    console.log("sftp connection closed");
-                    conn.close();
-                });
-
-                // Initiate transfer of file
-                readStream.pipe(writeStream);
-
-                i++;
-                if (i < filesToSendLength) {
-                    sendFiles()
-                }
-            }, 600)
-        }
-        sendFiles()
-
-        
-        // Loop through files to send to remote server
-        for (let i = 0; i < filesToSendLength; i++) {
-            // Local directory path
-            var readStream = fs.createReadStream(filesToSend[i]);
-            // Remote directory location; include the file name
-            var writeStream = sftp.createWriteStream(filesToRecieve[i]);
-
-            writeStream.on('close', function () {
-                console.log("- file transferred succesfully");
-            });
-
-            writeStream.on('end', function () {
-                console.log("sftp connection closed");
-                conn.close();
-            });
-
-            // Initiate transfer of file
-            readStream.pipe(writeStream);
-        }
-        
-    });
-// Connection details of remote server
-}).connect({
-    host: ipAddress,
-    port: 22,
-    username: userName,
-    password: password
-});
-*/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "peerless-player",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Peerless Player - listen, discover, explore music",
   "main": "main.js",
   "scripts": {
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "electron": "^22.0.0",
-    "electron-builder": "^24.1.2",
+    "electron-builder": "^23.6.0",
     "electron-rebuild": "^3.2.5"
   },
   "repository": {