Merge pull request fdorg#446 from fdorg/feature/mongoose-server-update

Updated the webserver with a better sample code

Author: elsassph

External/Plugins/ProjectManager/Actions/Webserver.cs

@@ -38,18 +38,45 @@ public static void StartServer(string path)
                 return;
             }
 
+            ValidatePath(path);
+            CreateServer();
+
+            // open browser
+            PluginBase.MainForm.CallCommand("RunProcess", "http://localhost:" + portServed + "/" + fileServed);
+        }
+
+        static void ValidatePath(string path)
+        {
             if (File.Exists(path))
             {
                 fileServed = Path.GetFileName(path);
                 path = Path.GetDirectoryName(path);
             }
             else fileServed = "";
             pathServed = path;
+        }
+
+        static void CreateServer()
+        {
+            var ToolsWebserver = Path.Combine(PathHelper.ToolDir, "webserver");
+            var config = GetServerConfig(Path.Combine(ToolsWebserver, "server.ini"));
+            if (config == null) return;
+
+            var server = Path.Combine(ToolsWebserver, config["executable"]);
+            var arguments = config["arguments"].Replace("{doc}", pathServed).Replace("{port}", portServed.ToString());
+
+            TraceManager.Add("Web Server starting with root: " + pathServed);
+            if (config.ContainsKey("verbose") && config["verbose"].ToLower() == "true")
+                TraceManager.Add("Server process: " + server + " " + arguments);
+
+            StartProcess(server, arguments);
+        }
 
-            TraceManager.Add("Web Server starting with root: " + path);
-            var server = Path.Combine(PathHelper.ToolDir, "webserver\\server.exe");
-            var infos = new ProcessStartInfo(server, portServed.ToString());
-            infos.Arguments = "" + portServed;
+        static void StartProcess(string executable, string arguments)
+        {
+            var infos = new ProcessStartInfo();
+            infos.FileName = executable;
+            infos.Arguments = arguments;
             infos.WorkingDirectory = pathServed;
             infos.WindowStyle = ProcessWindowStyle.Hidden;
             try
@@ -61,8 +88,29 @@ public static void StartServer(string path)
                 TraceManager.Add("Unable to start the webserver: " + ex.Message, 3);
                 return;
             }
+        }
 
-            PluginBase.MainForm.CallCommand("RunProcess", "http://localhost:" + portServed + "/" + fileServed);
+        static Dictionary<string, string> GetServerConfig(string configPath)
+        {
+            var ini = ConfigHelper.Parse(configPath, true);
+            if (!ini.ContainsKey("Default"))
+            {
+                TraceManager.Add("Missing " + configPath, 3);
+                return null;
+            }
+
+            var config = ini["Default"];
+            if (!config.ContainsKey("executable"))
+            {
+                TraceManager.Add("Missing 'executable' entry in in " + configPath, 3);
+                return null;
+            }
+            if (!config.ContainsKey("arguments"))
+            {
+                TraceManager.Add("Missing 'arguments' entry in in " + configPath, 3);
+                return null;
+            }
+            return config;
         }
 
         public static void KillServer()

External/Plugins/ProjectManager/PluginMain.cs

@@ -881,7 +881,7 @@ void OpenSwf(string path)
                 string doc = project.TestMovieCommand;
                 try
                 {
-                    if (string.IsNullOrEmpty(project.TestMovieCommand))
+                    if (string.IsNullOrEmpty(doc) || doc == "/" || doc == "\\")
                     {
                         doc = project.OutputPathAbsolute;
                         if (File.Exists(doc)) doc = Path.GetDirectoryName(doc);

FlashDevelop/Bin/Debug/Tools/webserver/build.bat

@@ -1,8 +1,11 @@
 
 :: http://cesanta.com/docs/Embed.shtml
 
+:: ATTENTION!
+:: make sure the binary is 32 bits (default with Visual C++ Express)
+
 set FLAGS=-DMONGOOSE_NO_DAV -DMONGOOSE_NO_CGI -DMONGOOSE_NO_AUTH -DMONGOOSE_NO_LOGGING
 
 mkdir obj
-cl mongoose_server.c mongoose.c %FLAGS% /TC /MD /Fo.\obj\
+cl server.c mongoose.c %FLAGS% /TC /MD /Fo.\obj\