artist wiki working
This commit is contained in:
parent
caa408aadd
commit
bf7f7dcf2d
@ -40,7 +40,7 @@ public class WikiView extends JFrame {
|
||||
super(name);
|
||||
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
||||
setLayout(new GridLayout(1,1));
|
||||
setSize(400, 500);
|
||||
setSize(500, 700);
|
||||
// setResizable(false);
|
||||
|
||||
// buttons.setLayout(new FlowLayout());
|
||||
|
@ -9,8 +9,8 @@ import sarsoo.fmframework.net.TestCall;
|
||||
import sarsoo.fmframework.parser.Parser;
|
||||
|
||||
public class Artist extends FMObj{
|
||||
protected boolean streamable;
|
||||
protected boolean onTour;
|
||||
// protected boolean streamable;
|
||||
// protected boolean onTour;
|
||||
protected ArrayList<Album> albums;
|
||||
protected ArrayList<Artist> similarArtists;
|
||||
protected ArrayList<Tag> tagList;
|
||||
@ -19,13 +19,13 @@ public class Artist extends FMObj{
|
||||
super(name, null, null, 0, 0, 0, null);
|
||||
}
|
||||
|
||||
public Artist(String name, String url, String mbid, int listeners, int playCount, int userPlayCount, boolean streamable, boolean onTour, Wiki wiki) {
|
||||
public Artist(String name, String url, String mbid, int listeners, int playCount, int userPlayCount, Wiki wiki) {
|
||||
super(name, url, mbid, listeners, playCount, userPlayCount, wiki);
|
||||
}
|
||||
|
||||
public static Artist getArtist(String name, String username) {
|
||||
String url = Network.getArtistInfoUrl(name, username);
|
||||
TestCall.test(url);
|
||||
// TestCall.test(url);
|
||||
Document response = Network.getResponse(url);
|
||||
Artist artist = Parser.parseArtist(response);
|
||||
return artist;
|
||||
|
@ -112,19 +112,23 @@ public class Parser {
|
||||
Node node;
|
||||
for (counter = 0; counter < wikiContents.getLength(); counter++) {
|
||||
node = wikiContents.item(counter);
|
||||
System.out.println(node.getNodeName() + node.getTextContent());
|
||||
|
||||
if (node.getNodeName().equals("published")) {
|
||||
System.out.println(node.getNodeName() + node.getTextContent());
|
||||
date = node.getTextContent();
|
||||
}
|
||||
if (node.getNodeName().equals("summary")) {
|
||||
System.out.println(node.getNodeName() + node.getTextContent());
|
||||
summary = node.getTextContent();
|
||||
}
|
||||
if (node.getNodeName().equals("content")) {
|
||||
System.out.println(node.getNodeName() + node.getTextContent());
|
||||
content = node.getTextContent();
|
||||
}
|
||||
}
|
||||
|
||||
if (date != null && content != null)
|
||||
System.out.println("wiki init");
|
||||
wiki = new Wiki(date, summary, content);
|
||||
// if (wikiNodeList.item(0) != null) {
|
||||
// String date = wikiNodeList.item(0).getFirstChild().getTextContent();
|
||||
@ -147,7 +151,7 @@ public class Parser {
|
||||
// }
|
||||
}
|
||||
|
||||
Artist artist = new Artist(name, url, mbid, listeners, playCount, userPlayCount, false, false, null);
|
||||
Artist artist = new Artist(name, url, mbid, listeners, playCount, userPlayCount, wiki);
|
||||
return artist;
|
||||
}
|
||||
return null;
|
||||
|
Loading…
Reference in New Issue
Block a user