fix a bug for initialization in jar state

ScottCTD · Oct 13, 2020 · 9bcb134 · 9bcb134
1 parent fcac542
commit 9bcb134
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.socttc</groupId>
     <artifactId>VocabularyDecoder</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.7</version>
     <dependencies>
 
         <dependency>
@@ -15,20 +15,6 @@
             <version>20200518</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-assembly-plugin -->
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.3.0</version>
-        </dependency>
-
 
     </dependencies>
 
@@ -69,6 +55,7 @@
                             <mainClass>xyz.scottc.vd.Main</mainClass>
                         </manifest>
                     </archive>
+                    <encoding>UTF-8</encoding>
                 </configuration>
                 <executions>
                     <execution>
@@ -77,26 +64,14 @@
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
 
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </resource>
-        </resources>
-
     </build>
 
 </project>
diff --git a/src/main/java/xyz/scottc/vd/Main.java b/src/main/java/xyz/scottc/vd/Main.java
@@ -9,6 +9,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -85,7 +86,7 @@ private static void initDirectory() {
 
     private static void initInternalLibraryInJar() throws IOException {
         String sourceDir = "internalLibrary/";
-        String jarPath = FileUtils.getJarFilePath(Main.class);
+        String jarPath = URLDecoder.decode(FileUtils.getJarFilePath(Main.class), "UTF-8");
         JarFile jarFile = new JarFile(jarPath);
         Enumeration<JarEntry> entries = jarFile.entries();
         while (entries.hasMoreElements()) {
@@ -95,7 +96,7 @@ private static void initInternalLibraryInJar() throws IOException {
                 InputStream inputStream = Main.class.getResourceAsStream("/" + filePath);
                 String fileName = filePath.substring(sourceDir.length());
                 File targetFile = new File(internalLibrary.getAbsolutePath() + "/" + fileName);
-                if (!targetFile.isDirectory()) {
+                if (fileName.contains(".")) {
                     //ignore whether the file exists, add it to the list if it is a regular file
                     if (!targetFile.exists()) {
                         Files.copy(inputStream, targetFile.toPath());

diff --git a/src/main/java/xyz/scottc/vd/utils/FileUtils.java b/src/main/java/xyz/scottc/vd/utils/FileUtils.java
@@ -5,6 +5,7 @@
 import javax.swing.*;
 import java.io.*;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 public class FileUtils {
@@ -32,6 +33,7 @@ public static byte[] readFromInputStream(InputStream inputStream) throws IOExcep
 
     public static String getJarFilePath(Class<?> object) {
         if (object != null) {
+
             return object.getProtectionDomain().getCodeSource().getLocation().getPath();
         }
         return null;
@@ -92,6 +94,22 @@ public static void copyFile(InputStream inputStream, File targetDir, String file
         }
     }
 
+    public static void copyTextFile(InputStream inputStream, File target) {
+        try {
+            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
+                    new FileOutputStream(target)
+            ));
+            byte[] buffer = new byte[1024];
+            int length;
+            while ((length = inputStream.read(buffer)) != -1) {
+                writer.write(new String(buffer, 0, length, StandardCharsets.UTF_8));
+            }
+            writer.flush();
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
     public static void closeStream(InputStream inputStream, OutputStream outputStream) {
         if (inputStream != null) {
             try {

diff --git a/src/main/resources/internalLibrary/SAT/SAT3000/Level2List02.txt.vd b/src/main/resources/internalLibrary/SAT/SAT3000/Level2List02.txt.vd
@@ -147,7 +147,7 @@
     "utter",
     "outrage",
     "betray",
-    "affilate",
+    "affiliate",
     "batter",
     "irritate",
     "oversee",
@@ -187,7 +187,7 @@
     "brutal",
     "precedent",
     "memoir",
-    "comtempt",
+    "contempt",
     "mighty",
     "glorious",
     "heir",