Merge pull request huaban#132 from sharkdoodoo/out-print-switch

piaolingxue · web-flow · commit e46e44ba2c7b · 2023-03-24T22:04:21.000+08:00
huaban#81 add switch to support enable/disable System output
diff --git a/src/main/java/com/huaban/analysis/jieba/Log.java b/src/main/java/com/huaban/analysis/jieba/Log.java
@@ -0,0 +1,23 @@
+package com.huaban.analysis.jieba;
+
+/**
+ * @description: enable output content to be controlled by switch
+ * @author: sharkdoodoo@foxmail.com
+ * @date: 2022/6/21
+ */
+public class Log {
+
+    private static final boolean LOG_ENABLE = Boolean.parseBoolean(System.getProperty("jieba.log.enable", "true"));
+
+    public static final void debug(String debugInfo) {
+        if (LOG_ENABLE) {
+            System.out.println(debugInfo);
+        }
+    }
+
+    public static final void error(String errorInfo) {
+        if (LOG_ENABLE) {
+            System.err.println(errorInfo);
+        }
+    }
+}
diff --git a/src/main/java/com/huaban/analysis/jieba/WordDictionary.java b/src/main/java/com/huaban/analysis/jieba/WordDictionary.java
@@ -54,7 +54,7 @@ public static WordDictionary getInstance() {
      */
     public void init(Path configFile) {
         String abspath = configFile.toAbsolutePath().toString();
-        System.out.println("initialize user dictionary:" + abspath);
+        Log.debug("initialize user dictionary:" + abspath);
         synchronized (WordDictionary.class) {
             if (loadedPath.contains(abspath))
                 return;
@@ -63,14 +63,12 @@ public void init(Path configFile) {
             try {
                 stream = Files.newDirectoryStream(configFile, String.format(Locale.getDefault(), "*%s", USER_DICT_SUFFIX));
                 for (Path path: stream){
-                    System.err.println(String.format(Locale.getDefault(), "loading dict %s", path.toString()));
+                    Log.error(String.format(Locale.getDefault(), "loading dict %s", path.toString()));
                     singleton.loadUserDict(path);
                 }
                 loadedPath.add(abspath);
             } catch (IOException e) {
-                // TODO Auto-generated catch block
-                // e.printStackTrace();
-                System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", configFile.toString()));
+                Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", configFile.toString()));
             }
         }
     }
@@ -80,13 +78,11 @@ public void init(String[] paths) {
             for (String path: paths){
                 if (!loadedPath.contains(path)) {
                     try {
-                        System.out.println("initialize user dictionary: " + path);
+                        Log.debug("initialize user dictionary: " + path);
                         singleton.loadUserDict(path);
                         loadedPath.add(path);
                     } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                        System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", path));
+                        Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", path));
                     }
                 }
             }
@@ -127,19 +123,19 @@ public void loadDict() {
                 entry.setValue((Math.log(entry.getValue() / total)));
                 minFreq = Math.min(entry.getValue(), minFreq);
             }
-            System.out.println(String.format(Locale.getDefault(), "main dict load finished, time elapsed %d ms",
-                System.currentTimeMillis() - s));
+            Log.debug(String.format(Locale.getDefault(), "main dict load finished, time elapsed %d ms",
+                    System.currentTimeMillis() - s));
         }
         catch (IOException e) {
-            System.err.println(String.format(Locale.getDefault(), "%s load failure!", MAIN_DICT));
+            Log.error(String.format(Locale.getDefault(), "%s load failure!", MAIN_DICT));
         }
         finally {
             try {
                 if (null != is)
                     is.close();
             }
             catch (IOException e) {
-                System.err.println(String.format(Locale.getDefault(), "%s close failure!", MAIN_DICT));
+                Log.error(String.format(Locale.getDefault(), "%s close failure!", MAIN_DICT));
             }
         }
     }
@@ -187,11 +183,11 @@ public void loadUserDict(Path userDict, Charset charset) {
                 freqs.put(word, Math.log(freq / total));
                 count++;
             }
-            System.out.println(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDict.toString(), count, System.currentTimeMillis() - s));
+            Log.debug(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDict.toString(), count, System.currentTimeMillis() - s));
             br.close();
         }
         catch (IOException e) {
-            System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", userDict.toString()));
+            Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", userDict.toString()));
         }
     }
 
