* fix and fine-tune AcoustID lookup logic
This commit is contained in:
Reinhard Pointner
parent
172ceec372
commit
a6d1e7eddf
|
|
@ -1,6 +1,6 @@
|
|||
package net.filebot.web;
|
||||
|
||||
import static java.util.Collections.*;
|
||||
import static java.util.Arrays.*;
|
||||
import static net.filebot.web.WebRequest.*;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -10,6 +10,7 @@ import java.lang.ProcessBuilder.Redirect;
|
|||
import java.net.URL;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
|
|
@ -25,9 +26,11 @@ import javax.swing.Icon;
|
|||
import net.filebot.Cache;
|
||||
import net.filebot.ResourceManager;
|
||||
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.json.simple.parser.ParseException;
|
||||
|
||||
import com.cedarsoftware.util.io.JsonObject;
|
||||
import com.cedarsoftware.util.io.JsonReader;
|
||||
|
||||
public class AcoustIDClient implements MusicIdentificationService {
|
||||
|
||||
private static final FloodLimit REQUEST_LIMIT = new FloodLimit(3, 1, TimeUnit.SECONDS);
|
||||
|
|
@ -57,22 +60,26 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
Map<File, AudioTrack> results = new LinkedHashMap<File, AudioTrack>();
|
||||
|
||||
for (Map<String, String> fp : fpcalc(files)) {
|
||||
results.put(new File(fp.get("FILE")), parse(lookup(fp.get("DURATION"), fp.get("FINGERPRINT"))));
|
||||
File file = new File(fp.get("FILE"));
|
||||
int duration = Integer.parseInt(fp.get("DURATION"));
|
||||
String fingerprint = fp.get("FINGERPRINT");
|
||||
|
||||
if (duration > 10 && fingerprint != null) {
|
||||
String response = lookup(duration, fingerprint);
|
||||
if (response != null && response.length() > 0) {
|
||||
results.put(file, parseResult(lookup(duration, fingerprint), duration));
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
public String lookup(File file) throws Exception {
|
||||
Map<String, String> fp = fpcalc(singleton(file)).get(0);
|
||||
return lookup(fp.get("DURATION"), fp.get("FINGERPRINT"));
|
||||
}
|
||||
|
||||
public String lookup(String duration, String fingerprint) throws IOException, InterruptedException, ParseException {
|
||||
public String lookup(int duration, String fingerprint) throws IOException, InterruptedException {
|
||||
Map<String, String> postParam = new LinkedHashMap<String, String>();
|
||||
postParam.put("duration", duration);
|
||||
postParam.put("duration", String.valueOf(duration));
|
||||
postParam.put("fingerprint", fingerprint);
|
||||
|
||||
String cacheKey = postParam.values().toString();
|
||||
String cacheKey = postParam.toString();
|
||||
Cache cache = getCache();
|
||||
String response = cache.get(cacheKey, String.class);
|
||||
if (response != null) {
|
||||
|
|
@ -83,7 +90,7 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
REQUEST_LIMIT.acquirePermit();
|
||||
|
||||
// http://api.acoustid.org/v2/lookup?client=8XaBELgH&meta=recordings+releasegroups+compress&duration=641&fingerprint=AQABz0qUkZK4oOfhL-CPc4e5C_wW2H2QH9uDL4cvoT8UNQ-eHtsE8cceeFJx-LiiHT-aPzhxoc-Opj_eI5d2hOFyMJRzfDk-QSsu7fBxqZDMHcfxPfDIoPWxv9C1o3yg44d_3Df2GJaUQeeR-cb2HfaPNsdxHj2PJnpwPMN3aPcEMzd-_MeB_Ej4D_CLP8ghHjkJv_jh_UDuQ8xnILwunPg6hF2R8HgzvLhxHVYP_ziJX0eKPnIE1UePMByDJyg7wz_6yELsB8n4oDmDa0Gv40hf6D3CE3_wH6HFaxCPUD9-hNeF5MfWEP3SCGym4-SxnXiGs0mRjEXD6fgl4LmKWrSChzzC33ge9PB3otyJMk-IVC6R8MTNwD9qKQ_CC8kPv4THzEGZS8GPI3x0iGVUxC1hRSizC5VzoamYDi-uR7iKPhGSI82PkiWeB_eHijvsaIWfBCWH5AjjCfVxZ1TQ3CvCTclGnEMfHbnZFA8pjD6KXwd__Cn-Y8e_I9cq6CR-4S9KLXqQcsxxoWh3eMxiHI6TIzyPv0M43YHz4yte-Cv-4D16Hv9F9C9SPUdyGtZRHV-OHEeeGD--BKcjVLOK_NCDXMfx44dzHEiOZ0Z44Rf6DH5R3uiPj4d_PKolJNyRJzyu4_CTD2WOvzjKH9GPb4cUP1Av9EuQd8fGCFee4JlRHi18xQh96NLxkCgfWFKOH6WGeoe4I3za4c5hTscTPEZTES1x8kE-9MQPjT8a8gh5fPgQZtqCFj9MDvp6fDx6NCd07bjx7MLR9AhtnFnQ70GjOcV0opmm4zpY3SOa7HiwdTtyHa6NC4e-HN-OfC5-OP_gLe2QDxfUCz_0w9l65HiPAz9-IaGOUA7-4MZ5CWFOlIfe4yUa6AiZGxf6w0fFxsjTOdC6Itbh4mGD63iPH9-RFy909XAMj7mC5_BvlDyO6kGTZKJxHUd4NDwuZUffw_5RMsde5CWkJAgXnDReNEaP6DTOQ65yaD88HoeX8fge-DSeHo9Qa8cTHc80I-_RoHxx_UHeBxrJw62Q34Kd7MEfpCcu6BLeB1ePw6OO4sOF_sHhmB504WWDZiEu8sKPpkcfCT9xfej0o0lr4T5yNJeOvjmu40w-TDmqHXmYgfFhFy_M7tD1o0cO_B2ms2j-ACEEQgQgAIwzTgAGmBIKIImNQAABwgQATAlhDGCCEIGIIM4BaBgwQBogEBIOESEIA8ARI5xAhxEFmAGAMCKAURKQQpQzRAAkCCBQEAKkQYIYIQQxCixCDADCABMAE0gpJIgyxhEDiCKCCIGAEIgJIQByAhFgGACCACMRQEyBAoxQiHiCBCFOECQFAIgAABR2QAgFjCDMA0AUMIoAIMChQghChASGEGeYEAIAIhgBSErnJPPEGWYAMgw05AhiiGHiBBBGGSCQcQgwRYJwhDDhgCSCSSEIQYwILoyAjAIigBFEUQK8gAYAQ5BCAAjkjCCAEEMZAUQAZQCjCCkpCgFMCCiIcVIAZZgilAQAiSHQECOcQAQIc4QClAHAjDDGkAGAMUoBgyhihgEChFCAAWEIEYwIJYwViAAlHCBIGEIEAEIQAoBwwgwiEBAEEEOoEwBY4wRwxAhBgAcKAESIQAwwIowRFhoBhAE
|
||||
URL url = new URL("http://api.acoustid.org/v2/lookup?client=" + apikey + "&meta=recordings+releasegroups+compress");
|
||||
URL url = new URL("http://api.acoustid.org/v2/lookup?client=" + apikey + "&meta=recordings+releases+releasegroups+tracks+compress");
|
||||
|
||||
// enable compression for request and response
|
||||
Map<String, String> requestParam = new HashMap<String, String>();
|
||||
|
|
@ -97,25 +104,48 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
return response;
|
||||
}
|
||||
|
||||
public AudioTrack parse(String json) throws IOException, InterruptedException, ParseException {
|
||||
Map<?, ?> data = (Map<?, ?>) new JSONParser().parse(json);
|
||||
private static Object[] array(Object node, String key) {
|
||||
return ((JsonObject<?, ?>) ((Map<?, ?>) node).get(key)).getArray();
|
||||
}
|
||||
|
||||
private static Map<?, ?> firstMap(Object node, String key) {
|
||||
return (Map<?, ?>) array(node, key)[0];
|
||||
}
|
||||
|
||||
private static Integer integer(Object node, String key) {
|
||||
Object value = ((Map<?, ?>) node).get(key);
|
||||
return value == null ? null : new Integer(value.toString());
|
||||
}
|
||||
|
||||
public AudioTrack parseResult(String json, final int targetDuration) throws IOException, InterruptedException, ParseException {
|
||||
Map<?, ?> data = (Map<?, ?>) JsonReader.jsonToMaps(json);
|
||||
|
||||
if (!data.get("status").equals("ok")) {
|
||||
throw new IOException("acoustid responded with error: " + data.get("status"));
|
||||
}
|
||||
try {
|
||||
for (Object result : (List<?>) data.get("results")) {
|
||||
for (Object result : array(data, "results")) {
|
||||
try {
|
||||
Map<?, ?> recording = (Map<?, ?>) ((List<?>) ((Map<?, ?>) result).get("recordings")).get(0);
|
||||
// pick most likely matching recording
|
||||
Object[] recordings = array(result, "recordings");
|
||||
sort(recordings, new Comparator<Object>() {
|
||||
|
||||
String artist = (String) ((Map<?, ?>) ((List<?>) recording.get("artists")).get(0)).get("name");
|
||||
@Override
|
||||
public int compare(Object o1, Object o2) {
|
||||
Integer i1 = integer(o1, "duration");
|
||||
Integer i2 = integer(o2, "duration");
|
||||
return Double.compare(i1 == null ? Double.NaN : Math.abs(i1 - targetDuration), i2 == null ? Double.NaN : Math.abs(i2 - targetDuration));
|
||||
}
|
||||
});
|
||||
|
||||
Map<?, ?> recording = (Map<?, ?>) recordings[0];
|
||||
String artist = (String) firstMap(recording, "artists").get("name");
|
||||
String title = (String) recording.get("title");
|
||||
|
||||
AudioTrack audioTrack = new AudioTrack(artist, title, null);
|
||||
try {
|
||||
Map<?, ?> releaseGroup = (Map<?, ?>) ((List<?>) recording.get("releasegroups")).get(0);
|
||||
List<?> releases = (List<?>) releaseGroup.get("releases");
|
||||
|
||||
Map<?, ?> releaseGroup = firstMap(recording, "releasegroups");
|
||||
Object[] releases = array(releaseGroup, "releases");
|
||||
if (releases != null) {
|
||||
for (Object it : releases) {
|
||||
try {
|
||||
|
|
@ -123,7 +153,7 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
Map<?, ?> release = (Map<?, ?>) it;
|
||||
Map<?, ?> date = (Map<?, ?>) release.get("date");
|
||||
try {
|
||||
thisRelease.albumReleaseDate = new SimpleDate(Integer.parseInt(date.get("year").toString()), Integer.parseInt(date.get("month").toString()), Integer.parseInt(date.get("day").toString()));
|
||||
thisRelease.albumReleaseDate = new SimpleDate(integer(date, "year"), integer(date, "month"), integer(date, "day"));
|
||||
} catch (Exception e) {
|
||||
// ignore
|
||||
}
|
||||
|
|
@ -132,13 +162,13 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
continue;
|
||||
}
|
||||
|
||||
Map<?, ?> medium = (Map<?, ?>) ((List<?>) release.get("mediums")).get(0);
|
||||
thisRelease.mediumIndex = new Integer(medium.get("position").toString());
|
||||
thisRelease.mediumCount = new Integer(release.get("medium_count").toString());
|
||||
Map<?, ?> medium = firstMap(release, "mediums");
|
||||
thisRelease.mediumIndex = integer(medium, "position");
|
||||
thisRelease.mediumCount = integer(release, "medium_count");
|
||||
|
||||
Map<?, ?> track = (Map<?, ?>) ((List<?>) medium.get("tracks")).get(0);
|
||||
thisRelease.trackIndex = new Integer(track.get("position").toString());
|
||||
thisRelease.trackCount = new Integer(medium.get("track_count").toString());
|
||||
Map<?, ?> track = firstMap(medium, "tracks");
|
||||
thisRelease.trackIndex = integer(track, "position");
|
||||
thisRelease.trackCount = integer(medium, "track_count");
|
||||
|
||||
try {
|
||||
thisRelease.album = release.get("title").toString();
|
||||
|
|
@ -146,14 +176,15 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
thisRelease.album = (String) releaseGroup.get("title");
|
||||
}
|
||||
try {
|
||||
thisRelease.albumArtist = (String) ((Map<?, ?>) ((List<?>) releaseGroup.get("artists")).get(0)).get("name");
|
||||
thisRelease.albumArtist = (String) firstMap(releaseGroup, "artists").get("name");
|
||||
} catch (Exception e) {
|
||||
thisRelease.albumArtist = null;
|
||||
}
|
||||
thisRelease.trackTitle = (String) track.get("title");
|
||||
|
||||
if (!"Various Artists".equalsIgnoreCase(thisRelease.albumArtist) && (thisRelease.album == null || !thisRelease.album.contains("Greatest Hits"))) {
|
||||
audioTrack = thisRelease;
|
||||
// full info audio track
|
||||
return thisRelease;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Logger.getLogger(AcoustIDClient.class.getName()).log(Level.WARNING, e.toString(), e);
|
||||
|
|
@ -163,6 +194,8 @@ public class AcoustIDClient implements MusicIdentificationService {
|
|||
} catch (Exception e) {
|
||||
Logger.getLogger(AcoustIDClient.class.getName()).log(Level.WARNING, e.toString(), e);
|
||||
}
|
||||
|
||||
// basic info audio track
|
||||
return audioTrack;
|
||||
} catch (Exception e) {
|
||||
// ignore
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import net.sf.ehcache.CacheManager;
|
|||
import org.json.simple.parser.ParseException;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
public class AcoustIDClientTest {
|
||||
|
|
@ -18,24 +17,23 @@ public class AcoustIDClientTest {
|
|||
|
||||
@Test
|
||||
public void lookup() throws Exception {
|
||||
String duration = "357";
|
||||
int duration = 357;
|
||||
String fingerprint = "AQADtIkSJWGWREF0XTiH0j_4aAl--JiZ4w8me4GP8FmgIuNRUQzO49vxzBrOg9o69MiDfh8cmtC-4yRysN7RP3io4wvuwF-OWpmRN0KtQ_yHI9fD4wglHReJC7UyFs9l2A00K8IpoVdohImY47tx8RmYZz5SpUQPfRrB6Knw6PgDeBoP_UckjheO30N1wkePnJWgo1lXHdMmHu2WED6qH38g1o3wxDbuOOgJM0PV46G64h-aXC80yseZNcF7MCRxH44Woie0hjscHe-Ol0c-EleCnMEX1cIP8YOeDleQesIVHg96CX9KXPnwHYyQ0GEuhM-Inxt-nEIpGnaTI0xFfFCPVN-IUz--pBqayUHJ7DiaRzlcJh565cXhScdPsNKDPmNhJ0ePHz_a5ch1vMHxL0fjED_eoz8abfgF3UcvfMQJO0c_VHvgIw_RE_h-lD3So4fa5LimFFkWVDtOGseVotxhnsiPH-JPIbyOS47xoRkZVNyOf2gu9CKO5AniDl16mMdfBTcNHzwP_6h1RMePnjpC8ThPVMcznUTJCHmTQZckPEf_4KY3XDn0HumPMsfV40ZzjTOeI5cJvccTI_xnVJ_RnF3wZMxRqYcPH-HHQT9y4HmMZn1QHX9O3ATyHIefoxJ1WC364Dx-_Id2NF-O78F_HP8hqhruXIF-PEfTDeGDH0ec7dCD6Afzoces41Fy46IohMkTaOLxLOVR7oZYG1fhPIeVRccXBf9x_PjxC04oXUUfQf9x5D8qw052dE9X_PiFRwlOE7-EH-V1POKHMyV6Yc9wHOyOeByF7ob44DtiHz92-LiOHx5r-DkqazM6JkqLMLkIPUeeMTGHMztSC_pw2UH-Y184JfiHPtphleij4_jxol2RXtGh7_CRi4FrIrxu0JJy1M8hXgM9Eul0hFCUX-iPH40iGWWoos9XaClL5MKfHlPUDNUi_GB6XGC6HZ8RiYT4HBWFH-G08Lhk9A_uHReJMGeMdoHyD0f4DBYDxOqHHXpSDo4uoY1TlD0ardRwnIH5HL-wUo_QfJC1w3vRa7g4NOPR49FiaPnyDLWO72j-oB6uoBbxBSSFH2J-ZHrgTyilLMfxxbieoM8bWOqF_sTxB312NMEjZD-0vXDWI7sVfHnw49kEbxvyD6oHK8wTVNqQoz2aODmO8EwgSlFxyYavB5_wC-Zy6MR2HZWZ4s3RUEeND2G-Cy0fYUophA9zdPug7HxQ6Tlif0GP_6jVGWdwoZkeFeEX4d3xKGhCET126B_yC09qzLFxJmjiwzquLBri5kkgLkdI4X6QZ3nxG1oikUWkiviJH6dQ_UXUKUj4B3ZMvEqCZ0RvoukRehfkc8hdbJEkDR_44pFE4UtQmwOTI7mQG2-koJl2dMnW499g78F-5MkKUeGOHd-D8IdHmNWJaTl6HWF-oaKkHFomCs9yIacF91Px4wrChTSaSMqDQ_lL5METpcR-_CYaMqh0dIcrpoibWAkS9ijxHXfIFaH5YIrIQ3d6xHtxBtcuTHnQfwH6xQiTasEvaOuPxvuAv4f45DEiTjxOC-xjNKNk0MsCK0s-5BCPXiK-Bg23ByUTdF_g8YPeIGV19Mf3oFwCq1IchCJKFsq4REcs4com_CPCE18SUrgVwT8OfUXzB-FvfDzCZLuE8LiCXA3q7RA_B_VxHdfkCGeWLJiSIz-iuYH2I7qLH194XB6uEvsMP0d-6DhTNMsyVNojaLlQy8eRV8KW58h1QiKPUHQM8-BFzE_wFleCZImeI9dw5kLVJ2hu4hKeCU22Ef0j5FMMrfKRxjl8vMKjHI-VFD1OHpdwJWUiuPwQ34auFOG05UcTKrmAX0Qbw4yOfgh5_Eej48pafBH2awt-QTuaSsKX49MOjXzgFO0YISeNh8SU8-gR_ym6SimaaTvU7fiXwH3w4A76yMOUeId2fEcsBeZy-EfO5NgNcS_88Qi1ZUV5hBF34dCZo9mPsEuwHyX5INWOS5BUkQt6BH3F4yGDM8ipwyjJCxI36bhSGeaP91D14VsOLTvOUENk3CLxw_GCMs8k5LqgPJUGe0eOqyoaHqEoNRr-QDt9pJIs_MJJ4T2-Y282-DnK47dw8piiHX2WF9dCHA2nTng25BR89MQ-aL_whsZpNDGP56iP5g-OU8zh88G1HPsBJo9o5Dku6uBrpCMFXscDHfGews9xEdwEq5lX9A3-GWeOkKSFd1DOIqY4Hn6Y4VqGi3CbYEfqSNGgUUN-tI_RxIlKXLvQ_3AlSXjwG9s0HPEjw1cUEQ95NORxXsnwQzOHZox6fDJVtEriCdEdPDv-40qHbQy6aTk-hRs-nDLjIOzoQstDHQ9znMpj5HnQJIoz9ImOfRvxI_-hWccX5Ecz5ngehDq0yFHwZYiPZsthRjzKp8Md1EcjNgUvCdUPJu2NZ0VjYnrQ0_CmBZWyR0L4CI2I53gyFukf5JIXrFl46FsY4ZlYI3yKreJRPvhxPfCD4x-uJ4hW4YOeIoym4wp44Q9-1Br4EkUan4FW5fi2DCEpqcJ14cqLhykaLjt-4TuJnkGaBqJ0IdTH4NTRS0ZzGR-aM6jEH8mj5EF-NNfRJ3jwJwgDzd6QH1eiRMe5JHiP5sHxMFmQ94Oq7BLC3XiPqy9Cicmh5Q8AoYwQjAlNGAKCOYQAc0IoIARxYjFhBEEAICMMAcBopwgBzCADCBHCImSsMwwCAAwRwCoghRBCGKCQUAIhYJABSACnpHBEEAQA0QIiBKQgAiChgEDCE00YBoAAAkgSADFoiFFIMUkocUA5AAQ1SAjHkBECMEWAUBoARLyTDBApERGEAkGEABQ4QgBzgBEDtDFISE2BAkgASgQChAkEICCIOAYMBZIoQAgBAAjAiDFKicKEEwQACSggRAMnIQBGCYCQkMAxIwAhTiFFICBGWIMUMYhAIhQiTgAiALMMQSAEAAIYIRggAgRNCGJUEGUAMc55bAAjCCJIlmIKEIWUIAABQBQgDiABQYFKAEPEEQQABRgwxiAAjCcCKMagccAQJwgwQABAgEjAGWGIAoAhgSgRUGEjhFACIMgQAwwJwBkQAgggGDDCKAUUMgQxwwggZBARAAAEAmKIEAZBAAgABAAhhBECEIOgIA5owpRhRBFECKBKCIKIJwQAQggxkBDEpCGCG4AIIkQoBQURShAqiAGEAEQAhkYJIpmRBEjiDAMCEGEYMQAQQRwCAiABCGCCgCqIUcAQBAwCTgBBIFCCGQAAEgIjAoBjyhArBAJGIQMIQgAA65iQwAlADAMCMMgEAYQYR5wRABgFjQECAGaEYgAYpRjlQBDoCBCEWScEMIICIIkwgiCkEDFYQEOQIIIA4AhDTAAiAJACAGGEAE5AoIxCQBggKBDIQEeck0IwYoiBTAjEDCBACQBMQ4AgIoAQTCkjGGAACEUBQkw4IojAwAAOACGAIYAE8EoBRAACLhgRgCCIAIWIEAwQASBRBgBDBTBICQCgJIgojBRRDDBhgAAEGCAoFsAyRIwQhBDFHBQCGBKFIhQiBQClRAAlgENCAWYMIcwQQIgDAAACICHIKQMMIEQJQZUwRgGDgDAC";
|
||||
|
||||
String response = client.lookup(duration, fingerprint);
|
||||
AudioTrack info = client.parse(response);
|
||||
AudioTrack info = client.parseResult(response, duration);
|
||||
|
||||
assertEquals("Michael Jackson", info.getArtist());
|
||||
assertEquals("Thriller (instrumental)", info.getTitle());
|
||||
assertEquals("Thriller", info.getTitle());
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void lookupChinese() throws IOException, InterruptedException, ParseException {
|
||||
String duration = "265";
|
||||
int duration = 265;
|
||||
String fingerprint = "AQADtJmWRFJCRkGcHXceND_Oquhz1H_xvjg8D8mYIf5-fOpKVE81NOOF5_hb1PrxJLhhRxfCLkNSOh-61Mvh3DJKOcMnG2eOPsmH_4R_I-SPJB-Df0NTB70-vPiDRtKOS3qK-Duhc8mR9-jyoOvhKhyJH-8FE5eOHHoy3BpC5Tieo_kV9LiZ41McHCF9iJmDPFTQPeiYHD5J_Cfy7DBz_IdxrXBRMTyeP9CSLeJQ8glyC18S5imeSHkSPBeavwgfHrqSD7l09Fl2mGMDVzmekAzS_Gi3HPJbIr0VvD2eJD8u-eAPxytyMccTTQ8u5YmR63iG5jm6UG3wJcmFyzFuNEclvcETfcSb4T-aDz0RWoGs5MQlg9mUBXlyodYjbId_lHke4vPxCFuO5-iNJkw-5FseJM9RckFPHJ-kH3USNL_w4i7xpT5iHvlCVOIR5viFJyFK2Yd59DzqHe8wNUfJF1rwakJTZdB_TJkk5Ntx6YOb7MHj40SZh1ERZv3wD3yaohmzC-2DyM_xND_e48-CWx-6H5FC6ApxpUf-4jpyuEo64VLCZsrwHXcWlBcaDdeWI6Zz5D9qQ0wz4WNPPPCYWWgv6OTw7Ugb_Ghihkd4gdKSqBL0hGyCH1q59GjkHaeQJ0fJLEbz2XiOmBu-RIemG55TDmGPJ3i04zouycIZuMrI4Exz480xqvnxhUS68oHKTD7-I1LGLEX7CteFmNGDD3qO6UvQRNSxKsoVXDnurEHzYWIfPKmFWJqJp3OQP4c5Ukqhx0QeY_-OXj1MLozw6AzqJBmOfNCUKslDhOHB40mGR19wHT0RplRwMsQT5VGG_Kh--D2qKEpU4quFc0Z5NIx4fJIXnHjR73COkNCaJEdF0cifE2SkPHiEJj76Y8qzHO27FE-O79hyS8R59HoQRssV6NKRx6i-o2eKP0ednGiq4Ej1oHeGZgqJnzOeCyEzvmh0XCryaLlRSUJ6YjpxHdd04-qE_kVz_EGNOsR84cuFMJNooWIgNzziKw2anUeZ5cYzBbyI3jnCPB90R0L0hFSBJxfmLLPQHF2T4Ql5nD2eWMFtwnWQL8msQF-MfEezC0x34wue48kRktORUIcbB-fhZw-87ArKI8-E5AmD-mieB7dyXKQYXMvxHDkU5T9K8sTTQ1eLPkeYG992xAweQ-eD5lmDUN_xicaX6PiNM1vxw91InGmOv7ior_AXPDueXbiOhlwkHeUV_DF-5D90Fc1zJCMzK8aT45KNV0XzYvJxJccfIZ-RLEdPKcGzDkdPonmWDMcf4WFy_MGTFVoiGp3WRwOfZMd1PDnxJ4GbCc9O5Eeih2jWo2_AKpPxKMTFHVWOhEdo_AmuD89yNJETdEdSHmGcHEezrjFoCZf0w8Lo7PC54M6DT-vwhEcPP4Hzo9uOH98TJH_TIRJzHNaS4-TBz8nRh8GZFz-eG08f9MzRrDu-iMjWC5eG_wjpoQl_zNHx3mh6BT09o1Zg93iKZj0uhSQmH8nyBHl3VHszUM9RytLwJEqKmT96NC-H41eIHzk0PUeYSx_WCE9y4qaGo7KUomk0C9eJ5L-RfUFzodSLJ3goHX3gHHkJPUMuFdfyJHB8hCeSZxH4BE1vVL6CrkmM6lEePGeK_Ei0v8KTw9GRb3gO_YfjLMgn6agYIh3xfIJ2T8jDodR2OAyso8e3bIrhJgyHHzvyKhCjpxE-MUIezeiD5suW4LzxJEfMlEJy4VFCNNeLUjqeJJ6OP8PNwsfTB9dxHUmeXAgzLuHQ4wljfDqahegj4R2JKzlO5fiDkuERJkfiKVHwxB_OHPyH6soEJk07fB9u6CyF5rmCflFwBdyiRHg4IReSBfWDX8GnHGVGNHOE-NCssEjTHFeNplsPdgmqKBea8eiD5jwuBo-SZ6gkfmhk4U6EpmKOPviJUD-S50WVgE911Id9HX3k4AmHG-9fPAneJ-hBjcWjoPzxHI9JhDSx5awQSlGPWg_8bULPHE2VE30oNNNQb7hyTD4aVUYeQUv2Ivzw1AEd7Wge9Ph-4M_xC89uJEusIVyY4cWTRC_-4-hNNI2WSciP5J3BL_Au4UyPKzgaPUN4yAuP0Dw85jqejE6CUNCRZ8OTo-mD58atGJ0jXjjjIxd09gh7hNnx4UkOnYe_4MQDTWJgaauE8Bc-KmgTDQ_6CleKD6Z8Yufxtwh1QcuCfEmGS4rwE_444TniREmOH-_wCP6MO2mDNUouPNEPTUfzqMPZI1_EB1feHDeFkjzCjMygJznuI2dYouXhS3gfhOXxi9Ap2Uj14DyeJFl6sHrwH37wKRm-8HiUJwnOC-UTNFJ1XMwz4eKDr0GbH54kVJWC78GpVfjRHD2SLcmGb0f44SAj5WgfNGOO5j36K_jUo09mNMWDbrbQOEcsLSeS50fPHL9QUceFKhOP4w_cGKGV489FPD0aJTvKP_hE6EmGpkKZH7ri4FRm44o5oZQ5-Jh-ou_RNImCw1GqTYjMo_aDRsuO__gS-CKefQlyKSf4NEdPGmGOP8eZKbjihzh1nJ_QvEa4Q6VC4UqkIz_-oEeYUH3wRR--C10JD7WOMwquhwbPQ9t6Iw1TXMNPnBciZXkC1YiYRSxq-MI35KikzEoCpcrxLNB2NDlyKcPIGH0OH3eE5wglrdB3hOGH6eKEMw725Oh39DN-NP1RMaGHhznu7Ei_ZIWei7iSCnmOZvbQM1zQ78hTo-aA6ROhJWKi49OxJzdi9fgUlL_RNMm644suXEcsJjua69BsfFpKPDrCV4fPIFe-4IknofKNo9O0Q9L4oFauoBzaiD7eG018oZSj44nW4HlCNPFioa2CPMyFUzye5vjR7mgibTitiRh5Yj7aCQAIMEQoACCQQABhCBNGCMGUEcAYYg1AQCAhDDAAAAagAQAQAAh0BmBCiPAMEHOUAAogASCBBAAklFBEEWaEIkQAAAQjQAgAgHHCIASIA0gQQwQASBggBBFKUCMAIFQSBIQERAnCECRWEACEQJIipYABnIEhACECEUAIs8wg4QRCACBmBCAEKAEIAwYpABSACAAECASCCEKgE04oYBRQChgHhABkAUEAEAIwAwAgQFAgFGMUGcIoA0AIARgAyBhAFKIKCEOIAgQZIARARhgggBGUAYiRAUAIRYQEBABAkBAECOMMIgAIhIQBCiCFCHBMEASAAEoACogoCAFGgGUGWIUAMIgRBIAzhgAFFAJEAEIEgAwZoBgAmCFmhKEMGAAUAAYsQgABgChgNAUGAASIgEAYB4gRQABBBGMGCKEAAIwggShwCChkgGIEGQaocoQBoLRBSACOHALEMQAEAkwAYoAkTDkDICEKIUMQAEQEQRRAgBCJACJCIWSAAKwBQYQABEkCBRHAAEUAoAJIgYBQTAkDAAEIIGEEMIsQx4wAwhgiEQFCGAQQA0oY4gUhCgElgEHEOECEUAYhJAQwxBgJJANIUQKEIYIoARgDhhlAHFBIIAmQQRYhoAhhCBgnLCKEKCEQIQEIR4RTCgkkCAKGCmQQQQAQgAQFgBFBCCGSAwAEIcoIoJQEDCHhEDAKKmCREswQohAgiglkACACKgOhMUAhRgwCBAipEFGMAAGEUABYhAhSAiEFoFEQASGAIAAxJQiESDEHgCEISAEQEAAIJwhAShGoBAUAUCaIUAwIgQgzghgggECAKCIcMQoJxYgSwABlhACAMgMAEkwCpCBzhgADGDACWMIEA0YbIQBiQAAgGCFAKCCEJBAAAYwhAGmiCCOOAIEcMwAIggBzjBhHmHeMSCGIEggiAA0jTCHjCABCAAUQIUQJIowQggFkKBEAGCEBBMQgBIARBkGDCCFGCMMMIIAgQBgSSAI";
|
||||
|
||||
String response = client.lookup(duration, fingerprint);
|
||||
AudioTrack info = client.parse(response);
|
||||
AudioTrack info = client.parseResult(response, duration);
|
||||
|
||||
assertEquals("周杰倫", info.getArtist());
|
||||
assertEquals("聽媽媽的話", info.getTitle());
|
||||
|
|
|
|||
Loading…
Reference in New Issue