提交: 16 - ConsolePicocalc_work (svn)

Commit MetaInfo

• 修订版: 16 (tree)
• 时间: 2016-04-29 22:20:39
• 作者: ki-chi

Log Message

コマンドラインのヒストリと補完のためjline2を使っていろいろ試し中。全然途中。

更改概述

• modified: trunk/build.xml
• modified: trunk/conpico.bat
• added: trunk/lib/jline.jar
• added: trunk/lib/jline-2.9.jar
• added: trunk/lib
• modified: trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConsolePicocalc.java
• modified: trunk/src/com/nissy_ki_chi/ConsolePicocalc/CommandFragment.java
• added: trunk/src/com/nissy_ki_chi/ConsolePicocalc/CompleterOfCellNames.java
• added: trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConPicoCompleter.java

差异

--- trunk/build.xml	(revision 15)
+++ trunk/build.xml	(revision 16)
@@ -16,11 +16,12 @@
 	<property name="javadocDir" value="doc"/>
 	<property name="distDir" value="dist"/>
 	<property name="exeDir" value="exe"/>
+	<property name="libDir" value="lib"/>
 
-	<property name="jpicosheetJar" value="C:/Users/Yusuke/Develop/Java/PicoSheet-Workspace/JPicosheet/jarfile/JPicosheet-0.1.4.jar"/>
+	<property name="jpicosheetJar" value="C:/Users/nishikawa.MEGATRADE/Apps/Eclipse-workspace-private/consolePicocalc/jarfile/JPicosheet-0.1.4.jar"/>
 	<!-- <property name="jpicosheetJar" value="/home/yusuke/Develop/Eclipse-workspaces/PicoSheet-Workspace/JPicosheet/jarfile/JPicosheet-0.1.4.jar"/ -->
 
-	<target name="all" depends="init,makedir,copyJarFile,jar,makeExe,clean" />
+	<target name="all" depends="init,makedir,copyJarFile,copylib,jar,makeExe,clean" />
 
 	<target name="init">
 		<tstamp></tstamp>
@@ -37,6 +38,12 @@
 		<mkdir dir="${exeDir}"/>
 	</target>
 
+	<target name="copylib">
+		<copy todir="${exeDir}">
+			<fileset file="${libDir}/jline-2.9.jar"/>
+		</copy>
+	</target>
+
 	<target name="copyJarFile" depends="makedir">
 		<copy  todir="${jarWorkDir}">
 			<fileset dir="${binDir}">

--- trunk/conpico.bat	(revision 15)
+++ trunk/conpico.bat	(revision 16)
@@ -1,7 +1,7 @@
 echo off
 
 set EXEDIR=%~dp0
-set CLASSPATH=%EXEDIR%\ConsolePicocalc-0.1.jar;%EXEDIR%\JPicosheet-0.1.4.jar
+set CLASSPATH=%EXEDIR%\ConsolePicocalc-0.1.jar;%EXEDIR%\JPicosheet-0.1.4.jar;%EXEDIR%\jline-2.9.jar
 
 echo %CLASSPATH%
 

--- trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConsolePicocalc.java	(revision 15)
+++ trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConsolePicocalc.java	(revision 16)
@@ -14,9 +14,12 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
+import java.util.SortedSet;
 import java.util.TreeSet;
 
 import com.nissy_ki_chi.jpicosheet.core.Book;
@@ -25,6 +28,13 @@
 import com.nissy_ki_chi.jpicosheet.util.SimpleReader;
 import com.nissy_ki_chi.jpicosheet.util.SimpleWriter;
 
