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

logging to correct list, fixed return types

Browse Source
This commit is contained in:
aj 2019-05-02 15:14:24 +01:00
parent 0ecc01c1be
commit 402491949b
5 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/sarsoo/fmframework/fm/FmNetwork.java
View File

@ -2,7 +2,6 @@ package sarsoo.fmframework.fm;
import sarsoo.fmframework.log.Log; import sarsoo.fmframework.log.Log;
import sarsoo.fmframework.log.Logger; import sarsoo.fmframework.log.Logger;
import sarsoo.fmframework.log.console.ConsoleHandler;
import sarsoo.fmframework.log.entry.ErrorEntry; import sarsoo.fmframework.log.entry.ErrorEntry;
import sarsoo.fmframework.log.entry.InfoEntry; import sarsoo.fmframework.log.entry.InfoEntry;
import sarsoo.fmframework.log.entry.LogEntry; import sarsoo.fmframework.log.entry.LogEntry;
@ -77,31 +76,32 @@ public class FmNetwork {
try { try {
builder.setMbid(albumJson.getString("mbid")); builder.setMbid(albumJson.getString("mbid"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no mbid for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getAlbum").addArg("no mbid for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setUrl(albumJson.getString("url")); builder.setUrl(albumJson.getString("url"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no url for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getAlbum").addArg("no url for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setListeners(albumJson.getInt("listeners")); builder.setListeners(albumJson.getInt("listeners"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no listeners for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getAlbum").addArg("no listeners for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setPlayCount(albumJson.getInt("playcount")); builder.setPlayCount(albumJson.getInt("playcount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no play count for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(
new InfoEntry("getAlbum").addArg("no play count for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setUserPlayCount(albumJson.getInt("userplaycount")); builder.setUserPlayCount(albumJson.getInt("userplaycount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no user play count for").addArg(nameIn) log.logInfo(new InfoEntry("getAlbum").addArg("no user play count for").addArg(nameIn)
.addArg(e.getMessage())); .addArg(e.getMessage()));
} }
@ -114,13 +114,13 @@ public class FmNetwork {
builder.setWiki(wiki); builder.setWiki(wiki);
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("no wiki for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getAlbum").addArg("no wiki for").addArg(nameIn).addArg(e.getMessage()));
} }
return builder.build(); return builder.build();
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getAlbum").addArg("album name not found").addArg(e.getMessage())); log.logInfo(new InfoEntry("getAlbum").addArg("album name not found").addArg(e.getMessage()));
} }
return null; return null;
@ -160,33 +160,33 @@ public class FmNetwork {
try { try {
builder.setMbid(artistJson.getString("mbid")); builder.setMbid(artistJson.getString("mbid"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no mbid for").addArg(artistName).addArg(e.getMessage())); log.logInfo(new InfoEntry("getArtist").addArg("no mbid for").addArg(artistName).addArg(e.getMessage()));
} }
try { try {
builder.setUrl(artistJson.getString("url")); builder.setUrl(artistJson.getString("url"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no url for").addArg(artistName).addArg(e.getMessage())); log.logInfo(new InfoEntry("getArtist").addArg("no url for").addArg(artistName).addArg(e.getMessage()));
} }
try { try {
builder.setListeners(artistJson.getJSONObject("stats").getInt("listeners")); builder.setListeners(artistJson.getJSONObject("stats").getInt("listeners"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no listeners for").addArg(artistName) log.logInfo(new InfoEntry("getArtist").addArg("no listeners for").addArg(artistName)
.addArg(e.getMessage())); .addArg(e.getMessage()));
} }
try { try {
builder.setPlayCount(artistJson.getJSONObject("stats").getInt("playcount")); builder.setPlayCount(artistJson.getJSONObject("stats").getInt("playcount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no play count for").addArg(artistName) log.logInfo(new InfoEntry("getArtist").addArg("no play count for").addArg(artistName)
.addArg(e.getMessage())); .addArg(e.getMessage()));
} }
try { try {
builder.setUserPlayCount(artistJson.getJSONObject("stats").getInt("userplaycount")); builder.setUserPlayCount(artistJson.getJSONObject("stats").getInt("userplaycount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no user play count for").addArg(artistName) log.logInfo(new InfoEntry("getArtist").addArg("no user play count for").addArg(artistName)
.addArg(e.getMessage())); .addArg(e.getMessage()));
} }
@ -199,13 +199,13 @@ public class FmNetwork {
builder.setWiki(wiki); builder.setWiki(wiki);
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("no wiki for").addArg(artistName).addArg(e.getMessage())); log.logInfo(new InfoEntry("getArtist").addArg("no wiki for").addArg(artistName).addArg(e.getMessage()));
} }
return builder.build(); return builder.build();
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getArtist").addArg("artist name not found").addArg(e.getMessage())); log.logInfo(new InfoEntry("getArtist").addArg("artist name not found").addArg(e.getMessage()));
} }
return null; return null;
@ -249,31 +249,31 @@ public class FmNetwork {
try { try {
builder.setMbid(trackJson.getString("mbid")); builder.setMbid(trackJson.getString("mbid"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no mbid for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("no mbid for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setUrl(trackJson.getString("url")); builder.setUrl(trackJson.getString("url"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no url for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("no url for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setListeners(trackJson.getInt("listeners")); builder.setListeners(trackJson.getInt("listeners"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no listeners for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("no listeners for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setPlayCount(trackJson.getInt("playcount")); builder.setPlayCount(trackJson.getInt("playcount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no play count for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("no play count for").addArg(nameIn).addArg(e.getMessage()));
} }
try { try {
builder.setUserPlayCount(trackJson.getInt("userplaycount")); builder.setUserPlayCount(trackJson.getInt("userplaycount"));
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no user play count for").addArg(nameIn) log.logInfo(new InfoEntry("getTrack").addArg("no user play count for").addArg(nameIn)
.addArg(e.getMessage())); .addArg(e.getMessage()));
} }
@ -286,13 +286,13 @@ public class FmNetwork {
builder.setWiki(wiki); builder.setWiki(wiki);
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("no wiki for").addArg(nameIn).addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("no wiki for").addArg(nameIn).addArg(e.getMessage()));
} }
return builder.build(); return builder.build();
} catch (JSONException e) { } catch (JSONException e) {
log.log(new InfoEntry("getTrack").addArg("track name not found").addArg(e.getMessage())); log.logInfo(new InfoEntry("getTrack").addArg("track name not found").addArg(e.getMessage()));
} }
return null; return null;

4
src/main/java/sarsoo/fmframework/fm/FmUserNetwork.java
View File

@ -8,9 +8,7 @@ import java.util.HashMap;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import sarsoo.fmframework.log.Log;
import sarsoo.fmframework.log.Logger; import sarsoo.fmframework.log.Logger;
import sarsoo.fmframework.log.console.ConsoleHandler;
import sarsoo.fmframework.log.entry.InfoEntry; import sarsoo.fmframework.log.entry.InfoEntry;
import sarsoo.fmframework.log.entry.LogEntry; import sarsoo.fmframework.log.entry.LogEntry;
import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.Artist;
@ -297,7 +295,7 @@ public class FmUserNetwork extends FmNetwork {
Artist artist = getArtist(artistJson.getString("name")); Artist artist = getArtist(artistJson.getString("name"));
Logger.getLog().log(new InfoEntry("Tag").addArg(tagName).addArg(artist.getName())); Logger.getLog().logInfo(new InfoEntry("Tag").addArg(tagName).addArg(artist.getName()));
list.add(artist); list.add(artist);

11
src/main/java/sarsoo/fmframework/log/entry/ErrorEntry.java
View File

@ -1,5 +1,7 @@
package sarsoo.fmframework.log.entry; package sarsoo.fmframework.log.entry;
import java.util.ArrayList;
public class ErrorEntry extends LogEntry { public class ErrorEntry extends LogEntry {
protected int errorCode; protected int errorCode;
@ -13,6 +15,15 @@ public class ErrorEntry extends LogEntry {
return this; return this;
} }
@Override
public ErrorEntry addArg(String arg) {
if (args == null) {
args = new ArrayList<String>();
}
args.add(arg);
return this;
}
public String toString() { public String toString() {
String logString = String.format("%s !!%s", timestamp, method); String logString = String.format("%s !!%s", timestamp, method);

11
src/main/java/sarsoo/fmframework/log/entry/InfoEntry.java
View File

@ -1,11 +1,22 @@
package sarsoo.fmframework.log.entry; package sarsoo.fmframework.log.entry;
import java.util.ArrayList;
public class InfoEntry extends LogEntry { public class InfoEntry extends LogEntry {
public InfoEntry(String methodIn) { public InfoEntry(String methodIn) {
super(methodIn); super(methodIn);
} }
@Override
public InfoEntry addArg(String arg) {
if (args == null) {
args = new ArrayList<String>();
}
args.add(arg);
return this;
}
public String toString() { public String toString() {
String logString = String.format("%s \t>%s", timestamp, method); String logString = String.format("%s \t>%s", timestamp, method);

5
src/main/java/sarsoo/fmframework/log/entry/LogEntry.java
View File

@ -22,11 +22,6 @@ public class LogEntry {
return args; return args;
} }
public LogEntry setArgs(ArrayList<String> argsIn) {
args = argsIn;
return this;
}
public LocalDateTime getTimeStamp() { public LocalDateTime getTimeStamp() {
return timestamp; return timestamp;
} }