(front) Service refactoring for sorting operations

- Create an ElsArtistService to use common query
- Move services in a subfolder

Use a function to add sort filter

README.md

@@ -0,0 +1,21 @@
+# Classic data
+
+1. Analyze data :
+
+```sh
+python3 iTunesParser.py
+```
+2. Send data to ELS :
+
+```sh
+python3 send_data.py -D -A
+```
+
+# Suggester
+
+To use suggester, create index with data in `suggester.es` file.
+Then :
+
+```sh
+python3 suggester.py
+```

dashboard/.gitignore

@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

dashboard/.nvmrc

@@ -0,0 +1 @@
+14

dashboard/angular.json

@@ -100,19 +100,6 @@
             "scripts": []
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {

dashboard/package.json

@@ -11,15 +11,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.2.2",
-    "@angular/common": "~12.2.2",
-    "@angular/compiler": "~12.2.2",
-    "@angular/core": "~12.2.2",
-    "@angular/forms": "~12.2.2",
-    "@angular/localize": "~12.2.2",
-    "@angular/platform-browser": "~12.2.2",
-    "@angular/platform-browser-dynamic": "~12.2.2",
-    "@angular/router": "~12.2.2",
+    "@angular/animations": "~13.3.11",
+    "@angular/common": "~13.3.11",
+    "@angular/compiler": "~13.3.11",
+    "@angular/core": "~13.3.11",
+    "@angular/forms": "~13.3.11",
+    "@angular/localize": "~13.3.11",
+    "@angular/platform-browser": "~13.3.11",
+    "@angular/platform-browser-dynamic": "~13.3.11",
+    "@angular/router": "~13.3.11",
     "@ng-bootstrap/ng-bootstrap": "^10.0.0",
     "bootstrap": "^3.3.7",
     "rxjs": "~6.6.0",
@@ -27,10 +27,9 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.2.2",
-    "@angular/cli": "~12.2.2",
-    "@angular/compiler-cli": "~12.2.2",
-    "@angular/localize": "^12.2.2",
+    "@angular-devkit/build-angular": "~13.3.9",
+    "@angular/cli": "~13.3.9",
+    "@angular/compiler-cli": "~13.3.11",
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.0",
@@ -44,6 +43,6 @@
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.3.5"
+    "typescript": "~4.6.4"
   }
 }

dashboard/src/app/album/album.component.html

@@ -1,6 +1,11 @@
 <div class="container">
   <h1>{{albumName}}</h1>
 
+  <div *ngIf="sortFilter" class="alert alert-danger">
+    To sort filter applyed. Songs are filter on location. <br/>
+    Album folder: {{album['Location']}}
+  </div>
+
   <div class="alert alert-warning">
       <h3>Debug Zone</h3>
       Returned song: {{songs.length}}<br />
@@ -20,7 +25,7 @@
                       <div class="col-xs-9 text-right">
                           <div>
                               <h3 *ngIf="!album"><span class="glyphicon glyphicon-refresh loading"></span></h3>
-                              <h3 *ngIf="album">{{album.Rating}}/100</h3>
+                              <h3 *ngIf="album">{{album['Album Rating']}}/100</h3>
                           </div>
                           <div><br>Rating</div>
                       </div>

dashboard/src/app/album/album.component.ts

@@ -1,8 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
-import { Location } from '@angular/common';
 
-import { ElsService } from './../els.service';
+import { ElsService } from '../els-service/els.service';
 import { Song } from './../model/song';
 import { Album } from './../model/album';
 import { SongTableComponent } from '../song-table/song-table.component';