+import jline.console.ConsoleReader;
+import jline.console.completer.ArgumentCompleter;
+import jline.console.completer.ArgumentCompleter.ArgumentDelimiter;
+import jline.console.completer.ArgumentCompleter.ArgumentList;
+import jline.console.completer.Completer;
+import jline.console.completer.StringsCompleter;
+
 public class ConsolePicocalc {
 
 
@@ -37,9 +47,9 @@
 	GroupCommand _groupCommand = new GroupCommand();
 	TableCommand _tableCommand = new TableCommand();
 
-	LinkedList<String> cmdHistory = new LinkedList<>();
-	LinkedList<String> aggregatedHistory = new LinkedList<>();
-	String _nextCommand = "";
+	LinkedList<String> _cmdHistory = new LinkedList<>();
+	LinkedList<String> _aggregatedHistory = new LinkedList<>();
+	String _nextCommand = null;
 	
 	CommandFragment _commandStorage = new CommandFragment(".");
 	
@@ -104,27 +114,117 @@
 
 		// コンソールから1行づつ読み込んで処理する
 		InputStreamReader isr = null;
-		BufferedReader br = null;
+//		BufferedReader br = null;
+		ConsoleReader consoleReader = null;
 		try {
+			consoleReader = new ConsoleReader();
+//			List<Completer> completers = new LinkedList<>();
+			
+			String[] commands = this._commandStorage.getCommandNameList();
+
+			ArgumentDelimiter ad = new ArgumentDelimiter() {
+				
+				@Override
+				public boolean isDelimiter(CharSequence arg0, int arg1) {
+					return arg0.charAt(arg1) == ' ' ? true : false;
+				}
+				
+				@Override
+				public ArgumentList delimit(CharSequence arg0, int arg1) {
+					String[] arguments = arg0.toString().split("\\s");
+					ArgumentList al = new ArgumentList( new String[] {"appl", "bppl"}, 0, 0, 2);							
+//					ArgumentList al = new ArgumentList(arguments, arguments.length-1, 0, arg0.length());							
+//					ArgumentList al = new ArgumentList(arguments, 0, arg0.length()-1, arg0.length()-1);							
+					return al;
+				}
+			};
+//			StringsCompleter sc = new StringsCompleter(commands);
+//			ArgumentCompleter ac = new ArgumentCompleter(ad, sc);
+//			consoleReader.addCompleter(ac);
+//			consoleReader.addCompleter(new ConPicoCompleter());
+			CompleterOfCellNames cocn = new CompleterOfCellNames(_books.get(_currentBookName).getResolver().getCurrentSheet());
+			ArgumentCompleter ac = new ArgumentCompleter(ad, cocn);
+			consoleReader.addCompleter(ac);
+			
+		} catch (IOException e2) {
+			// TODO 自動生成された catch ブロック
+			e2.printStackTrace();
+		}
+		
+		try {
 			isr = new InputStreamReader(System.in, "JISAutoDetect");
-			br = new BufferedReader(isr);
+//			br = new BufferedReader(isr);
 		} catch (UnsupportedEncodingException e1) {
 			e1.printStackTrace();
 		}
 
 		try {
-			String line;
+			String line = null;
+			String candidate = null;
+			List<String> cellNames = null;
+			int cellNamesPos = 0;
+			boolean candiMode = false;
 			while(true) {
 				try {
 					
+					Book currentBook = _books.get(_currentBookName);
+//					consoleReader.readLine(makePrompt(currentBook));
+
 					// ヒストリからの実行か？
 					if (_nextCommand == null) {
 						// ヒストリではない。
-						// プロンプト表示
-						Book currentBook = _books.get(_currentBookName);
-						printPrompt(currentBook);
 						// 入力がなくなったら終了
-						if ((line = br.readLine().trim()) == null) {
+						
+						StringBuilder linebuf = new StringBuilder();
+						char ch = 0;
+						int p = 0;
+						int cellSearchedPos = 0;
+						
+//						while(true) {
+////							ch = (char) br.read();
+//							// TODO: リターンキーを押さなくてもキーを入力できるようにする
+////							ch = (char) isr.read();
+//							ch = (char) System.in.read();
+//							if (ch == '\r') {
+//								if ((char) isr.read() == '\n') {
+//									line = linebuf.toString();
+//									break;
+//								}
+//							}
+//							if (ch != '\t') {
+//								linebuf.append(ch);
+//								// 補完機能関連の変数をリセット
+//								candiMode = false;
+//								cellSearchedPos = 0;
+//								cellNames = null;
+//							} else {
+//								if (!candiMode) {
+//									candiMode = true;
+//									// 候補文字列の取得
+//									candidate = linebuf.substring(p);
+//									// カレントシートのセル名リストが無ければ作成
+//									if (cellNames == null) {
+//										cellNames = new ArrayList<>(new TreeSet<>(_books.get(_currentBookName).getResolver().getCurrentSheet().getCellNames()));
+//										cellNamesPos = 0;
+//									}
+//								}
+//								// セル名リストの中でマッチするセル名を探す
+//								for (; cellSearchedPos < cellNames.size(); cellSearchedPos++) {
+//									String cellName = cellNames.get(cellSearchedPos); 
+//									if (cellName.indexOf(candidate) == 0) {
+//										linebuf.replace(p, linebuf.length(), cellName);
+//									}
+//								}
+//								line = linebuf.toString();
+//							}
+//							System.out.println(line);
+//						}
+
+//						if ((line = br.readLine().trim()) == null) {
+//							break;
+//						}
+						
+						if ((line = consoleReader.readLine(makePrompt(currentBook))) == null ) {
 							break;
 						}
 					} else {
@@ -145,9 +245,9 @@
 
 					// ヒストリからの実行でない場合、入力内容を履歴に保持
 					if (_nextCommand == null) {
-						cmdHistory.add(line);
-						aggregatedHistory.remove(line);
-						aggregatedHistory.add(line);
+						_cmdHistory.add(line);
+						_aggregatedHistory.remove(line);
+						_aggregatedHistory.add(line);
 					}
 
 					// 1文字目がドットか否かでコマンドもしくはセル入力を判断
@@ -167,7 +267,8 @@
 			}
 		} finally {
 			try {
-				br.close();
+//				br.close();
+				isr.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -175,8 +276,8 @@
 	}
 
 
-	private void printPrompt(Book currentBook) {
-		System.out.print("[" + _currentBookName + "]" + currentBook.getResolver().getCurrentSheet().getName() + ": ");
+	private String makePrompt(Book currentBook) {
+		return "[" + _currentBookName + "]" + currentBook.getResolver().getCurrentSheet().getName() + ": ";
 	}
 
 
@@ -227,66 +328,31 @@
 		}
 
 		
-//		if (cmdArr[0].equals("book")) {
-//			_bookCommand.processBookCmd(cmdArr, argStr);
-//			return;
-//		}
-//
-//		if (cmdArr[0].equals("sheet")) {
-//			Book book = _books.get(_currentBookName);
-//			_sheetCommand.processSheetCmd(book, cmdArr, argStr);
-//			return;
-//		}
-//
-//		if (cmdArr[0].equals("group")) {
-//			Sheet sheet = _books.get(_currentBookName).getResolver().getCurrentSheet();
-//			_groupCommand.processGroupCmd(sheet, cmdArr, argStr);
-//			return;
-//		}
-//
-//		if (cmdArr[0].equals("table")) {
-//			Sheet sheet = _books.get(_currentBookName).getResolver().getCurrentSheet();
-//			_tableCommand.processTableCmd(sheet, cmdArr, argStr);
-//			return;
-//		}
-//
-//		if (cmdArr[0].equals("list") && cmdArr.length == 1) {
-//			Sheet sheet = _books.get(_currentBookName).getResolver().getCurrentSheet();
-//			_cellCommand.listCells(sheet);
-//			_groupCommand.listGroups(sheet);
-//			_tableCommand.listTables(sheet);
-//			return;
-//		} else {
-//			Sheet sheet = _books.get(_currentBookName).getResolver().getCurrentSheet();
-//			_cellCommand.processListCmd(sheet, cmdArr, argStr);
-//			return;
-//		}
 
 
 	}
 
-//	private void listSheets(Book book) {
-//		TreeSet<String> sheetNames = new TreeSet<String>();
-//		for (Sheet s: book.getSheets()) {
-//			sheetNames.add(s.getName());
-//		}
-//		for (String sName: sheetNames) {
-//			System.out.println(sName);
-//		}
-//	}
-	
 	private void doQuit(String argStr) {
 		_needQuit = true;
 	}
 
 	private void doHelp(String argStr) {
-		System.out.println(_commandStorage.getHelp());
+		if (argStr.isEmpty()){
+			System.out.println(_commandStorage.getHelp());
+		} else {
+			String helpString = _commandStorage.getHelp(argStr);
+			if (helpString != null) {
+				System.out.println(helpString);
+			} else {
+				System.out.println("command " + argStr + " が見つかりません。");
+			}
+		}
 	}
 	
 	private void doHistory(String argStr) {
 		StringBuilder sb = new StringBuilder();
 		int cnt = 1;
-		for (String s : cmdHistory) {
+		for (String s : _cmdHistory) {
 			sb.append(cnt).append("\t").append(s).append("\n");
 			cnt++;
 		}
@@ -304,7 +370,7 @@
 			return;
 		}
 		
-		this._nextCommand = this.cmdHistory.get(reqHistNo - 1);
+		this._nextCommand = this._cmdHistory.get(reqHistNo - 1);
 		System.out.println(_nextCommand);
 		
 	}

--- trunk/src/com/nissy_ki_chi/ConsolePicocalc/CommandFragment.java	(revision 15)
+++ trunk/src/com/nissy_ki_chi/ConsolePicocalc/CommandFragment.java	(revision 16)
@@ -1,6 +1,10 @@
 package com.nissy_ki_chi.ConsolePicocalc;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Stack;
 
 public class CommandFragment {
@@ -9,6 +13,7 @@
 	private String _methodName = null;
 	private String _description = null;
 	private HashMap<String, CommandFragment> _subFragment = null;
+	private CommandFragment parent = null;
 
 	@SuppressWarnings("unused")
 	private CommandFragment() {};
@@ -20,6 +25,11 @@
 	public CommandFragment(String commandFragmentName) {
 		this._commandFragmentName = commandFragmentName;
 	}
+	
+	public CommandFragment(String commandFragmentName, CommandFragment parent) {
+		this._commandFragmentName = commandFragmentName;
+		this.parent = parent;
+	}
 
 //	void setMethodName(String methodName) {
 //		_methodName = methodName;
@@ -49,7 +59,9 @@
 			}
 
 			if (! this._subFragment.containsKey(cmdFragment)) {
-				this._subFragment.put(cmdFragment, new CommandFragment(cmdFragment));
+				CommandFragment child = new CommandFragment(cmdFragment, this);
+				this._subFragment.put(cmdFragment, child);
+				
 			}
 			this._subFragment.get(cmdFragment).addCommand(commandStack, methodName, description);
 		}
@@ -86,6 +98,16 @@
 		return helpSb.toString();
 	}
 	
+	String getHelp(String command) {
+		CommandFragment helpCmd = getCommandFragment(command);
+		if (helpCmd != null && helpCmd._description != null) {
+			return helpCmd._description;
+		} else {
+			return null;
+		}
+	}
+	
+	
 	private void getHelp(CommandFragment cmdFragment, StringBuilder helpSb) {
 		// メソッドが定義されているCommandFragmentについてヘルプを追加
 		if (cmdFragment._methodName != null) {
@@ -99,6 +121,63 @@
 		}
 	}
 
+	private CommandFragment getCommandFragment(String command) {
+		List<String> cmdList = new LinkedList<>();
+		cmdList.addAll(Arrays.asList(command.substring(1).split("\\.")));
+		return getCommandFragment(cmdList);
+	}
+	
+	private CommandFragment getCommandFragment(List<String> cmdList) {
+		if (cmdList.size() == 0) {
+			return this;
+		} else {
+			String cmdStr = cmdList.remove(0);
+			if (_subFragment != null && _subFragment.containsKey(cmdStr)) {
+				return _subFragment.get(cmdStr).getCommandFragment(cmdList);
+			} else {
+				return null;
+			}
+		}
+	}
+	
+
+	String[] getCommandNameList() {
+		List<String> commandNames = new ArrayList<>();
+		getCommandNameList(commandNames);
+		String[] commandNamesArr = commandNames.toArray(new String[]{});
+		Arrays.sort(commandNamesArr);
+		return commandNamesArr;
+	}
+	
+	private void getCommandNameList(List<String> commandNames) {
+		if (this._subFragment != null) {
+			if (this._methodName != null) {
+				commandNames.add(getCommandName());
+			}
+			for (CommandFragment cf : this._subFragment.values()) {
+				cf.getCommandNameList(commandNames);
+			}
+		} else {
+			commandNames.add(getCommandName());
+		}
+	}
+
+	private String getCommandName(){
+		StringBuilder sb = new StringBuilder();
+		getCommandName(sb);
+		return sb.toString();
+	}
+	
+	private void getCommandName(StringBuilder sb) {
+		if (this.parent != null && sb.length() > 0) {
+			sb.insert(0, ".");
+		}
+		sb.insert(0, this._commandFragmentName);
+		if (this.parent != null) {
+			this.parent.getCommandName(sb);
+		}
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder(this._commandFragmentName).append("=").append(this._methodName);

--- trunk/src/com/nissy_ki_chi/ConsolePicocalc/CompleterOfCellNames.java	(nonexistent)
+++ trunk/src/com/nissy_ki_chi/ConsolePicocalc/CompleterOfCellNames.java	(revision 16)
@@ -0,0 +1,27 @@
+package com.nissy_ki_chi.ConsolePicocalc;
+
+import java.util.List;
+
+import com.nissy_ki_chi.jpicosheet.core.Sheet;
+
+import jline.console.completer.Completer;
+
+public class CompleterOfCellNames implements Completer {
+
+	Sheet _sheet;
+	
+	public CompleterOfCellNames(Sheet sheet) {
+		_sheet = sheet;
+	}
+	
+	@Override
+	public int complete(String buffer, int cursor, List<CharSequence> candidates) {
+		for (String cellName: _sheet.getCellNames()) {
+			if (cellName.startsWith(buffer)) {
+				candidates.add(cellName);
+			}
+		}
+		return 0;
+	}
+
+}

Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property

--- trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConPicoCompleter.java	(nonexistent)
+++ trunk/src/com/nissy_ki_chi/ConsolePicocalc/ConPicoCompleter.java	(revision 16)
@@ -0,0 +1,15 @@
+package com.nissy_ki_chi.ConsolePicocalc;
+
+import java.util.List;
+
+import jline.console.completer.Completer;
+
+public class ConPicoCompleter implements Completer {
+
+	@Override
+	public int complete(String buffer, int cursor, List<CharSequence> candidates) {
+		System.out.println("------" + buffer);
+		return 0;
+	}
+
+}

Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property