satellite/satbd-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes album display a bit nicer

Browse Source
This commit is contained in:
Alexandre Tuleu
2016-02-12 14:36:59 +01:00
parent cadd630a44
commit 830cec54c5
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/specs/album-service_test.js
View File

@@ -67,47 +67,38 @@ describe('Service: albumService', function() {
"8179": { "8179": {
"serieDisplay": "Mortes saisons", "serieDisplay": "Mortes saisons",
"titleDisplay": "Mortes saisons", "titleDisplay": "Mortes saisons",
"titleWithSerie": "Mortes saisons"
}, },
"44989": { "44989": {
"serieDisplay": "Abel Dopeulapeul", "serieDisplay": "Abel Dopeulapeul 2",
"titleDisplay" : "Sale temps pour mourir", "titleDisplay" : "Sale temps pour mourir",
"titleWithSerie": "Abel Dopeulapeul 2: Sale temps pour mourir"
}, },
"58595": { "58595": {
"serieDisplay": "", "serieDisplay": "",
"titleDisplay": "Des fourmis dans les jambes", "titleDisplay": "Des fourmis dans les jambes",
"titleWithSerie": "Des fourmis dans les jambes"
}, },
"9935": { "9935": {
"serieDisplay": "Bizu", "serieDisplay": "Bizu 5",
"titleDisplay": "La croisière fantôme", "titleDisplay": "La croisière fantôme",
"titleWithSerie": "Bizu 5: La croisière fantôme"
}, },
"164": { "164": {
"serieDisplay": "Les Eaux de Mortelune", "serieDisplay": "Les Eaux de Mortelune 5",
"titleDisplay": "Vague à lames", "titleDisplay": "Vague à lames",
"titleWithSerie": "Les Eaux de Mortelune 5: Vague à lames"
}, },
"32043": { "32043": {
"serieDisplay": "Accros de ...", "serieDisplay": "Accros de ... 2",
"titleDisplay": "Rap", "titleDisplay": "Rap",
"titleWithSerie": "Accros de ... 2: Rap"
}, },
"46005": { "46005": {
"serieDisplay": "Chick Bill", "serieDisplay": "Chick Bill 23",
"titleDisplay": "Le témoin du Rio Grande", "titleDisplay": "Le témoin du Rio Grande",
"titleWithSerie": "Chick Bill 23: Rap: Le témoin du Rio Grande"
}, },
"15875": { "15875": {
"serieDisplay": "Donc, Jean", "serieDisplay": "Donc, Jean",
"titleDisplay": "...donc, Jean.", "titleDisplay": "...donc, Jean.",
"titleWithSerie": "...donc, Jean."
}, },
"84448": { "84448": {
"serieDisplay": "Black Crow", "serieDisplay": "Black Crow",
"titleDisplay": "Black Crow raconte L'Hermione - La Conspiration pour la liberté", "titleDisplay": "Black Crow raconte L'Hermione - La Conspiration pour la liberté",
"titleWithSerie" : "Black Crow raconte L'Hermione - La Conspiration pour la liberté"
}, },
}; };
@@ -126,7 +117,6 @@ describe('Service: albumService', function() {
expect(err).toBe(undefined); expect(err).toBe(undefined);
expect(album.serieDisplay).toBe(expectedData[key].serieDisplay); expect(album.serieDisplay).toBe(expectedData[key].serieDisplay);
expect(album.titleDisplay).toBe(expectedData[key].titleDisplay); expect(album.titleDisplay).toBe(expectedData[key].titleDisplay);
expect(album.titleWithSerie).toBe(expectedData[key].titleWithSerie);
} }

21
webapp/js/services.js
View File

@@ -1,11 +1,32 @@
var services = angular.module('satbd.satellite.bar.services',[]) var services = angular.module('satbd.satellite.bar.services',[])
services.factory('albumService',['$http','$log','$q', function($http,$log,$q) { services.factory('albumService',['$http','$log','$q', function($http,$log,$q) {
var determinantRegexp = /^(.*) \(([Ll][eas']+)\)$/;
var removeSerie = /^\(.*\) .*$/;
function cleanupName(name) {
matches = name.match(determinantRegexp);
if (matches == null) {
return name;
}
return matches[2] + ' ' + matches[1];
}
function cleanupFields(album) { function cleanupFields(album) {
album.serie = album.série; album.serie = album.série;
album.série = undefined; album.série = undefined;
album.editeur = album.éditeur; album.editeur = album.éditeur;
album.éditeur = undefined; album.éditeur = undefined;
if (removeSerie.test(album.serie) == true) {
album.serieDisplay = '';
} else {
album.serieDisplay = cleanupName(album.serie);
if ( album.Num > -1 ) {
album.serieDisplay += ' ' + album.Num;
}
}
album.titleDisplay = cleanupName(album.titre);
return album; return album;
} }
function get(id) { function get(id) {