@@ -220,11 +216,11 @@ public void loadUserDict(String userDictPath, Charset charset) {
                 freqs.put(word, Math.log(freq / total));
                 count++;
             }
-            System.out.println(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDictPath, count, System.currentTimeMillis() - s));
+            Log.debug(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDictPath, count, System.currentTimeMillis() - s));
             br.close();
         }
         catch (IOException e) {
-            System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", userDictPath));
+            Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", userDictPath));
         }
     }
     
diff --git a/src/main/java/com/huaban/analysis/jieba/viterbi/FinalSeg.java b/src/main/java/com/huaban/analysis/jieba/viterbi/FinalSeg.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 
 import com.huaban.analysis.jieba.CharacterUtil;
+import com.huaban.analysis.jieba.Log;
 import com.huaban.analysis.jieba.Pair;
 import com.huaban.analysis.jieba.Node;
 
@@ -92,18 +93,18 @@ private void loadModel() {
             }
         }
         catch (IOException e) {
-            System.err.println(String.format(Locale.getDefault(), "%s: load model failure!", PROB_EMIT));
+            Log.error(String.format(Locale.getDefault(), "%s: load model failure!", PROB_EMIT));
         }
         finally {
             try {
                 if (null != is)
                     is.close();
             }
             catch (IOException e) {
-                System.err.println(String.format(Locale.getDefault(), "%s: close failure!", PROB_EMIT));
+                Log.error(String.format(Locale.getDefault(), "%s: close failure!", PROB_EMIT));
             }
         }
