Fixed Fusion and ABCJazz scrapers.

bonnici · May 31, 2015 · 8009fb5 · 8009fb5
1 parent a5e3213
commit 8009fb5
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git a/main.js b/main.js
diff --git a/main.js.map b/main.js.map
diff --git a/main.ts b/main.ts
@@ -143,7 +143,7 @@ var scrapers:{ [index: string]: scrap.Scraper; } = {
 	DoubleJ: new doubleJ.DoubleJScraper("DoubleJ"),
 	WZBC: new wzbc.WzbcScraper("WZBC"),
     PlayFM: new janus.JanusScraper("PlayFM", "playfm"),
-	ABCJazz: new digMusic.DigMusicScraper("ABCJazz", "http://abcjazz.net.au/player-data.php"),
+    ABCJazz: new doubleJ.DoubleJScraper("ABCJazz", "http://music.abcradio.net.au/api/v1/plays/jazz/now.json"),
 	TheCurrent: new theCurrent.TheCurrentScraper("TheCurrent"),
 	LastFM: new lfmScraper.LastfmScraper("LastFM", LASTFM_API_KEY),
 	LastFMIgnoreListening: new lfmNoNowPlayingScraper.LastfmNoNowPlayingScraper("LastFMIgnoreListening", LASTFM_API_KEY),

diff --git a/scrapers/cheerio/FusionScraper.js b/scrapers/cheerio/FusionScraper.js
diff --git a/scrapers/cheerio/FusionScraper.js.map b/scrapers/cheerio/FusionScraper.js.map
diff --git a/scrapers/cheerio/FusionScraper.ts b/scrapers/cheerio/FusionScraper.ts
@@ -12,19 +12,26 @@ export class FusionScraper extends scrap.CheerioScraper {
     }
 
     getUrl(scraperParam?:string): string {
-        return "http://load.fusion.fm/" + scraperParam + "/title/nowplaying.php";
+        return "http://load.nexusradio.fm/" + scraperParam + "/title/nowplaying.php";
     }
 
     public parseCheerio($:any, callback:(err, newNowPlayingSong:song.Song, justScrobbledSong?:song.Song) => void):void {
         var divs =  $('body div div');
 
-        if (divs.length < 2) {
+        if (divs.length < 1) {
             callback(null, { Artist: null, Track: null });
             return;
         }
 
-        var track = divs.eq(0).text().trim();
-        var artist = divs.eq(1).text().trim();
+        var trackAndArtist = divs.eq(0).text().trim();
+        var dashIndex = trackAndArtist.indexOf("-");
+        if (dashIndex < 0) {
+            callback(null, { Artist: null, Track: null });
+            return;
+        }
+
+        var track = trackAndArtist.substring(0,dashIndex).trim();
+        var artist = trackAndArtist.substring(dashIndex + 1).trim();
 
         callback(null, { Artist: artist, Track: track });
     }

diff --git a/scrapers/json/DoubleJScraper.js b/scrapers/json/DoubleJScraper.js
diff --git a/scrapers/json/DoubleJScraper.js.map b/scrapers/json/DoubleJScraper.js.map
diff --git a/scrapers/json/DoubleJScraper.ts b/scrapers/json/DoubleJScraper.ts
@@ -10,9 +10,9 @@ import winston = require("winston");
 export class DoubleJScraper extends scrap.JsonScraper {
 	private url: string;
 
-	constructor(name:string) {
+	constructor(name:string, url?:string) {
 		super(name);
-		this.url = "http://music.abcradio.net.au/api/v1/plays/doublej/now.json";
+		this.url = url || "http://music.abcradio.net.au/api/v1/plays/doublej/now.json";
 	}
 
 	getUrl(lastfmUsername?:string): string {