Changeset 1436 for code

Timestamp:

May 27, 2008, 3:01:49 AM (16 years ago)

Author:

landauf

Message:

cool stuff: autocompletion works with filesystem (has to be tested on other systems)

Location:

code/branches/console/src/core

Files:

• ArgumentCompleter.h (modified) (1 diff)
• ArgumentCompletionFunctions.cc (modified) (5 diffs)
• ArgumentCompletionFunctions.h (modified) (1 diff)
• CommandExecutor.cc (modified) (1 diff)
• ConfigFileManager.cc (modified) (1 diff)
• ConsoleCommandCompilation.cc (modified) (1 diff)

code/branches/console/src/core/ArgumentCompleter.h

@@ -64 +64 @@
                         return (*this->function_5_)(param1, param2, param3, param4, param5);
                     default:
-                        return (*this->function_0_)();
+                        return std::list<std::pair<std::string, std::string> >();
                 }
             }

code/branches/console/src/core/ArgumentCompletionFunctions.cc

@@ -30 +30 @@
 #include <map>
 
+//#include <stdio.h>
+//#include <stdlib.h>
+//#include <errno.h>
+//#include <sys/types.h>
+//#include <sys/stat.h>
+#include <dirent.h>
+
 #include "ArgumentCompletionFunctions.h"
 #include "CoreIncludes.h"
@@ -36 +43 @@
 #include "TclThreadManager.h"
 #include "util/String.h"
+#include "util/SubString.h"
 
 namespace orxonox
@@ -44 +52 @@
         {
             return std::list<std::pair<std::string, std::string> >();
+        }
+
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(files)(const std::string& fragment)
+        {
+            std::list<std::pair<std::string, std::string> > dirlist;
+            std::list<std::pair<std::string, std::string> > filelist;
+
+            SubString tokens(fragment, "/", "", false, '\0', false, '\0', false, '\0', '\0', false, '\0');
+
+            std::string startdirectory = ".";
+            if (fragment.size() > 0 && fragment[fragment.size() - 1] == '/' && tokens.size() > 0)
+                startdirectory = tokens.subSet(0, tokens.size()).join("/");
+            else if (tokens.size() > 1)
+                startdirectory = tokens.subSet(0, tokens.size() - 1).join("/");
+
+std::cout << "startdir: " << startdirectory << std::endl;
+
+            struct stat fileInfo;
+            struct dirent *currentFile;
+            DIR *handler = 0;
+
+            handler = opendir(startdirectory.c_str());
+            if (handler)
+            {
+                while ((currentFile = readdir(handler)) != 0)
+                {
+                    if (strcmp(currentFile->d_name, ".") && strcmp(currentFile->d_name, ".."))
+                    {
+                        std::string path = startdirectory + "/" + currentFile->d_name;
+                        if (stat(path.c_str(), &fileInfo) == -1)
+                        {
+                            closedir(handler);
+                            break;
+                        }
+
+                        if (S_ISREG(fileInfo.st_mode)) // normal file
+                            filelist.push_back(std::pair<std::string, std::string>(getLowercase(path), path));
+                        else if (S_ISDIR(fileInfo.st_mode)) // directory
+                            dirlist.push_back(std::pair<std::string, std::string>(getLowercase(path) + "/", path + "/"));
+                        else // special file
+                            filelist.push_back(std::pair<std::string, std::string>(getLowercase(path), path));
+                    }
+                }
+
+                closedir(handler);
+            }
+
+            filelist.insert(filelist.begin(), dirlist.begin(), dirlist.end());
+            return filelist;
         }
 
@@ -57 +114 @@
         }
 
-        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(configvalues)(const std::string& classname)
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(configvalues)(const std::string& fragment, const std::string& classname)
         {
             std::list<std::pair<std::string, std::string> > configvalues;
@@ -71 +128 @@
         }
 
-        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(configvalue)(const std::string& varname, const std::string& classname)
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(configvalue)(const std::string& fragment, const std::string& varname, const std::string& classname)
         {
             std::list<std::pair<std::string, std::string> > oldvalue;

code/branches/console/src/core/ArgumentCompletionFunctions.h

@@ -56 +56 @@
     {
         ARGUMENT_COMPLETION_FUNCTION_DECLARATION(fallback)();
+        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(files)(const std::string& fragment);
         ARGUMENT_COMPLETION_FUNCTION_DECLARATION(configvalueclasses)();
-        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(configvalues)(const std::string& classname);
-        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(configvalue)(const std::string& varname, const std::string& classname);
+        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(configvalues)(const std::string& fragment, const std::string& classname);
+        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(configvalue)(const std::string& fragment, const std::string& varname, const std::string& classname);
         ARGUMENT_COMPLETION_FUNCTION_DECLARATION(tclthreads)();
     }

code/branches/console/src/core/CommandExecutor.cc

@@ -557 +557 @@
         unsigned int lowestIndex = 1 + (CommandExecutor::getEvaluation().functionclass_ != 0);
 
-        for (unsigned int i = CommandExecutor::argumentsGiven() - 2; i >= lowestIndex; --i)
+        for (unsigned int i = CommandExecutor::argumentsGiven() - 1; i >= lowestIndex; --i)
         {
             params[index] = CommandExecutor::getArgument(i);

code/branches/console/src/core/ConfigFileManager.cc

@@ -42 +42 @@
     SetConsoleCommandShortcutExtern(reloadConfig);
     SetConsoleCommandShortcutExtern(cleanConfig);
-    SetConsoleCommandShortcutExtern(loadSettings);
-    SetConsoleCommandShortcutExtern(loadKeybindings);
+    SetConsoleCommandShortcutExtern(loadSettings).setArgumentCompleter(0, autocompletion::files());
+    SetConsoleCommandShortcutExtern(loadKeybindings).setArgumentCompleter(0, autocompletion::files());
 
     bool config(const std::string& classname, const std::string& varname, const std::string& value)

code/branches/console/src/core/ConsoleCommandCompilation.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    SetConsoleCommandShortcutExtern(source);
+    SetConsoleCommandShortcutExtern(source).setArgumentCompleter(0, autocompletion::files());
     SetConsoleCommandShortcutExtern(echo);
     SetConsoleCommandShortcutExtern(puts);
 
-    SetConsoleCommandShortcutExtern(read);
-    SetConsoleCommandShortcutExtern(append);
-    SetConsoleCommandShortcutExtern(write);
+    SetConsoleCommandShortcutExtern(read).setArgumentCompleter(0, autocompletion::files());
+    SetConsoleCommandShortcutExtern(append).setArgumentCompleter(0, autocompletion::files());
+    SetConsoleCommandShortcutExtern(write).setArgumentCompleter(0, autocompletion::files());
 
     SetConsoleCommandShortcutExtern(calculate);