@@ -19,6 +18,7 @@ export class AlbumComponent implements OnInit {
   albumName = '';
   songs: Array<Song> = [];
   album: Album = new Album(); // If album not found, will be replaced by 'undefined'
+  sortFilter: boolean = false; // Show only song to sort
 
   // Prevent useless data load + activate button in interface var
   moreDataAvailable = true;
@@ -26,13 +26,12 @@ export class AlbumComponent implements OnInit {
 
   constructor(
     private elsService: ElsService,
-    private route: ActivatedRoute,
-    private location: Location
+    private route: ActivatedRoute
   ) { }
 
   ngOnInit(): void {
-    this.route.params
-      .subscribe((params: Params) => this.albumName = params['name']);
+    this.route.params.subscribe((params: Params) => this.albumName = params['name']);
+    this.route.queryParams.subscribe(params => { this.sortFilter = params.tosort ?? false; });
 
     this.loadSongs();
 
@@ -50,7 +49,7 @@ export class AlbumComponent implements OnInit {
     }
 
     this.lockLoadData = true;
-    this.elsService.getAlbumSongs(this.albumName, this.songs.length).subscribe(
+    this.elsService.getAlbumSongs(this.albumName, this.songs.length, this.sortFilter).subscribe(
       data => {
         this.moreDataAvailable = data.length === ElsService.DEFAULT_SIZE;
 

dashboard/src/app/albums/albums.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ElsAlbumService } from '../els-album.service';
+import { ElsAlbumService } from '../els-service/els-album.service';
 
 import { Album } from '../model/album';
 

dashboard/src/app/app.module.ts

@@ -11,8 +11,8 @@ import { GenreComponent } from './genre/genre.component';
 import { SongTableComponent } from './song-table/song-table.component';
 import { TopPlayedComponent } from './top-played/top-played.component';
 
-import { ElsService } from './els.service';
-import { ElsAlbumService } from './els-album.service';
+import { ElsService } from './els-service/els.service';
+import { ElsAlbumService } from './els-service/els-album.service';
 
 import { AppRoutingModule } from './app-routing.module';
 
@@ -25,6 +25,7 @@ import { AlbumsComponent } from './albums/albums.component';
 import { ToSortComponent } from './to-sort/to-sort.component';
 
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import { ElsArtistService } from './els-service/els-artist.service';
 
 @NgModule({
   imports: [
@@ -52,7 +53,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
   ],
   providers: [
     ElsService,
-    ElsAlbumService
+    ElsAlbumService,
+    ElsArtistService
   ],
   bootstrap: [ AppComponent ]
 })

dashboard/src/app/artist/artist.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
-import { Location } from '@angular/common';
 
-import { ElsService } from './../els.service';
 import { Song } from './../model/song';
 import { Artist } from './../model/artist';
 import { SongTableComponent } from '../song-table/song-table.component';
+import { ElsArtistService } from '../els-service/els-artist.service';
+import { ElsService } from '../els-service/els.service';
 
 @Component({
   selector: 'app-artist',
@@ -25,19 +25,26 @@ export class ArtistComponent implements OnInit {
   artist: Artist = new Artist();
   lockLoadData = false;
   countSong: number;
+  toSortFilter: boolean = false; // Show only song to sort
 
   constructor(
-    private elsService: ElsService,
+    private elsService: ElsArtistService,
     private route: ActivatedRoute,
-    private location: Location
   ) { }
 
   ngOnInit(): void {
     this.route.params.subscribe((params: Params) => this.artistName = params['name']);
+    this.route.queryParams.subscribe(params => { this.toSortFilter = params.tosort ?? false; });
 
     this.elsService.getArtist(this.artistName).subscribe(data => this.artist = data);
 
-    this.elsService.getCountArtistSong(this.artistName).subscribe(data => this.countSong = data);
+    this.elsService.getCountArtistSong(this.artistName, this.toSortFilter).subscribe(data => {
+      this.countSong = data
+      this.artist['Track Count'] = this.countSong;
+      // TODO Async problem: some time, get updated data, some time no
+      // TODO Use only this value?
+      // TODO ==> Show each time if there are unsorted songs
+    });
 
     this.loadSongs();
   }
@@ -54,9 +61,11 @@ export class ArtistComponent implements OnInit {
     }
 
     this.lockLoadData = true;
-    this.elsService.getArtistSongs(this.artistName, this.songs.length).subscribe(
+    this.elsService.getArtistSongs(this.artistName, this.songs.length, this.toSortFilter).subscribe(
       data => {
         this.moreDataAvailable = data.length === ElsService.DEFAULT_SIZE;
+        console.log(data.length)
+        console.log(this.moreDataAvailable)
 
         // Erase song array with result for first load, then add elements one by one
         // instead use concat => concat will sort table at each load, very consuming! and not user friendly

dashboard/src/app/dashboard/dashboard.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { ElsService } from './../els.service';
+import { ElsService } from '../els-service/els.service';
 import { Song } from './../model/song';
 import { Bucket } from './../model/bucket';
 import { Suggested } from '../model/suggested';

dashboard/src/app/els-service/els-album.service.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders } from '@angular/common/http'
+import { HttpClient } from '@angular/common/http'
 
 import { Observable } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
-import { Album } from './model/album';
+import { Album } from './../model/album';
 import { ElsService } from './els.service';
 
 @Injectable()

dashboard/src/app/els-service/els-artist.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ElsArtistService } from './els-artist.service';
+
+describe('ElsArtistService', () => {
+  let service: ElsArtistService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ElsArtistService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

dashboard/src/app/els-service/els-artist.service.ts

@@ -0,0 +1,121 @@
+import { HttpClient } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { Observable } from "rxjs";
+import { catchError, map } from "rxjs/operators";
+import { Artist } from "../model/artist";
+import { Song } from "../model/song";
+import { ElsService } from "./els.service";
+
+@Injectable()
+export class ElsArtistService extends ElsService {
+  constructor(protected http: HttpClient) {
+    super(http);
+  }
+
+  private getQuerySongsWithArtistName(
+    artistName: string,
+    sortFilter: boolean = false,
+    size: number = 0,
+    from: number = 0
+  ) {
+    let query = {
+      query: {
+        bool: {
+          should: [
+            { match_phrase: { "Album Artist": artistName } },
+            { match_phrase: { Artist: artistName } },
+          ],
+          must_not: [],
+        },
+      },
+    };
+
+    if (sortFilter) {
+      console.log("ElsArtistService- TO SORT filter enabled");
+      query = this.addSortFilterToQuery(query);
+    }
+
+    if (size) {
+      query["size"] = size;
+    }
+
+    if (from) {
+      query["from"] = from;
+    }
+    return query;
+  }
+
+  public getArtist(artistName: string): Observable<Artist> {
+    return this.http
+      .post(
+        this.elsUrl + ElsService.ARTIST_INDEX_NAME + ElsService.ACTION_SEARCH,
+        JSON.stringify({
+          query: {
+            match_phrase: { Artist: artistName },
+          },
+          size: ElsService.DEFAULT_SIZE,
+        }),
+        { headers: this.headers }
+      )
+      .pipe(
+        map((res) => this.responseToOneTypedResult<Artist>(res, artistName)),
+        catchError((error) =>
+          this.handleError(error, "getArtist(" + artistName + ")")
+        )
+      );
+  }
+
+  public getArtistSongs(
+    artistName: string,
+    from: number = 0,
+    sortFilter = false
+  ): Observable<Song[]> {
+    console.info(
+      "getArtistSongs- Artist name: " + artistName + " - from: " + from
+    );
+
+    let query = this.getQuerySongsWithArtistName(
+      artistName,
+      sortFilter,
+      ElsService.DEFAULT_SIZE,
+      from
+    );
+
+    return this.http
+      .post(
+        this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
+        JSON.stringify(query),
+        { headers: this.headers }
+      )
+      .pipe(
+        map((res) => this.responseToSongs(res)),
+        catchError((error) =>
+          this.handleError(
+            error,
+            "getArtistSongs(" + artistName + "," + from + ")"
+          )
+        )
+      );
+  }
+
+  public getCountArtistSong(
+    artistName: string,
+    sortFilter = false
+  ): Observable<number> {
+    console.log("artistname: " + artistName);
+    const query = this.getQuerySongsWithArtistName(artistName, sortFilter);
+
+    return this.http
+      .post<any>(
+        this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_COUNT,
+        JSON.stringify(query),
+        { headers: this.headers }
+      )
+      .pipe(
+        map((res) => res.count as number),
+        catchError((error) =>
+          this.handleError(error, "getCountArtistSong" + artistName + ")")
+        )
+      );
+  }
+}

dashboard/src/app/els-service/els-sort.service.ts

@@ -1,11 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 import { ElsService } from './els.service';
-import { Album } from './model/album';
-import { Bucket } from './model/bucket';
-import { Song } from './model/song';
+import { Album } from './../model/album';
 
 @Injectable({
   providedIn: 'root'
@@ -113,9 +112,38 @@ export class ElsSortService extends ElsService {
       .catch(error => this.handleError(error, 'getCountNeverListenSong()'));
   }
 
-  getAlbums(): Observable<Bucket[]> {
+  getNbAlbums(): Promise<number> {
     return this.http
-      .post(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
+      .post<any>(this.elsUrl + ElsService.ALBUM_INDEX_NAME + ElsService.ACTION_SEARCH,
+            JSON.stringify({
+              'query': {
+                'bool': {
+                  'must_not': [
+                  {
+                    term: {
+                      "Location.tree": "/F:/Musique"
+                    }
+                  }
+                ]
+                }
+              },
+              size: 0,
+              "aggs": {
+                "album_count": {
+                  "cardinality": {
+                    "field": "Album.raw"
+                  }
+                }
+              }
+            }), {headers: this.headers})
+      .toPromise()
+      .then(res => res.aggregations.album_count.value as number )
+      .catch(error => this.handleError(error, 'getNbAlbums()'));
+  }
+
+  getAlbums(): Observable<Album[]> {
+    return this.http
+      .post(this.elsUrl + ElsService.ALBUM_INDEX_NAME + ElsService.ACTION_SEARCH,
         JSON.stringify({
           query: {
             bool: {
@@ -128,19 +156,13 @@ export class ElsSortService extends ElsService {
               ]
             }
           },
-          'size': 0,
-          'aggs': {
-            'albums' : {
-              'terms': {
-                'field' : 'Album.raw',
-                'order': { '_term': 'asc' },
-                'size': 50
-              }
-            }
-          }
+          'size': 550,
+          "sort": [
+            { "Play Count": "desc"}
+          ]
         }), {headers: this.headers})
       .pipe(
-        map(res => this.responseAggregationToBucket(res, "albums")),
+        map(res => this.responseToAlbums(res)),
         catchError(error => this.handleError(error, 'getAlbums'))
       );
   }

dashboard/src/app/els-service/els.service.ts

@@ -1,14 +1,14 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http'
 
 import { Observable } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
-import { Song } from './model/song';
-import { Album } from './model/album';
-import { Artist } from './model/artist';
-import { Bucket } from './model/bucket';
-import { Suggested } from './model/suggested';
+import { Song } from '../model/song';
+import { Album } from '../model/album';
+import { Artist } from '../model/artist';
+import { Bucket } from '../model/bucket';
+import { Suggested } from '../model/suggested';
 
 @Injectable()
 export class ElsService {
@@ -21,8 +21,9 @@ export class ElsService {
   protected static readonly ACTION_SEARCH = '/_search';
   protected static readonly ACTION_COUNT = '/_count';
 
-  protected elsUrl = 'http://localhost:9200';
+  protected elsUrl = 'http://192.168.1.20:9200';
   protected headers = new HttpHeaders({'Content-Type': 'application/json'});
+  protected defaultLocation = "/F:/Musique"; // TODO Use conf
 
   constructor(protected http: HttpClient) { }
 
@@ -172,20 +173,48 @@ export class ElsService {
       );
   }
 
-  getAlbumSongs(albumName: string, from: number = 0): Observable<Song[]> {
-    console.info('getAlbumSongs- Album name: ' + albumName + ' - from: ' + from);
-    return this.http
-      .post(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
-            JSON.stringify({
-              'query': {
-                'match_phrase': { 'Album': albumName }
+  getAlbumSongs(albumName: string, from: number = 0, toSortFilter = false): Observable<Song[]> {
+    // TODO Move in els-album service
+    console.info(
+      "getAlbumSongs- Album name: " + albumName + " - from: " + from
+    );
+
+    let query = {
+      query: {
+        bool: {
+          must: [
+            {
+              match_phrase: {
+                "Album.raw": albumName,
               },
-              'size': ElsService.DEFAULT_SIZE,
-              'from': from
-            }), {headers: this.headers})
+            },
+          ],
+          must_not: [],
+        },
+      },
+      size: ElsService.DEFAULT_SIZE,
+      from: from,
+    };
+
+    if (toSortFilter) {
+      console.log("getAlbumSongs- TO SORT filter enabled");
+      query = this.addSortFilterToQuery(query)
+    }
+
+    return this.http
+      .post(
+        this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
+        JSON.stringify(query),
+        { headers: this.headers }
+      )
       .pipe(
-        map(res => this.responseToSongs(res)),
-        catchError(error => this.handleError(error, 'getAlbumSongs(' + albumName + ',' + from + ')'))
+        map((res) => this.responseToSongs(res)),
+        catchError((error) =>
+          this.handleError(
+            error,
+            "getAlbumSongs(" + albumName + "," + from + ")"
+          )
+        )
       );
   }
 
@@ -203,31 +232,11 @@ export class ElsService {
             }), {headers: this.headers})
       .pipe(
         map(res => this.responseToSongs(res)),
-        catchError(error => this.handleError(error, 'getAlbumSongs(' + genreName + ',' + from + ')'))
+        catchError(error => this.handleError(error, 'getGenreSongs(' + genreName + ',' + from + ')'))
       );
   }
 
-  getArtistSongs(artistName: string, from: number = 0): Observable<Song[]> {
-    console.info('getArtistSongs- Artist name: ' + artistName + ' - from: ' + from);
-    return this.http
-      .post(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
-            JSON.stringify({
-              'query': {
-                  'bool': {
-                      'should': [
-                          {'match_phrase' : { 'Album Artist' : artistName }},
-                          {'match_phrase' : { 'Artist' : artistName }}
-                      ]
-                  }
-              },
-              'size': ElsService.DEFAULT_SIZE,
-              'from': from
-            }), {headers: this.headers})
-      .pipe(
-        map(res => this.responseToSongs(res)),
-        catchError(error => this.handleError(error, 'getArtistSongs(' + artistName + ',' + from + ')'))
-      );
-  }
+
 
   getAlbum(albumName: string): Observable<Album> {
     // TODO Why this is used on album pages?
@@ -246,21 +255,6 @@ export class ElsService {
       );
   }
 
-  getArtist(artistName: string): Observable<Artist> {
-    return this.http
-      .post(this.elsUrl + ElsService.ARTIST_INDEX_NAME + ElsService.ACTION_SEARCH,
-            JSON.stringify({
-              'query': {
-                'match_phrase': { 'Artist': artistName }
-              },
-              'size': ElsService.DEFAULT_SIZE
-            }), {headers: this.headers})
-      .pipe(
-        map(res => this.responseToOneTypedResult<Artist>(res, artistName)),
-        catchError(error => this.handleError(error, 'getArtist(' + artistName + ')'))
-      );
-  }
-
   getGenres(ordering: string = 'desc'): Observable<Bucket[]> {
     return this.http
       .post(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
@@ -283,25 +277,6 @@ export class ElsService {
       );
   }
 
-//   getGenreCount(): Observable<number> {
-//     return this.http
-//       .post<any>(this.elsUrl + 'song' + ElsService.ACTION_SEARCH,
-//             JSON.stringify({
-//               'aggs' : {
-//                 'genres' : {
-//                   'cardinality' : {
-//                     'field' : 'Genre.original',
-//                     'missing': 'N/A',
-//                   }
-//                 }
-//               },
-//               'size': 0
-//             }), {headers: this.headers})
-//       .pipe(
-//         map(res => res.aggregations.genres.value)
-//       );
-//   }
-
   getLastAddedAlbums(month: number): Observable<Bucket[]> {
     return this.http
       .post(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_SEARCH,
@@ -319,7 +294,7 @@ export class ElsService {
                 'date' : {
                   'terms': {
                     'field' : 'Date Added',
-                    'order': { '_term': 'desc' },
+                    'order': { '_key': 'desc' },
                     'size': 20
                   },
                   'aggs': {
@@ -363,26 +338,6 @@ export class ElsService {
       );
   }
 
-  getCountArtistSong(artistName: string): Observable<number> {
-    console.log('artistname: ' + artistName);
-    return this.http
-    .post<any>(this.elsUrl + ElsService.SONG_INDEX_NAME + ElsService.ACTION_COUNT,
-          JSON.stringify({
-            'query': {
-                'bool': {
-                    'should': [
-                        {'match_phrase' : { 'Album Artist' : artistName }},
-                        {'match_phrase' : { 'Artist' : artistName }}
-                    ]
-                }
-            }
-          }), {headers: this.headers})
-    .pipe(
-      map(res => res.count as number),
-      catchError(error => this.handleError(error, 'getCountArtistSong' + artistName + ')'))
-    );
-  }
-
   getSuggest(text: string): Observable<Suggested[]> {
     console.log('search sugget: ' + text);
     return this.http
@@ -418,7 +373,7 @@ export class ElsService {
    * @param res Response to process
    * @param name The searched name - for console output
    */
-  private responseToOneTypedResult<T>(res: any, name: string): T {
+  protected responseToOneTypedResult<T>(res: any, name: string): T {
     const hits = res.hits.hits;
 
     if (hits.length < 1) {
@@ -513,4 +468,13 @@ export class ElsService {
     console.error(error); // for demo purposes only
     return Promise.reject(error.message || error);
   }
+
+  protected addSortFilterToQuery(query) {
+    query.query.bool.must_not.push({
+      term: {
+        "Location.tree": this.defaultLocation,
+      },
+    });
+    return query;
+  }
 }

dashboard/src/app/genre/genre.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 
-import { ElsService } from '../els.service';
+import { ElsService } from '../els-service/els.service';
 import { SongTableComponent } from '../song-table/song-table.component';
 
 import { Song } from '../model/song';

dashboard/src/app/to-sort/to-sort.component.html

@@ -4,76 +4,78 @@
 <br />
 <div class="row cardAdmin">
   <div class="col-lg-3 col-md-3">
-      <div class="panel panel-blue">
-          <div class="panel-heading">
-              <div class="row">
-                  <div class="col-xs-3">
-                      <span class="glyphicon glyphicon-time stats_icon"></span>
-                  </div>
-                  <div class="col-xs-9 text-right">
-                      <div>
-                          <h3 *ngIf="!totalTime"><span class="glyphicon glyphicon-refresh loading"></span></h3>
-                          <h3 *ngIf="totalTime">{{totalTime | convertMs}}</h3>
-                      </div>
-                      <div><br>Total time ({{totalTime | convertMoreExact}})</div>
-                  </div>
-              </div>
-          </div>
-      </div>
+    <div class="panel panel-yellow">
+        <div class="panel-heading">
+            <div class="row">
+                <div class="col-xs-3">
+                    <span class="glyphicon glyphicon-play stats_icon"></span>
+                </div>
+                <div class="col-xs-9 text-right">
+                    <div>
+                        <h3 *ngIf="!trackCountSong"><span class="glyphicon glyphicon-refresh loading"></span></h3>
+                        <h3 *ngIf="trackCountSong">{{trackCountSong}} songs</h3>
+                    </div>
+                    <div>Total songs
+                        <br>~{{totalTime | convertMs}}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
   </div>
   <div class="col-lg-3 col-md-3">
-      <div class="panel panel-green">
-          <div class="panel-heading">
-              <div class="row">
-                  <div class="col-xs-3">
-                      <span class="glyphicon glyphicon-hdd stats_icon"></span>
-                  </div>
-                  <div class="col-xs-9 text-right">
-                      <div>
-                          <h3 *ngIf="!totalSize"><span class="glyphicon glyphicon-refresh loading"></span></h3>
-                          <h3 *ngIf="totalSize">{{totalSize | convertSizeToString}}</h3>
-                      </div>
-                      <div><br>Total size</div>
-                  </div>
-              </div>
-          </div>
-      </div>
+    <div class="panel panel-blue">
+        <div class="panel-heading">
+            <div class="row">
+                <div class="col-xs-3">
+                    <span class="glyphicon glyphicon-cd stats_icon"></span>
+                </div>
+                <div class="col-xs-9 text-right">
+                    <div>
+                        <h3 *ngIf="!neverListenSong"><span class="glyphicon glyphicon-refresh loading"></span></h3>
+                        <h3 *ngIf="neverListenSong">{{nbAlbums}}</h3>
+                    </div>
+                    <div><br>Albums</div>
+                </div>
+            </div>
+        </div>
+    </div>
   </div>
   <div class="col-lg-3 col-md-3">
-      <div class="panel panel-yellow">
-          <div class="panel-heading">
-              <div class="row">
-                  <div class="col-xs-3">
-                      <span class="glyphicon glyphicon-play stats_icon"></span>
-                  </div>
-                  <div class="col-xs-9 text-right">
-                      <div>
-                          <h3 *ngIf="!trackCountSong"><span class="glyphicon glyphicon-refresh loading"></span></h3>
-                          <h3 *ngIf="trackCountSong">{{trackCountSong}}</h3>
-                      </div>
-                      <div><br>Total Songs</div>
-                  </div>
-              </div>
-          </div>
-      </div>
+    <div class="panel panel-green">
+        <div class="panel-heading">
+            <div class="row">
+                <div class="col-xs-3">
+                    <span class="glyphicon glyphicon-hdd stats_icon"></span>
+                </div>
+                <div class="col-xs-9 text-right">
+                    <div>
+                        <h3 *ngIf="!totalSize"><span class="glyphicon glyphicon-refresh loading"></span></h3>
+                        <h3 *ngIf="totalSize">{{totalSize | convertSizeToString}}</h3>
+                    </div>
+                    <div><br>Total size</div>
+                </div>
+            </div>
+        </div>
+    </div>
   </div>
   <div class="col-lg-3 col-md-3">
-      <div class="panel panel-red">
-          <div class="panel-heading">
-              <div class="row">
-                  <div class="col-xs-3">
-                      <span class="glyphicon glyphicon-stop stats_icon"></span>
-                  </div>
-                  <div class="col-xs-9 text-right">
-                      <div>
-                          <h3 *ngIf="!neverListenSong"><span class="glyphicon glyphicon-refresh loading"></span></h3>
-                          <h3 *ngIf="neverListenSong">{{neverListenSong}}</h3>
-                      </div>
-                      <div><br>Never list. songs (~{{neverListenSong / trackCountSong * 100 | round}}%)</div>
-                  </div>
-              </div>
-          </div>
-      </div>
+    <div class="panel panel-red">
+        <div class="panel-heading">
+            <div class="row">
+                <div class="col-xs-3">
+                    <span class="glyphicon glyphicon-stop stats_icon"></span>
+                </div>
+                <div class="col-xs-9 text-right">
+                    <div>
+                        <h3 *ngIf="!neverListenSong"><span class="glyphicon glyphicon-refresh loading"></span></h3>
+                        <h3 *ngIf="neverListenSong">{{neverListenSong}}</h3>
+                    </div>
+                    <div><br>Never list. songs (~{{neverListenSong / trackCountSong * 100 | round}}%)</div>
+                </div>
+            </div>
+        </div>
+    </div>
   </div>
 </div>
 
@@ -89,22 +91,22 @@
         </tr>
     </thead>
     <tbody>
-        <tr *ngFor="let album of toSortAlbum">
+        <tr *ngFor="let album of albums">
             <td>
-              <a [routerLink]="['/album', album.key]">{{album.key}}</a>&nbsp;
+              <a [routerLink]="['/album', album.Name]" [queryParams]="{tosort: true}">{{album.Name}}</a>&nbsp;
             </td>
 
-            <td>{{albums[album.key]['Track Count']}}</td>
+            <td>{{album['Track Count']}}</td>
 
-            <ng-template [ngIf]="albums[album.key]['Album Artist']" [ngIfElse]="artistSection">
+            <ng-template [ngIf]="album['Album Artist']" [ngIfElse]="artistSection">
               <td>
-                  <a [routerLink]="['/artist', albums[album.key]['Album Artist']]">{{albums[album.key]['Album Artist']}}</a>&nbsp;
+                  <a [routerLink]="['/artist', album['Album Artist']]"  [queryParams]="{tosort: true}">{{album['Album Artist']}}</a>&nbsp;
               </td>
             </ng-template>
 
             <ng-template #artistSection>
               <td>
-                  <a [routerLink]="['/artist', albums[album.key].Artist[0]]">{{albums[album.key].Artist}}</a>&nbsp;
+                  <a [routerLink]="['/artist', album.Artist[0]]">{{album.Artist}}</a>&nbsp;
               </td>
             </ng-template>
 
@@ -115,12 +117,12 @@
             </ng-template>
 
             <td>
-              {{albums[album.key]['Play Count']}} ({{albums[album.key]['Play Count']/albums[album.key]['Track Count'] | number:'1.0-0'}}/songs)
+              {{album['Play Count']}} ({{album['Play Count']/album['Track Count'] | number:'1.0-0'}}/songs)
             </td>
 
-            <td class="star" [title]="(albums[album.key]['Album Rating Computed']?'Computed Rating: ':'Rating: ') + albums[album.key]['Album Rating']">
-            <span *ngFor="let item of numberToArray(albums[album.key]['Album Rating'], 20)">
-              <span class="glyphicon" [ngClass]="albums[album.key]['Album Rating Computed']?'glyphicon-star-empty':'glyphicon-star'"></span>
+            <td class="star" [title]="(album['Album Rating Computed']?'Computed Rating: ':'Rating: ') + album['Album Rating']">
+            <span *ngFor="let item of numberToArray(album['Album Rating'], 20)">
+              <span class="glyphicon" [ngClass]="album['Album Rating Computed']?'glyphicon-star-empty':'glyphicon-star'"></span>
             </span>
             </td>
         </tr>

dashboard/src/app/to-sort/to-sort.component.ts

@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ElsSortService } from '../els-sort.service';
-import { Album } from '../model/album';
+import { ElsSortService } from '../els-service/els-sort.service';
 import { Bucket } from '../model/bucket';
-import { Song } from '../model/song';
 
 import { Utils } from '../utils';
 
@@ -18,6 +16,7 @@ export class ToSortComponent implements OnInit {
   totalSize = 0;
   trackCountSong = 0;
   neverListenSong = 0;
+  nbAlbums = 0;
 
   // Global var
   toSortAlbum: Bucket[] = [];
@@ -31,59 +30,9 @@ export class ToSortComponent implements OnInit {
     this.elsService.getSize().then(result => this.totalSize = result);
     this.elsService.getCountSong().then(result => this.trackCountSong = result);
     this.elsService.getCountNeverListenSong().then(result => this.neverListenSong = result);
+    this.elsService.getNbAlbums().then(result => this.nbAlbums = result);
 
-    // **** GET ALBUMS ****//
-    const tmpToSortAlbums: Bucket[] = [];
-    this.elsService.getAlbums().subscribe(buckets => {
-      buckets.forEach(bucket => {
-        if (tmpToSortAlbums.length === 0) {
-          tmpToSortAlbums.push(bucket);
-        } else {
-          let found = false;
-          tmpToSortAlbums.forEach(element => {
-            if (element.key === bucket.key) {
-              element.doc_count += bucket.doc_count;
-              found = true;
-            }
-          });
-          if (!found) {
-            tmpToSortAlbums.push(bucket);
-          }
-        }
-      });
-
-      this.toSortAlbum = tmpToSortAlbums;
-      this.toSortAlbum.forEach(bucket => this.getAlbum(bucket));
-      // console.log(this.toSortAlbum)
-      // console.log(this.albums)
-    });
-  }
-
-  private getAlbum(albumBucket: Bucket) {
-    // For each bucket.key (album name), get Album document
-    // Use track count to compare
-    this.elsService.getArtistFromAlbumName(albumBucket.key).subscribe(albums => {
-      // Identification of the good album
-      let goodAlbum;
-      if (albums.length > 1) {
-        // More than one result for an album name: search good by track count
-        albums.forEach(album => {
-          if (album['Track Count'] === albumBucket.doc_count) {
-            goodAlbum = album;
-          }
-        });
-      } else {
-        // Just one result for album name
-        goodAlbum = albums[0];
-      }
-
-      // TODO Crap security if no good album found
-      if (goodAlbum == undefined) {
-        goodAlbum = albums[0]
-      }
-
-      this.albums[albumBucket.key] = goodAlbum;
-    });
+    this.elsService.getAlbums().subscribe(data => this.albums = data)
   }
 
 }

dashboard/src/app/top-played/top-played.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { ElsService } from '../els.service';
+import { ElsService } from '../els-service/els.service';
 import { Album } from '../model/album';
 import { Artist } from '../model/artist';
 

dashboard/src/polyfills.ts

@@ -22,16 +22,6 @@ import '@angular/localize/init';
  * BROWSER POLYFILLS
  */
 
-/** IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

dashboard/src/test.ts

@@ -17,7 +17,9 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

iTunesParser.py

@@ -192,7 +192,8 @@ class ITunesParser:
                 'Avg Bit Rate': track['Bit Rate'],
                 'Min Bit Rate': track['Bit Rate'],
                 # 'Album Artist': '',
-                'Total Time': 0
+                'Total Time': 0,
+                'Location': ''
             }
 
         # Compute information
@@ -207,6 +208,8 @@ class ITunesParser:
         self._albums[akey]['Play Count'] += play_count
         self._albums[akey]['Total Time'] += total_time
 
+        self._albums[akey]['Location'] = os.path.dirname(track['Location'])
+
         if self._albums[akey]['Min Bit Rate'] > track['Bit Rate']:
             self._albums[akey]['Min Bit Rate'] = track['Bit Rate']
 

mapping.albums.json

@@ -1,4 +1,28 @@
 {
+    "settings": {
+        "analysis": {
+            "analyzer": {
+                "custom_path_tree": {
+                    "tokenizer": "custom_hierarchy"
+                },
+                "custom_path_tree_reversed": {
+                    "tokenizer": "custom_hierarchy_reversed"
+                }
+            },
+            "tokenizer": {
+                "custom_hierarchy": {
+                    "type": "path_hierarchy",
+                    "delimiter": "/",
+                    "skip": 3
+                },
+                "custom_hierarchy_reversed": {
+                    "type": "path_hierarchy",
+                    "delimiter": "/",
+                    "reverse": "true"
+                }
+            }
+        }
+    },
     "mappings" : {
         "properties": {
             "Artist": {
@@ -21,6 +45,19 @@
             },
             "Genre": {
                 "type": "keyword"
+            },
+            "Location": {
+                "type": "text",
+                "fields": {
+                    "tree": {
+                        "type": "text",
+                        "analyzer": "custom_path_tree"
+                    },
+                    "tree_reversed": {
+                        "type": "text",
+                        "analyzer": "custom_path_tree_reversed"
+                    }
+                }
             }
         }
     }

mapping.songs.json

@@ -1,28 +1,24 @@
 {
     "settings": {
         "analysis": {
-          "analyzer": {
-            "custom_path_tree": {
-              "tokenizer": "custom_hierarchy"
+            "analyzer": {
+                "custom_path_tree": { "tokenizer": "custom_hierarchy" },
+                "custom_path_tree_reversed": { "tokenizer": "custom_hierarchy_reversed" }
             },
-            "custom_path_tree_reversed": {
-              "tokenizer": "custom_hierarchy_reversed"
+            "tokenizer": {
+                "custom_hierarchy": {
+                    "type": "path_hierarchy",
+                    "delimiter": "/",
+                    "skip": 3
+                },
+                "custom_hierarchy_reversed": {
+                    "type": "path_hierarchy",
+                    "delimiter": "/",
+                    "reverse": "true"
+                }
             }
-          },
-          "tokenizer": {
-            "custom_hierarchy": {
-              "type": "path_hierarchy",
-              "delimiter": "/",
-              "skip": 3
-            },
-            "custom_hierarchy_reversed": {
-              "type": "path_hierarchy",
-              "delimiter": "/",
-              "reverse": "true"
-            }
-          }
         }
-      },
+    },
     "mappings" : {
         "properties": {
             "Artist": {