* fix non-parallel encoding

* update allowed symbols for ndmuploader
* add latest nfklib and try-catch for demo parsing

Author: HarpyWar

externals/nfklib.dll

@@ -59,6 +59,10 @@ public void ExternalToolStart(string infile, int roundNumber)
                     _process.ProcessorAffinity = (IntPtr)affinity;
                 _process.PriorityClass = (ProcessPriorityClass)Config.Data.ExternalToolRoundTrip[roundNumber].ProcessorPriority;
             }
+            
+            // only when ParallelEncoding is disabled
+            if (roundNumber > 0)
+                return;
 
             // start auto-exit timer with interval of game duration
             externalToolTimer = new System.Timers.Timer() { Interval = (Config.DemoDuration + Config.Data.ExtraTime) * 1000 };
@@ -92,8 +96,8 @@ private void externalToolTimer_Elapsed(object sender, System.Timers.ElapsedEvent
         private void externalToolProcess_Exited(object sender, EventArgs e)
         {
             // last round
-            if (Config.Data.ParallelEncoding)
-            if (this.roundNumber == Config.Data.ExternalToolRoundTrip.Length - 1)
+            if (!Config.Data.ParallelEncoding)
+            if (this.roundNumber >= Config.Data.ExternalToolRoundTrip.Length - 1)
             {
                 Program.endMovieCreation();
             }

ndm2video/ExternalVideoTool.cs

@@ -89,7 +89,7 @@ writeconfig pid.cfg
             File.WriteAllText(autoexecFile, sb.ToString());
 
 
-            Log.Info("Starting nfk process: ");
+            Log.Info("Starting game process: " + Config.Data.GameExeFile);
             if (!File.Exists(Config.Data.GameExeFile))
             {
                 Log.Error("Exe file does not exist");
@@ -205,9 +205,13 @@ private static void OnImageCreated(object sender, FileSystemEventArgs e)
 
                 if (Config.PlayerNumber > 0)
                 {
+                    // I don't know why but it should be this!
+                    int startPlayerNumber = (Config.Data.ParallelEncoding) ? 0 : 1;
                     // switch player camera
-                    for (int i = 0; i < Config.PlayerNumber; i++)
+                    for (int i = startPlayerNumber; i < Config.PlayerNumber; i++)
+                    {
                         NfkSendKey("n");
+                    }
                 }
                 Thread.Sleep(1000);
 
@@ -341,12 +345,20 @@ internal static void KillNFK()
                 if (ex != null)
                     ex.Dispose();
 
-                Common.freeHangProcesses();
+                if (Config.Data.ParallelEncoding)
+                    Common.freeHangProcesses();
             }
             catch(Exception e)
             {
                 Log.Error(e.Message);
             }
         }
+
+        internal static bool IsNFKRunning()
+        {
+            if (nfkProcess != null && !nfkProcess.HasExited)
+                return true;
+            return false;
+        }
     }
 }

ndm2video/Program.cs

@@ -71,7 +71,12 @@ public Form1()
 
             // read map width/height and set followplayer
             var ndm = new nfklib.NDemo.NFKDemo();
-            var dem = ndm.Read(demoFile);
+            nfklib.NDemo.DemoItem dem = null;
+            try
+            {
+                dem = ndm.Read(demoFile);
+            }
+            catch { }
             if (dem == null)
             {
                 Log.Error("Bad nfk demo");

ndmscheduler/Form1.cs

@@ -257,7 +257,7 @@ private static string FormatDemoInfo(string template, DemoItem demo, int pindex)
             return replaceBadString(output);
         }
 
-        static string goodChars = "\n\r абвгдеежзиклмнопрстуфхцчшщъюьэюяАБВГДЕЕЖЗИКЛМНОПРСТУФХЦЧШЩЪЮЬЭЮЯabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@#$%^&*()_+`-=/?.>,<\\|'\";:]}[{";
+        static string goodChars = "\n\r абвгдеёжзийклмнопрстуфхцчшщъыюьэюяАБВГДЕЕЖЗИКЛМНОПРСТУФХЦЧШЩЪЮЬЭЮЯabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@#$%^&*()_+`-=/?.>,<\\|'\";:]}[{";
 
         private static string replaceBadString(string input)
         {