Merge branch 'release-v0.0.5' into main

README.md

@@ -43,9 +43,9 @@ Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted
 
 ## build ohm
 ```
-npm run build_osx
-npm run build_linux
-npm run build_win
+npm run build:osx
+npm run build:linux
+npm run build:win
 ```
 
 ## contributing

main.js

@@ -162,7 +162,7 @@ ipcMain.handle('load-file', async (event) => {
   try {
     const res = await dialog.showOpenDialog({
       filters: [
-        { name: 'ohm_upload_state', extensions: [ 'ous' ] }
+        { name: 'ohm_upload_state', extensions: [ 'ous', 'ohm' ] }
       ]
     });
     return res;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohm",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "platform for open source music",
   "main": "main.js",
   "scripts": {

src/app.js

@@ -2,6 +2,8 @@
 
 const { ipcRenderer } = require('electron');
 const { create } = require('ipfs-http-client');
+const fs = require('fs');
+const path = require('path');
 const log = require('./utils/log');
 const helpers = require('./utils/helpers');
 const { loadingIcon } = require('./utils/svgs');
@@ -77,11 +79,14 @@ function App() {
       this.settingsStore = new Store({ name: 'settings' });
       this.settingsStore.init();
 
+      //Load theme
+      helpers.loadTheme();
+
       login = new LoginView();
       await login.init(); //Attempt login with credentials
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
 
       this.root.innerHTML = '' //Draw login screen
       login.render();
@@ -107,7 +112,7 @@ function App() {
       login.render();
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 
@@ -153,7 +158,7 @@ function App() {
         this.header.backButton.disabled = true;
       }
       catch (err) {
-        if (err.message !== 'FETCH_ERR') log.error(err.message);
+        if (err.message !== 'FETCH_ERR') log.error(err);
       }
     });
 
@@ -252,7 +257,7 @@ function App() {
       this.triggerLoading(false); //Stop loading indicator
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
       if (err.message === 'User not authenticated') await this.logout(true);
     }
   }
@@ -299,7 +304,7 @@ function App() {
     }
     catch (err) {
       if (err.message === 'The user aborted a request.') return;
-      log.error(err.message);
+      log.error(err);
     }
   }
 
@@ -331,7 +336,7 @@ function App() {
       this.logout(true);
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 
@@ -353,7 +358,7 @@ function App() {
       log.success('Location successfully changed.');
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 
@@ -375,7 +380,7 @@ function App() {
       log.success('Bio successfully changed.');
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 
@@ -398,7 +403,7 @@ function App() {
       log.success('Successfully created artist.');
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 

src/components/actionBarAlbum.js

@@ -25,7 +25,7 @@ function ActionBarAlbum(data) {
       else await ipfs.startTransfer(this.data);
     }
     catch (err) {
-      if (err.message !== 'The user aborted a request.') log.error(err.message); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
+      if (err.message !== 'The user aborted a request.') log.error(err); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
     }
   }
 
@@ -38,7 +38,7 @@ function ActionBarAlbum(data) {
       await ipfs.startTransfer(this.data, { download: true });
     }
     catch (err) {
-      if (err.message !== 'The user aborted a request.') log.error(err.message); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
+      if (err.message !== 'The user aborted a request.') log.error(err); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
     }
   }
 
@@ -93,7 +93,7 @@ function ActionBarAlbum(data) {
       }
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 
@@ -172,7 +172,7 @@ function ActionBarAlbum(data) {
       return this.el;
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 }

src/components/actionBarSong.js

@@ -44,7 +44,7 @@ function ActionBarSong(data) {
       else await ipfs.startTransfer(this.data);
     }
     catch (err) {
-      if (err.message !== 'The user aborted a request.') log.error(err.message); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
+      if (err.message !== 'The user aborted a request.') log.error(err); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
     }
   }
 
@@ -57,7 +57,7 @@ function ActionBarSong(data) {
       await ipfs.startTransfer(this.data, { download: true });
     }
     catch (err) {
-      if (err.message !== 'The user aborted a request.') log.error(err.message); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
+      if (err.message !== 'The user aborted a request.') log.error(err); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
     }
   }
 
@@ -112,7 +112,7 @@ function ActionBarSong(data) {
       }
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 
@@ -194,7 +194,7 @@ function ActionBarSong(data) {
       return this.el;
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 }

src/components/album.js

@@ -18,7 +18,7 @@ function Album(data, view) {
     e.stopPropagation();
     const position = this.getPosition();
 
-    if (this.view === 'explore' || this.view === 'feed' || this.view === 'pinned') app.player.queueFeed(this.data.songs[position])
+    if (this.view === 'explore' || this.view === 'feed' || this.view === 'pinned' || this.view === 'artist') app.player.queueFeed(this.data.songs[position])
     else app.player.queueAlbum(this.data, position);
   }
 
@@ -124,7 +124,7 @@ function Album(data, view) {
       return this.el;
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 }

src/components/artist.js

@@ -32,7 +32,7 @@ function Artist(data, view) {
       else button.classList.add('following');
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 

src/components/comments.js

@@ -46,7 +46,7 @@ function Comments(data) {
       this.el.querySelector('textarea').value = ''; //Reset comment field to empty
     }
     catch (err) {
-      if (err.message !== 'FETCH_ERR') log.error(err.message);
+      if (err.message !== 'FETCH_ERR') log.error(err);
     }
   }
 
@@ -68,7 +68,6 @@ function Comments(data) {
     submit.textContent = 'submit';
     submit.setAttribute('type', 'submit');
     textarea.setAttribute('rows', '1');
-    textarea.setAttribute('autofocus', true);
     textarea.setAttribute('placeholder', 'send comment..');
     marker.textContent = '> '
 

src/components/header.js

@@ -46,7 +46,7 @@ function Header() {
       app.triggerLoading(false); //Trigger loading indicator
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
       if (err.message === 'User not authenticated') await app.logout(true);
     }
   }

src/components/player.js

@@ -243,8 +243,14 @@ function Player() {
   }
 
   this.deconstructFeed = () => { //Goes over the feed and turns deconstructs albums into songs
-    const feed = app.current === 'pinned' ? app.views[app.current].data.items : app.views[app.current].data;
+    const currentView = app.views[app.current];
     let formatted = [];
+    let feed;
+
+    //Get feed depending on view
+    if (app.current === 'pinned') feed = currentView.data.items;
+    else if (app.current === 'artist') feed = currentView.artist.albums.concat(currentView.artist.songs);
+    else feed = app.views[app.current].data;
 
     for (let item of feed) {
       if (item.type === 'album') {
@@ -303,7 +309,7 @@ function Player() {
   this.updateSeekStyle = (seek) => { //Updates background property
     const el = seek || this.el.querySelector('.seek');
     const value = (el.value-el.min)/(el.max-el.min)*100
-    el.style.background = 'linear-gradient(to right, #888 0%, #888 ' + value + '%, #444 ' + value + '%, #444 100%)'
+    el.style.background = 'linear-gradient(to right, var(--f-mid) 0%, var(--f-mid) ' + value + '%, var(--b-high) ' + value + '%, var(--b-high) 100%)'
   }
 
   this.getVolumeValue = () => {

src/components/song.js

@@ -17,7 +17,7 @@ function Song(data, view) {
     e.stopPropagation();
 
     if (this.view === 'album') app.player.queueAlbum(app.views.album.data, this.getPosition());
-    else if (this.view === 'explore' || this.view === 'feed' || this.view === 'pinned') app.player.queueFeed(this.data);
+    else if (this.view === 'explore' || this.view === 'feed' || this.view === 'pinned' || this.view === 'artist') app.player.queueFeed(this.data);
     else app.player.queueItem(this.data);
   }
 
@@ -110,7 +110,7 @@ function Song(data, view) {
       return this.el;
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 }

src/components/transfer.js

@@ -38,7 +38,7 @@ function Transfer(data, unique) {
       await ipfs.resumeTransfer(this.unique);
     }
     catch (err) {
-      if (err.message !== 'The user aborted a request.') log.error(err.message); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
+      if (err.message !== 'The user aborted a request.') log.error(err); //If request was aborted this means it was either cleared or paused, which is logged accordingly already
     }
   }
 
@@ -51,7 +51,7 @@ function Transfer(data, unique) {
       log.success('Transfer cleared.');
     }
     catch (err) {
-      log.error(err.message);
+      log.error(err);
     }
   }
 

src/components/uploadFile.js

@@ -89,7 +89,7 @@ function UploadFile(data) {
     if ((file.type === 'original' || file.type === 'external') && !shallow) {
       if (file.name === '') throw new Error('File name is missing.');
       if (!helpers.allowedFormat(file.name)) throw new Error('File name can only include letters, numbers and underscores.'); //Check name for bad characters
-      if (file.path === '') throw new Error('File is missing.');
+      if (!file.path || file.path === '') throw new Error('File is missing.');
       if (file.tags.length === 0) throw new Error('File tags are missing.');
       for (let tag of file.tags) { //Check tags for bad characters
         if (!helpers.allowedFormat(tag)) throw new Error('Tags can only include letters, numbers and underscores.');

src/index.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="styles.css">
     <script type="text/javascript" src="./app.js"></script>
 </head>
-<body style="background: white;">
+<body>
   <div class="root">
   </div>
   <script>