Skip to content

Commit

Permalink
Deprecation warning internal tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed May 1, 2022
1 parent c2d1fd1 commit 49c575b
Show file tree
Hide file tree
Showing 9 changed files with 178 additions and 147 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,12 @@ public TimeTag doFlagExpirationTag(Attribute attribute) {
return getFlagExpirationTime(attribute.getParam());
}

public static Warning listFlagsTagWarning = new SlowWarning("The list_flags and flag_map tags are meant for testing/debugging only. Do not use it in scripts (ignore this warning if using for testing reasons).");
public static Warning listFlagsTagWarning = new SlowWarning("listFlagsTagWarning", "The list_flags and flag_map tags are meant for testing/debugging only. Do not use it in scripts (ignore this warning if using for testing reasons).");

public ListTag doListFlagsTag(Attribute attribute) {
listFlagsTagWarning.warn(attribute.context);
if (attribute.getScriptEntry() != null && attribute.getScriptEntry().getScript() != null) { // don't warn in '/ex'
listFlagsTagWarning.warn(attribute.context);
}
ListTag list = new ListTag();
list.addAll(listAllFlags());
return list;
Expand All @@ -179,7 +181,9 @@ public MapTag getFlagMap() {

public MapTag doFlagMapTag(Attribute attribute) {
if (!attribute.hasParam()) {
listFlagsTagWarning.warn(attribute.context);
if (attribute.getScriptEntry() != null && attribute.getScriptEntry().getScript() != null) { // don't warn in '/ex'
listFlagsTagWarning.warn(attribute.context);
}
return getFlagMap();
}
MapTag result = new MapTag();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public FileReadCommand() {
// @Usage
// Use to read 'myfile' and narrate the text content.
// - ~fileread path:data/myfile.dat save:read
// - narrate "Read data: <entry[read].data.decode_utf8>"
// - narrate "Read data: <entry[read].data.utf8_decode>"
//
// -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@

import java.io.*;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.MessageDigest;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.*;
Expand Down Expand Up @@ -885,4 +888,16 @@ public static long monotonicMillis() {
public static long monotonicMillisToReal(long monotonic) {
return System.currentTimeMillis() + (monotonic - monotonicMillis());
}

public static String hash_md5(byte[] bytes) {
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(bytes, 0, bytes.length);
return new BigInteger(1, md.digest()).toString(16).substring(0, 16);
}
catch (Throwable ex) {
Debug.echoError(ex);
}
return null;
}
}
275 changes: 141 additions & 134 deletions src/main/java/com/denizenscript/denizencore/utilities/Deprecations.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

public class FutureWarning extends Warning {

public FutureWarning(String message) {
super(message);
public FutureWarning(String id, String message) {
super(id, message);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ public class SlowWarning extends Warning {

public long lastWarning;

public SlowWarning(String message) {
super(message);
public SlowWarning(String id, String message) {
super(id, message);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ public class StrongWarning extends Warning {

public static HashSet<StrongWarning> recentWarnings = new HashSet<>();

public StrongWarning(String message) {
super(message);
public StrongWarning(String id, String message) {
super(id, message);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public class VerySlowWarning extends SlowWarning {
*/
public int lastShown = -1;

public VerySlowWarning(String message) {
super(message);
public VerySlowWarning(String id, String message) {
super(id, message);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
import com.denizenscript.denizencore.tags.TagContext;
import com.denizenscript.denizencore.utilities.Deprecations;

public class Warning {

public String id;

public String message;

public Warning(String message) {
public Warning(String id, String message) {
this.id = id;
this.message = message;
}

Expand Down Expand Up @@ -37,6 +41,7 @@ public void warn(ScriptQueue queue) {
}

public void warn(ScriptContainer script) {
Deprecations.firedRecently.add(id);
if (!testShouldWarn()) {
return;
}
Expand Down

0 comments on commit 49c575b

Please sign in to comment.