Command Searching

View changelog entry #101 for details.

Author: Sergix

ROADMAP.md

@@ -35,20 +35,20 @@ This section provides a list of "foundational" elements that MUST be finished be
 - [ ] Files
 	- [x] Reading (I #16) (PR #17) (CL #68)
 	- [x] Writing (PR #1) (CL #9)
-	- [ ] Moving
+	- [x] Moving (I #81) (PR #79) (CL #101)
 	- [x] Deleting (PR #5) (CL #40)
 	- [ ] Editing
-	- [ ] Renaming
-- [ ] Directories
+	- [x] Renaming (PR #67) (CL #101)
+- [x] Directories
 	- [x] Listing (PR #2) (CL #17)
-	- [ ] Moving
+	- [x] Moving (PR #79) (CL #101)
 	- [x] Change working directory (PR #3) (CL #28)
-	- [ ] Deleting
+	- [x] Deleting (PR #67) (CL #101)
 	- [x] Creating (PR #5) (CL #41)
-	- [ ] Renaming
-- [x] Clear screen (I #33) (PR #44)
-- [ ] Full help information (I #40)
-	- [ ] Command help (`-h`/`help`)
+	- [x] Renaming (PR #67) (CL #101)
+- [x] Clear screen (I #33) (PR #44) (CL #91)
+- [x] Full help information (I #40) (PR #79) (CL #101)
+	- [x] Command help (`-h`/`help`) (I #40) (PR #79) (CL #101)
 - [x] Run external executable programs (I #32) (PR #46) (CL #93)
 - [x] Tab completion (I #31) (PR #34) (CL #88)
 - [x] System process listing (PR #9) (CL #60)
@@ -57,7 +57,6 @@ This section provides a list of "foundational" elements that MUST be finished be
 - [ ] Environment Variables (I #) (CL #74)
 - [ ] Create new terminal window instance
 - [x] Internet file downloader (I #45) (PR #61) (CL #96)
-- [x] Internet file downloader (I #45)
 
 ## Tracking
 To track this list, it is placed in the [v1.0.0 Roadmap](https://github.com/Sergix/JTerm/milestone/1) milestone. All Issues and Pull Requests that are designated to complete a task on the milestone tracker should be marked as so.

build.bat

@@ -3,4 +3,5 @@ cls
 
 rd /S /Q target
 
-mvn clean package
+mvn -e clean package
+run

changelog.txt

@@ -1,4 +1,65 @@
-(#100)[11/8/2017-13:28 0.6.2 ojles]
+(#101)[11/19/2017-16:23 0.6.1 Sergix]
+	Removed org.reflections import. JTerm.initCommands() has been updated to compensate.
+	Closed #40.
+	Closed #47.
+		- PR #78.
+	Closed #48.
+	Closed #52 (wontfix).
+	Closed #53.
+	Closed #71.
+		- PR #74.
+	Closed #73.
+	Closed #75.
+	Closed PR #77.
+		- PR #79.
+	Closed #81.
+	Closed PR #82.
+		- PR #83.
+	Merged #74.
+		- Thanks @lbenedetto!
+		- Added a fully functioning JavaX GUI!
+		- Runs commands without recreating anything.
+		- Added log functions to JTerm.java
+			- log()
+			- logln()
+			- All output should be through these from now on.
+		- Added ProtectedDocument class
+		- Added ProtectedTextComponent class
+		- Added Terminal class (GUI)
+		- Added com.intellij.forms_rt import for Terminal.form GUI layout.
+	Merged #78.
+		- Thanks @nanoandrew4!
+		- Added ArrowKeyHandler class.
+		- Added ArrowKeys enum.
+		- Added Command enum.
+		- Added KeyHandler class.
+		- Added Keys enum.
+		- Moved UNIX and Windows input functions from Input class to UnixInput and WinInput classes, respectively.
+		- Added FileAutocomplete class.
+		- Added Util functions.
+			- removeSpaces()
+			- containsOnlySpaces()
+	Merged #67, #79.
+		- Thanks @ojles!
+		- Added a Command interface.
+		- Command methods now have a @Command annotation.
+		- All commands are automatically updated and stored in a global hashmap.
+		- Added target/ to .gitignore.
+		- Added CommandException class.
+		- Added functions to Util.java.
+			- getRunTime()
+			- clearLine()
+			- getAsArray()
+			- getAsString()
+			- getRest()
+			- getFullPath()
+	Merged #83.
+		- Thanks @Kaperskyguru!
+		- Created Files.move()
+	Updated ROADMAP.md.
+	Pushed updates to Git.
+
+(#100)[11/8/2017-13:28 0.6.1 ojles]
     Added Command interface with execute() method
     Added CommandException for package jterm.command.*
     Implemented Command interface in all command classes
@@ -7,6 +68,7 @@
     Moved helper methods from JTerm to Util.java
     Fixed ping command
     Fixed Exec.java, witch was not printing all the data got from the executed process
+
 (#99)[11/5/2017-14:50 0.6.1 Sergix]
 	Removed lang3 dependency from POM and all imports.
 	Fixed issue where InputHandler was outputting an extra newline.

pom.xml

@@ -57,11 +57,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.10</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit-dep</artifactId>

run.bat

@@ -3,12 +3,16 @@
 set option="nogui"
 
 cd target
-if EXIST "jterm-%JTERM_VERSION%-jar-with-dependencies.jar" (
+if exist "jterm-%JTERM_VERSION%-jar-with-dependencies.jar" (
 	ren jterm-%JTERM_VERSION%.jar jterm-%JTERM_VERSION%-no-deps.jar
 	ren jterm-%JTERM_VERSION%-jar-with-dependencies.jar jterm-v%JTERM_VERSION%.jar
 )
 
-if %1 EQU %option% (
+if not exist "jterm-v%JTERM_VERSION%.jar" (
+	exit
+)
+
+if "%1" EQU %option% (
 	java -jar jterm-v%JTERM_VERSION%.jar headless
 ) else (
 	java -jar jterm-v%JTERM_VERSION%.jar

src/main/java/jterm/JTerm.java

@@ -23,18 +23,26 @@
 import jterm.gui.Terminal;
 import jterm.io.InputHandler;
 import jterm.util.Util;
-import org.reflections.Reflections;
-import org.reflections.scanners.MethodAnnotationsScanner;
 
 import javax.swing.*;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
+import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.ArrayList;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.net.URLDecoder;
+import java.net.URL;
+import java.io.File;
+import java.io.IOException;
+import java.security.CodeSource;
 
 public class JTerm {
     private static final Map<String, CommandExecutor> COMMANDS = new HashMap<>();
@@ -104,8 +112,61 @@ public static void executeCommand(String options) {
     }
 
     private static void initCommands() {
-        Reflections reflections = new Reflections("jterm.command", new MethodAnnotationsScanner());
-        Set<Method> methods = reflections.getMethodsAnnotatedWith(Command.class);
+        // Reflections reflections = new Reflections("jterm.command", new MethodAnnotationsScanner());
+        // Set<Method> methods = reflections.getMethodsAnnotatedWith(Command.class);
+        ArrayList<Method> methods = new ArrayList<Method>();
+        Method[] unsortedMethods = {};
+        ArrayList<String> classes = new ArrayList<String>();
+
+        try {
+            CodeSource src = JTerm.class.getProtectionDomain().getCodeSource();
+            if (src != null) {
+                URL jar = src.getLocation();
+                ZipInputStream zip = new ZipInputStream(jar.openStream());
+                while (true) {
+                    ZipEntry e = zip.getNextEntry();
+                    if (e == null)
+                        break;
+                    String name = e.getName();
+                    if (name.startsWith("jterm/command")) {
+                        classes.add(
+                                name.replace('/', '.')
+                                .substring(0, name.length() - 6)
+                        );
+                    }
+                }
+            }
+        } catch (IOException ioe) {
+            System.out.println(ioe);
+        }
+
+        classes.remove(0);
+
+        for (int i = 0; i < classes.size(); i++) {
+            try {
+                Class<?> clazz = Class.forName(classes.get(i));
+			    Constructor<?> constructor = clazz.getConstructor();
+			    Object obj = constructor.newInstance();
+
+                unsortedMethods = obj.getClass().getDeclaredMethods();
+                for (Method method : unsortedMethods) {
+                    Annotation[] annotations = method.getDeclaredAnnotations();
+                    if (method.isAnnotationPresent(Command.class)) {
+                        methods.add(method);
+                    }
+                }
+            } catch (ClassNotFoundException cnfe) {
+                System.out.println(cnfe);
+            } catch (NoSuchMethodException nsme) {
+                // System.out.println(nsme);
+            } catch (InstantiationException ie) {
+                // System.out.println(ie);
+            } catch (IllegalAccessException iae) {
+                System.out.println(iae);
+            } catch (InvocationTargetException iae) {
+                // System.out.println(iae);
+            }
+        }
 
         for (Method method : methods) {
             method.setAccessible(true);
@@ -117,7 +178,6 @@ private static void initCommands() {
                         .setMinOptions(command.minOptions())
                         .setCommand((List<String> options) -> {
                             try {
-                                System.out.println(options);
                                 method.invoke(null, options);
                             } catch (Exception e) {
                                 System.err.println("Weird stuff...");

src/main/java/jterm/command/Files.java

@@ -33,7 +33,8 @@
 import static jterm.JTerm.logln;
 
 public class Files {
-    @Command(name = "mv", minOptions = 2)
+    // @ojles and @Kaperskyguru
+    @Command(name = "mv", "move", minOptions = 2)
     public static void move(List<String> options) {
         String sourceName = Util.getFullPath(options.get(0));
         String destinationName = Util.getFullPath(options.get(1));
@@ -205,15 +206,4 @@ public static void download(List<String> options) {
         Util.clearLine(update, false);
         logln("\nFile downloaded successfully in: " + Util.getRunTime(System.currentTimeMillis() - start), true);
     }
-    
-    	@Command(name = {"move", "mv"}, minOptions = 2)
-	public static void moveFile(File fileName, String newLocation){
-		if(fileName.renameTo(new File(newLocation + fileName.getName()))){
-			System.out.println(fileName + "Successfully Moved");
-		}else{
-			System.out.println(fileName + "Failed to Moved");
-		}
-		
-	}
-    
 }