kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

improve/cleanup_logger #137

Merged
Fujimatsu merged 3 commits from improve/cleanup_logger into main 2024-07-06 02:07:48 +00:00
Conversation 0 Commits 3 Files Changed 3 +2 -38
3 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugCommandProcessor.java
View File

@ -121,19 +121,7 @@ public class DebugCommandProcessor {
commandArray = shiftArray(commandArray); commandArray = shiftArray(commandArray);
switch (commandArray[0]) { switch (commandArray[0]) {
case "get": case "get":
commandArray = shiftArray(commandArray); return "Removed for performance reasons";
switch (commandArray[0]) {
case "all":
List<LogModel> logs = ksLogger.getHistory();
StringBuilder logString = new StringBuilder();
for (LogModel log : logs) {
logString.append(log.getMessage());
logString.append("\n");
}
return logString.toString();
default:
return "TODO";
}
case "insert": case "insert":
commandArray = shiftArray(commandArray); commandArray = shiftArray(commandArray);
String[] logArray = Arrays.copyOfRange(commandArray, 1, commandArray.length); String[] logArray = Arrays.copyOfRange(commandArray, 1, commandArray.length);

1
utils/src/main/java/one/nem/kidshift/utils/KSLogger.java
View File

@ -6,7 +6,6 @@ import one.nem.kidshift.utils.models.LogModel;
public interface KSLogger { public interface KSLogger {
KSLogger addTag(String tag); KSLogger addTag(String tag);
List<LogModel> getHistory();
void info(String message); void info(String message);
void warn(String message); void warn(String message);
void error(String message); void error(String message);

25
utils/src/main/java/one/nem/kidshift/utils/impl/KSLoggerImpl.java
View File

@ -1,32 +1,19 @@
package one.nem.kidshift.utils.impl; package one.nem.kidshift.utils.impl;
import static one.nem.kidshift.utils.enums.LogLevelEnum.INFO;
import android.util.Log; import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.inject.Inject;
import dagger.assisted.Assisted; import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject; import dagger.assisted.AssistedInject;
import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.KSLogger;
import one.nem.kidshift.utils.SharedPrefUtils;
import one.nem.kidshift.utils.enums.LogLevelEnum; import one.nem.kidshift.utils.enums.LogLevelEnum;
import one.nem.kidshift.utils.factory.SharedPrefUtilsFactory;
import one.nem.kidshift.utils.models.LogModel; import one.nem.kidshift.utils.models.LogModel;
public class KSLoggerImpl implements KSLogger { public class KSLoggerImpl implements KSLogger {
private ArrayList<String> tags = new ArrayList<String>(); private ArrayList<String> tags = new ArrayList<String>();
private SharedPrefUtils sharedPrefUtils;
@AssistedInject @AssistedInject
public KSLoggerImpl(SharedPrefUtilsFactory sharedPrefUtilsFactory, @Assisted String name) { public KSLoggerImpl(@Assisted String name) {
sharedPrefUtils = sharedPrefUtilsFactory.create("KSLogger");
tags.clear(); tags.clear();
tags.add(name); tags.add(name);
} }
@ -37,11 +24,6 @@ public class KSLoggerImpl implements KSLogger {
return this; return this;
} }
@Override
public List<LogModel> getHistory() {
return sharedPrefUtils.getObjects(LogModel.class);
}
@Override @Override
public void info(String message) { public void info(String message) {
log(new LogModel(LogLevelEnum.INFO, tags.toArray(new String[0]), message)); log(new LogModel(LogLevelEnum.INFO, tags.toArray(new String[0]), message));
@ -73,14 +55,9 @@ public class KSLoggerImpl implements KSLogger {
} }
private void log(LogModel log) { private void log(LogModel log) {
addLog(log);
outputLog(log); outputLog(log);
} }
private void addLog(LogModel log) {
sharedPrefUtils.saveObject(log);
}
private void outputLog(LogModel log) { private void outputLog(LogModel log) {
// ,区切りで出力 // ,区切りで出力
String tags = log.getTags().length > 0 ? String.join(",", log.getTags()) : "UNTAGGED"; String tags = log.getTags().length > 0 ? String.join(",", log.getTags()) : "UNTAGGED";