museria 0.2.40 → 0.2.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "museria",
-  "version": "0.2.40",
+  "version": "0.2.44",
   "description": "Decentralized music storage",
   "main": "./src/index.js",
   "bin": {
@@ -13,7 +13,7 @@
   "homepage": "https://github.com/ortexx/museria",
   "scripts": {
     "eslint": "eslint src bin test",
-    "test": "mocha ./test/index.js --timeout=20000",
+    "test": "mocha ./test/index.js --timeout=30000",
     "build-client": "webpack --config=webpack.client.js",
     "build-client-prod": "cross-env NODE_ENV=production webpack --config=webpack.client.js",
     "build-face": "webpack --config=webpack.face.js",
@@ -59,7 +59,7 @@
     "mini-css-extract-plugin": "^1.3.9",
     "mocha": "^9.1.3",
     "node-polyfill-webpack-plugin": "^1.0.3",
-    "resolve-url-loader": "^3.1.2",
+    "resolve-url-loader": "^5.0.0",
     "sass": "^1.43.4",
     "sass-loader": "^12.3.0",
     "terser-webpack-plugin": "^5.0.0",
@@ -77,16 +77,16 @@
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "lodash": "^4.17.20",
-    "metastocle": "^0.2.26",
+    "metastocle": "^0.2.29",
     "music-metadata": "^6.4.0",
     "node-fetch": "^2.6.1",
     "node-id3": "^0.2.2",
     "sanitize-filename": "^1.6.3",
     "serve-favicon": "^2.5.0",
-    "sharp": "^0.25.2",
+    "sharp": "^0.29.3",
     "splaytree": "^3.1.0",
-    "spreadable": "^0.2.22",
-    "storacle": "^0.2.22",
+    "spreadable": "^0.2.25",
+    "storacle": "^0.2.25",
     "transliteration": "^2.2.0"
   },
   "repository": {

package/src/browser/face/controllers/app/app.html

@@ -49,7 +49,7 @@
   </if>
   <header class="header row">
     <div class="songs-counter-text">
-      There ${this.songsCount == 1? 'is': 'are'} <b>${ this.songsCount }</b> song${this.songsCount == 1? '': 's'} on the network
+      There ${this.songsCount == 1? 'is': 'are'} <b>${ Number(this.songsCount).toLocaleString() }</b> song${this.songsCount == 1? '': 's'} on the network
     </div>
     <a state="app" class="logo mx-auto px-4">
       <div>

package/src/browser/face/controllers/app/app.js

@@ -18,7 +18,7 @@ export default class App extends Akili.Component {
   created() {  
     this.captchaWidth = 240;
     this.findingSongsLimit = 10;
-    this.songsCountInterval = 10 * 1000;
+    this.songsCountInterval = 15 * 1000;
     this.songsCountIntervalObj = null;
     this.scope.songsCount = 0;
     this.scope.searchInputValue = this.transition.query.f;

package/src/node.js

@@ -78,8 +78,7 @@ module.exports = (Parent) => {
           ]
         },
         task: {
-          cleanUpMusicInterval: '1m',
-          normalizeSongTitlesInterval: '10m',
+          cleanUpMusicInterval: '1m'
         }
       }, options);
 
@@ -120,10 +119,6 @@ module.exports = (Parent) => {
       if(this.options.task.cleanUpMusicInterval) {
         await this.task.add('cleanUpMusic', this.options.task.cleanUpMusicInterval, () => this.cleanUpMusic());
       }
-
-      if(this.options.task.normalizeSongTitlesInterval) {
-        await this.task.add('normalizeSongTitles', this.options.task.normalizeSongTitlesInterval, () => this.normalizeSongTitles());
-      }     
     }
 
     /** 
@@ -133,9 +128,19 @@ module.exports = (Parent) => {
      */
     async normalizeSongTitles() {
       const docs = await this.db.getDocuments('music');
+      const titles = {};
+
       for(let i = 0; i < docs.length; i++) {
         const doc = docs[i];
-        doc.title = utils.beautifySongTitle(doc.title);
+        const title = utils.beautifySongTitle(doc.title);
+
+        if(titles[title] && titles[title] != doc.$loki) {
+          await this.db.deleteDocument(doc);
+          continue;
+        }
+
+        doc.title = title;
+        titles[title] = doc.$loki;
         await this.db.updateMusicDocument(doc, { beautify: false });
       }
     }
@@ -421,8 +426,7 @@ module.exports = (Parent) => {
      * @returns {object[]}
      */
      async getSongInfo(title, options = {}) {  
-      title = utils.beautifySongTitle(title);
-      this.songTitleTest(title);
+      title = utils.prepareComparisonSongTitle(title);
       const collection = await this.getCollection('music');
       const actions = utils.prepareDocumentGettingActions({ 
         offset: 0,
@@ -467,7 +471,7 @@ module.exports = (Parent) => {
      * @returns {object[]}
      */
      async findSongs(str, options = {}) {
-      const title = utils.beautifySongTitle(str);
+      const title = utils.prepareComparisonSongTitle(str);
       str = utils.prepareSongFindingString(str);
 
       if(str.length < this.options.music.findingStringMinLength) {

package/src/server/transports/express/client/controllers.js

@@ -8,7 +8,7 @@ module.exports.requestSong = node => {
   return async (req, res, next) => {
     try {
       const title = req.query.title;
-      node.songTitleTest(title);
+      node.songTitleTest(title);     
       const link = await node.getSongLink(title, req.query.type);
 
       if(!link) {

package/src/server/transports/express/midds.js

@@ -66,7 +66,7 @@ midds.fileAccess = node => {
 
       if(!doc) {
         const titleHash = String(req.params.hash).split('.')[0];
-        const title = utils.decodeSongTitle(titleHash);
+        const title = utils.decodeSongTitle(titleHash);        
         doc = await node.db.getMusicByPk(title);
       }
       

package/src/utils.js

@@ -9,7 +9,7 @@ const mm = require('music-metadata');
 const base64url = require('base64url');
 
 utils.regexSongLinks = /(([a-z]+:\/\/)?[-\p{L}\p{N}]+\.[\p{L}]{2,}|[a-z]+:\/\/(\[:*[\w\d]+:[\w\d:]+\]|\d+\.[\d.]+))\S*/igu;
-utils.regexSongFeats = /[([\s]+((ft\.?|feat\.?|featuring)[\s]+((?!(\s+[-([)\]]+))[^)\]])+)\s*[)\]]*([\s]+[-([]+|$)/i;
+utils.regexSongFeats = /[([\s]+((ft\.|feat\.)[\s]+((?!(\s+[-([)\]]+))[^)\]])+)\s*[)\]]*([\s]+[-([]+|$)/iu;
 
 utils.heritableSongTags = [
   'TALB', 'TCOM', 'TCON', 'TCOP', 'TDAT', 'TEXT', 'TIT1', 'TIT3', 'TLAN', 
@@ -37,7 +37,7 @@ utils.MusicDocumentsHandler = class extends utils.DocumentsHandler {
 
     return this.$ilk(value, filter);
   }
- }
+}
 
 /**
  * @see stUtils.getFileInfo
@@ -125,11 +125,20 @@ utils.beautifySongTitle = function (title) {
     .replace(/[\sᅠ]+/g, ' ')
     .replace(/([([])\s+/g, '$1')
     .replace(/\s+([)\]])/g, '$1')
+    .replace(/([([]+)(featuring|feat|ft)(\s)/ig, '$1feat.$3')  
+    .replace(/([([\s]+)(feat\.|ft\.)(\s)/ig, '$1feat.$3')
     .toLowerCase();
 
   if(!/[^\s]+ - [^\s]+/.test(title)) {
     return '';
   }
+ 
+  const arr = title.split(/\(?feat\./i);
+  
+  if(arr.length > 2) {
+    arr.splice(2, arr.length - 2);
+    title = arr.join('(feat.').trim();
+  }
 
   const sides = this.splitSongTitle(title);
   let artists = sides[0].split(/,[\s]*/);
@@ -139,26 +148,26 @@ utils.beautifySongTitle = function (title) {
   if(!mainArtist) {
     return '';
   }
-
-  const match = title.match(this.regexSongFeats);
+  
+  const match = sides[1].match(this.regexSongFeats);
   let feats = (match? match[1]: '').replace(/,([^\s])/, ', $1').trim();
   title = `${mainArtist} - ${sides[1]}`;
-  title = title.replace(this.regexSongFeats, '$5');
-  artists = artists.map(a => a.trim());
-  
+  title = title.replace(this.regexSongFeats, '$5'); 
+  feats && (artists = artists.concat(feats.replace(/feat\./i, '').split(',')));
+  artists = [...new Set(artists.map(a => a.trim()).filter(v => v))];
+ 
   if(artists.length) {
-    feats = feats? [feats].concat(artists).join(', '): `ft. ${ artists.join(', ') }`;  
+    feats = `feat. ${ artists.join(', ') }`; 
   }
   
   feats && (title += ` (${feats})`);
-  title = title   
-    .replace(/([([\s]+)(feat\.?|ft\.?|featuring)(\s)/i, '$1feat.$3')
+  title = title
     .replace(/\[\]|\(\)/g, '')
     .replace(/\s+/g, ' ')    
     .split(' ')
     .map(p => p? (p[0].toUpperCase() + p.slice(1)): p)
     .join(' ')
-    .trim()
+    .trim();    
   return title;
 };
 
@@ -234,8 +243,8 @@ utils.getSongArtists = function (title, options = {}) {
   const sides = this.splitSongTitle(title);
   let artists = sides[0].split(/,/);
   const match = title.match(this.regexSongFeats);
-  let feats = (match? match[1]: '').replace(/(feat|ft|featuring)\.?/i, '');
-  return artists.concat(feats.split(',')).map(v => v.trim()).filter(v => v);
+  let feats = (match? match[1]: '').replace(/^feat\./i, '');
+  return [...new Set(artists.concat(feats.split(',')).map(v => v.trim()).filter(v => v))];
 };
 
 /**

package/test/node.js

@@ -108,17 +108,13 @@ describe('Node', () => {
   });
 
   describe('.getSongInfo()', () => {
-    it('should throw an error', async () => {
-      try {
-        await node.getSongInfo('unexistent song');
-        throw new Error('Fail');
-      } 
-      catch (err) {
-        assert.isOk(err.message.match('Wrong song title'));
-      }
+    it('should return an empty array with a wrong title', async () => {
+      const title = 'unexistent';
+      const result = await node.getSongInfo(title);
+      assert.lengthOf(result, 0);
     });
 
-    it('should return an empty array', async () => {
+    it('should return an empty array with a right title', async () => {
       const title = 'unexistent - unexistent';
       const result = await node.getSongInfo(title);
       assert.lengthOf(result, 0);

package/test/utils.js

@@ -67,14 +67,13 @@ describe('utils', () => {
 
     it('should place feats together', () => {
       const res = utils.beautifySongTitle('artist1, artist2,artist3 - title (feat. artist4, artist5,artist6)');
-      assert.equal(res, 'Artist1 - Title (feat. Artist4, Artist5, Artist6, Artist2, Artist3)');
+      assert.equal(res, 'Artist1 - Title (feat. Artist2, Artist3, Artist4, Artist5, Artist6)');
     });
 
     it('should bring all feats to a single form', () => {
       assert.equal(utils.beautifySongTitle('artist - title (ft. Artist)'), 'Artist - Title (feat. Artist)', 'check "ft"');
       assert.equal(utils.beautifySongTitle('artist - title (feat. Artist)'), 'Artist - Title (feat. Artist)', 'check "feat"');
-      assert.equal(utils.beautifySongTitle('artist - title (featuring Artist)'), 'Artist - Title (feat. Artist)', 'check "featuring"');
-      assert.equal(utils.beautifySongTitle('artist - title ft Artist'), 'Artist - Title (feat. Artist)', 'check without brackets');
+      assert.equal(utils.beautifySongTitle('artist - title ft. Artist'), 'Artist - Title (feat. Artist)', 'check without brackets');
     });
 
     it('should change the dash type', () => {
@@ -133,8 +132,8 @@ describe('utils', () => {
     }); 
 
     it('should return the right array', () => {
-      const artists = utils.getSongArtists('artist,artist2 - title ft. artist3,  artist4', { beautify: false });
-      assert.equal(artists.join(','), 'artist,artist2,artist3,artist4');
+      const artists = utils.getSongArtists('artist,artist2 - title ft. artist3,  artist4');
+      assert.equal(artists.join(','), 'Artist,Artist2,Artist3,Artist4');
     });
   });