sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Sarsoo/fmframework

Browse Source
This commit is contained in:
aj 2018-03-29 14:12:41 -07:00
commit caa408aadd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fmframework/src/sarsoo/fmframework/gui/AlbumView.java
View File

@ -50,6 +50,7 @@ public class AlbumView extends JFrame {
buttons.add(open); buttons.add(open);
buttons.add(viewArtist); buttons.add(viewArtist);
if (album.getWiki() != null) if (album.getWiki() != null)
buttons2.add(viewWiki); buttons2.add(viewWiki);
if (album.getMbid() != null) if (album.getMbid() != null)

10
fmframework/src/sarsoo/fmframework/parser/Parser.java
View File

@ -75,7 +75,6 @@ public class Parser {
return album; return album;
} }
return null; return null;
} }
public static Artist parseArtist(Document doc) { public static Artist parseArtist(Document doc) {
@ -124,9 +123,9 @@ public class Parser {
content = node.getTextContent(); content = node.getTextContent();
} }
} }
if(date != null && content != null) if (date != null && content != null)
wiki = new Wiki(date, summary, content); wiki = new Wiki(date, summary, content);
// if (wikiNodeList.item(0) != null) { // if (wikiNodeList.item(0) != null) {
// String date = wikiNodeList.item(0).getFirstChild().getTextContent(); // String date = wikiNodeList.item(0).getFirstChild().getTextContent();
// //
@ -224,13 +223,14 @@ public class Parser {
} }
public static Track parseLastTrack(Document doc) { public static Track parseLastTrack(Document doc) {
if (doc.getDocumentElement().getAttribute("status").equals("ok")) { if (doc.getDocumentElement().getAttribute("status").equals("ok")) {
String name = doc.getElementsByTagName("name").item(0).getTextContent(); String name = doc.getElementsByTagName("name").item(0).getTextContent();
// System.out.println(name); // System.out.println(name);
String artistName = doc.getElementsByTagName("artist").item(0).getTextContent(); String artistName = doc.getElementsByTagName("artist").item(0).getTextContent();
String albumName = doc.getElementsByTagName("album").item(0).getTextContent(); String albumName = doc.getElementsByTagName("album").item(0).getTextContent();
// System.out.println(albumName);
Track track = Track.getTrack(name, artistName, Reference.getUserName()); Track track = Track.getTrack(name, artistName, Reference.getUserName());
Album album = Album.getAlbum(albumName, artistName, Reference.getUserName()); Album album = Album.getAlbum(albumName, artistName, Reference.getUserName());