-        System.out.println(String.format(Locale.getDefault(), "model load finished, time elapsed %d ms.",
+        Log.debug(String.format(Locale.getDefault(), "model load finished, time elapsed %d ms.",
             System.currentTimeMillis() - s));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static WordDictionary getInstance() {`
`54`	`54`	`*/`
`55`	`55`	`public void init(Path configFile) {`
`56`	`56`	`String abspath = configFile.toAbsolutePath().toString();`
`57`		`- System.out.println("initialize user dictionary:" + abspath);`
	`57`	`+ Log.debug("initialize user dictionary:" + abspath);`
`58`	`58`	`synchronized (WordDictionary.class) {`
`59`	`59`	`if (loadedPath.contains(abspath))`
`60`	`60`	`return;`
`@@ -63,14 +63,12 @@ public void init(Path configFile) {`
`63`	`63`	`try {`
`64`	`64`	`stream = Files.newDirectoryStream(configFile, String.format(Locale.getDefault(), "*%s", USER_DICT_SUFFIX));`
`65`	`65`	`for (Path path: stream){`
`66`		`- System.err.println(String.format(Locale.getDefault(), "loading dict %s", path.toString()));`
	`66`	`+ Log.error(String.format(Locale.getDefault(), "loading dict %s", path.toString()));`
`67`	`67`	`singleton.loadUserDict(path);`
`68`	`68`	`}`
`69`	`69`	`loadedPath.add(abspath);`
`70`	`70`	`} catch (IOException e) {`
`71`		`- // TODO Auto-generated catch block`
`72`		`- // e.printStackTrace();`
`73`		`- System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", configFile.toString()));`
	`71`	`+ Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", configFile.toString()));`
`74`	`72`	`}`
`75`	`73`	`}`
`76`	`74`	`}`
`@@ -80,13 +78,11 @@ public void init(String[] paths) {`
`80`	`78`	`for (String path: paths){`
`81`	`79`	`if (!loadedPath.contains(path)) {`
`82`	`80`	`try {`
`83`		`- System.out.println("initialize user dictionary: " + path);`
	`81`	`+ Log.debug("initialize user dictionary: " + path);`
`84`	`82`	`singleton.loadUserDict(path);`
`85`	`83`	`loadedPath.add(path);`
`86`	`84`	`} catch (Exception e) {`
`87`		`- // TODO Auto-generated catch block`
`88`		`- e.printStackTrace();`
`89`		`- System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", path));`
	`85`	`+ Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", path));`
`90`	`86`	`}`
`91`	`87`	`}`
`92`	`88`	`}`
`@@ -127,19 +123,19 @@ public void loadDict() {`
`127`	`123`	`entry.setValue((Math.log(entry.getValue() / total)));`
`128`	`124`	`minFreq = Math.min(entry.getValue(), minFreq);`
`129`	`125`	`}`
`130`		`- System.out.println(String.format(Locale.getDefault(), "main dict load finished, time elapsed %d ms",`
`131`		`- System.currentTimeMillis() - s));`
	`126`	`+ Log.debug(String.format(Locale.getDefault(), "main dict load finished, time elapsed %d ms",`
	`127`	`+ System.currentTimeMillis() - s));`
`132`	`128`	`}`
`133`	`129`	`catch (IOException e) {`
`134`		`- System.err.println(String.format(Locale.getDefault(), "%s load failure!", MAIN_DICT));`
	`130`	`+ Log.error(String.format(Locale.getDefault(), "%s load failure!", MAIN_DICT));`
`135`	`131`	`}`
`136`	`132`	`finally {`
`137`	`133`	`try {`
`138`	`134`	`if (null != is)`
`139`	`135`	`is.close();`
`140`	`136`	`}`
`141`	`137`	`catch (IOException e) {`
`142`		`- System.err.println(String.format(Locale.getDefault(), "%s close failure!", MAIN_DICT));`
	`138`	`+ Log.error(String.format(Locale.getDefault(), "%s close failure!", MAIN_DICT));`
`143`	`139`	`}`
`144`	`140`	`}`
`145`	`141`	`}`
`@@ -187,11 +183,11 @@ public void loadUserDict(Path userDict, Charset charset) {`
`187`	`183`	`freqs.put(word, Math.log(freq / total));`
`188`	`184`	`count++;`
`189`	`185`	`}`
`190`		`- System.out.println(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDict.toString(), count, System.currentTimeMillis() - s));`
	`186`	`+ Log.debug(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDict.toString(), count, System.currentTimeMillis() - s));`
`191`	`187`	`br.close();`
`192`	`188`	`}`
`193`	`189`	`catch (IOException e) {`
`194`		`- System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", userDict.toString()));`
	`190`	`+ Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", userDict.toString()));`
`195`	`191`	`}`
`196`	`192`	`}`
`197`	`193`
`@@ -220,11 +216,11 @@ public void loadUserDict(String userDictPath, Charset charset) {`
`220`	`216`	`freqs.put(word, Math.log(freq / total));`
`221`	`217`	`count++;`
`222`	`218`	`}`
`223`		`- System.out.println(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDictPath, count, System.currentTimeMillis() - s));`
	`219`	`+ Log.debug(String.format(Locale.getDefault(), "user dict %s load finished, tot words:%d, time elapsed:%dms", userDictPath, count, System.currentTimeMillis() - s));`
`224`	`220`	`br.close();`
`225`	`221`	`}`
`226`	`222`	`catch (IOException e) {`
`227`		`- System.err.println(String.format(Locale.getDefault(), "%s: load user dict failure!", userDictPath));`
	`223`	`+ Log.error(String.format(Locale.getDefault(), "%s: load user dict failure!", userDictPath));`
`228`	`224`	`}`
`229`	`225`	`}`
`230`	`226`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import java.util.Collections;`
`15`	`15`
`16`	`16`	`import com.huaban.analysis.jieba.CharacterUtil;`
	`17`	`+import com.huaban.analysis.jieba.Log;`
`17`	`18`	`import com.huaban.analysis.jieba.Pair;`
`18`	`19`	`import com.huaban.analysis.jieba.Node;`
`19`	`20`
`@@ -92,18 +93,18 @@ private void loadModel() {`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`catch (IOException e) {`
`95`		`- System.err.println(String.format(Locale.getDefault(), "%s: load model failure!", PROB_EMIT));`
	`96`	`+ Log.error(String.format(Locale.getDefault(), "%s: load model failure!", PROB_EMIT));`
`96`	`97`	`}`
`97`	`98`	`finally {`
`98`	`99`	`try {`
`99`	`100`	`if (null != is)`
`100`	`101`	`is.close();`
`101`	`102`	`}`
`102`	`103`	`catch (IOException e) {`
`103`		`- System.err.println(String.format(Locale.getDefault(), "%s: close failure!", PROB_EMIT));`
	`104`	`+ Log.error(String.format(Locale.getDefault(), "%s: close failure!", PROB_EMIT));`
`104`	`105`	`}`
`105`	`106`	`}`
`106`		`- System.out.println(String.format(Locale.getDefault(), "model load finished, time elapsed %d ms.",`
	`107`	`+ Log.debug(String.format(Locale.getDefault(), "model load finished, time elapsed %d ms.",`
`107`	`108`	`System.currentTimeMillis() - s));`
`108`	`109`	`}`
`109`	`110`