Merge pull request #30 from leeanchu/dev

Dev

Rofl.Executables/ExeManager.cs

@@ -185,6 +185,11 @@ public void SetDefaultExectuable(string name)
             _executables.Add(oldDefault);
         }
 
+        public void ReplaceDefaultExecutable(LeagueExecutable exe)
+        {
+            _defaultExecutable = exe;
+        }
+
         public void UpdateExecutableTarget(string name)
         {
             LeagueExecutable targetExe = GetExecutable(name);
@@ -210,6 +215,7 @@ private LeagueExecutable SetupFirstExe()
             returnExe.ModifiedDate = ExeTools.GetLastModifiedDate(returnExe.TargetPath);
             returnExe.PatchVersion = ExeTools.GetLeagueVersion(returnExe.TargetPath);
             returnExe.AllowUpdates = true;
+            returnExe.UseOldLaunchArguments = false;
             returnExe.IsDefault = true;
             returnExe.Name = "Default";
 
@@ -224,7 +230,7 @@ private LeagueExecutable SetupFirstExe()
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="DirectoryNotFoundException"></exception>
         /// <exception cref="FileNotFoundException"></exception>
-        public void ValidateExecutable(LeagueExecutable exe)
+        public void ValidateExecutable(LeagueExecutable exe, bool requireUniqueName = true)
         {
             // Name must not already exist
             // Start folder must exist
@@ -251,7 +257,10 @@ where e.Name.ToUpper().Equals(exe.Name.ToUpper())
 
             bool defaultMatches = _defaultExecutable.Name.ToUpper().Equals(exe.Name);
 
-            if (matchingExe != null || defaultMatches) { throw new ArgumentException($"{_exceptionOriginName} - Executable by \"{exe.Name}\" already exists"); }
+            if(requireUniqueName)
+            {
+                if (matchingExe != null || defaultMatches) { throw new ArgumentException($"{_exceptionOriginName} - Executable by \"{exe.Name}\" already exists"); }
+            }
 
             // Check if start folder exists
             if (!Directory.Exists(exe.StartFolder)) { throw new DirectoryNotFoundException($"{_exceptionOriginName} - Start folder \"{exe.StartFolder}\" does not exist"); }

Rofl.Executables/Models/LeagueExecutable.cs

@@ -20,6 +20,9 @@ public class LeagueExecutable
         [JsonProperty("allow-updates")]
         public bool AllowUpdates { get; set; }
 
+        [JsonProperty("use-old-launch-args")]
+        public bool UseOldLaunchArguments { get; set; }
+
         [JsonProperty("default")]
         public bool IsDefault { get; set; }
 

Rofl.Executables/Utilities/ReplayPlayer.cs

@@ -30,7 +30,8 @@ public void Play(LeagueExecutable leagueExe, string replayPath)
             }
 
             // This will throw an exception if exe has issues
-            _exeManager.ValidateExecutable(leagueExe);
+            // Turning off unique name flag, otherwise will trigger exception
+            _exeManager.ValidateExecutable(leagueExe, false);
 
             // Create the launch arguments, each argument is put in quotes
             // <replay file path> GameBaseDir=... <other arguments>
@@ -40,10 +41,17 @@ public void Play(LeagueExecutable leagueExe, string replayPath)
                 combinedArgs += $" \"{arg}\"";
             }
 
+            var launchArgs = combinedArgs;
+
+            if(leagueExe.UseOldLaunchArguments)
+            {
+                launchArgs = "\"" + replayPath + "\"";
+            }
+
             ProcessStartInfo processStartInfo = new ProcessStartInfo
             {
                 FileName = leagueExe.TargetPath,
-                Arguments = combinedArgs,
+                Arguments = launchArgs,
 
                 // The game client uses the working directory to find the data files
                 WorkingDirectory = Path.GetDirectoryName(leagueExe.TargetPath)

Rofl.Logger/Scribe.cs

@@ -33,7 +33,7 @@ public void WriteToFile()
 
                 foreach (LogEntry entry in _entryList)
                 {
-                    logOutput += $"{entry.Timestamp}\t|\t{entry.ClassName} -> {entry.MethodName}\t|\t{entry.Level}\t|\t{entry.Message}\n";
+                    logOutput += $"{entry.Timestamp} | {entry.ClassName} -> {entry.MethodName} | {entry.Level} | {entry.Message}\n";
                 }
 
                 File.WriteAllText(outputFileName, logOutput);

Rofl.Main/DetailForm.cs

@@ -1,6 +1,7 @@
 using Rofl.Executables;
 using Rofl.Executables.Models;
 using Rofl.Executables.Utilities;
+using Rofl.Logger;
 using Rofl.Main.Managers;
 using Rofl.Reader.Models;
 using Rofl.Requests;
@@ -20,13 +21,15 @@ public partial class DetailForm : Form
         private RequestManager _requestManager;
         private ExeManager _exeManager;
         private ReplayPlayer _replayPlayer;
+        private Scribe _logger;
 
-        public DetailForm(ReplayFile replayFile, RequestManager requestManager, ExeManager exeManager, ReplayPlayer replayPlayer)
+        public DetailForm(ReplayFile replayFile, RequestManager requestManager, ExeManager exeManager, ReplayPlayer replayPlayer, Scribe scribe)
         {
             _replayFile = replayFile;
             _requestManager = requestManager;
             _exeManager = exeManager;
             _replayPlayer = replayPlayer;
+            _logger = scribe;
 
             InitializeComponent();
 
@@ -151,7 +154,7 @@ private void StartReplay(string execName = "default")
             } else
             {
                 // Start update form with target
-                var result = new UpdateSplashForm(execName).ShowDialog();
+                var result = new UpdateSplashForm(_exeManager, execName).ShowDialog();
 
                 if (result == DialogResult.OK)
                 {
@@ -184,13 +187,8 @@ private void StartReplay(string execName = "default")
                 {
                     if (t.IsFaulted)
                     {
-                        string exceptionMsg = $"{t.Exception.GetType().ToString()} : {t.Exception.Message}\n";
-                        foreach (var exception in t.Exception.InnerExceptions)
-                        {
-                            exceptionMsg += $"\n{exception.GetType().ToString()} : {exception.Message}\n";
-                        }
-
-                        MessageBox.Show("Failed to play replay!\n\n" + exceptionMsg, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        _logger.Error(this.GetType().ToString(), t.Exception.ToString());
+                        MessageBox.Show("Failed to play replay! Check logs for detailed information", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                     GeneralPlayReplaySplitButton.Enabled = true;
                 }));

Rofl.Main/ExecAddForm.cs

@@ -32,7 +32,19 @@ public ExecAddForm(LeagueExecutable leagueExecutable)
             InitForm();
             toolTip = new ToolTip();
 
-            NewLeagueExec = leagueExecutable;
+            NewLeagueExec = new LeagueExecutable()
+            {
+                TargetPath = leagueExecutable.TargetPath,
+                Name = leagueExecutable.Name,
+                StartFolder = leagueExecutable.StartFolder,
+                PatchVersion = leagueExecutable.PatchVersion,
+                ModifiedDate = leagueExecutable.ModifiedDate,
+                AllowUpdates = leagueExecutable.AllowUpdates,
+                IsDefault = leagueExecutable.IsDefault,
+                UseOldLaunchArguments = leagueExecutable.UseOldLaunchArguments
+            };
+
+
             if(!File.Exists(NewLeagueExec.TargetPath))
             {
                 MessageBox.Show("Target specified in entry does not exist. Delete and re-add", "Error reading entry", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -50,6 +62,7 @@ public ExecAddForm(LeagueExecutable leagueExecutable)
             this.GBoxFileDescTextBox.Text = fileInfo.FileDescription;
             this.GBoxLastModifTextBox.Text = NewLeagueExec.ModifiedDate.ToString("yyyy/dd/MM");
             this.ExecUpdateCheckbox.Checked = NewLeagueExec.AllowUpdates;
+            this.ExecArgsCheckbox.Checked = NewLeagueExec.UseOldLaunchArguments;
 
             this.Text = "Edit Executable...";
         }
@@ -179,6 +192,11 @@ private void ExecUpdateCheckbox_CheckedChanged(object sender, EventArgs e)
             NewLeagueExec.AllowUpdates = this.ExecUpdateCheckbox.Checked;
         }
 
+        private void ExecArgsCheckbox_CheckedChanged(object sender, EventArgs e)
+        {
+            NewLeagueExec.UseOldLaunchArguments = this.ExecArgsCheckbox.Checked;
+        }
+
         private void ExecUpdateCheckbox_ToolTip(object sender, EventArgs e)
         {
             CheckBox updateBox = (CheckBox)sender;
@@ -188,6 +206,15 @@ private void ExecUpdateCheckbox_ToolTip(object sender, EventArgs e)
             toolTip.Show("ROFLPlayer can automatically update target path when League of Legends updates", updateBox, 0, 20, visTime);
         }
 
+        private void ExecArgsCheckbox_ToolTip(object sender, EventArgs e)
+        {
+            CheckBox updateBox = (CheckBox)sender;
+
+            var visTime = 3000;
+
+            toolTip.Show("Use old launch arguments, required for old versions of League of Legends", updateBox, 0, 20, visTime);
+        }
+
         private void ExecSaveButton_Click(object sender, EventArgs e)
         {
             if(!ValidateForm())

Rofl.Main/Program.cs

@@ -88,7 +88,7 @@ static void Main(string[] args)
 
                         RequestManager requestManager = new RequestManager();
 
-                        Application.Run(new DetailForm(replayFile.Result, requestManager, exeManager, replayPlayer));
+                        Application.Run(new DetailForm(replayFile.Result, requestManager, exeManager, replayPlayer, logger));
                     }
                 }
             }
@@ -173,7 +173,7 @@ private static void StartReplay(string replayPath, ExeManager exeManager, Replay
             else
             {
                 // Start update form with target
-                var result = new UpdateSplashForm(execName).ShowDialog();
+                var result = new UpdateSplashForm(exeManager, execName).ShowDialog();
 
                 if (result == DialogResult.OK)
                 {

Rofl.Main/SettingsForm.cs

@@ -263,6 +263,10 @@ private void ExecEditButton_Click(object sender, EventArgs e)
                         _exeManager.DeleteExecutable(selectedName);
                         _exeManager.AddExecutable(newExec);
                     }
+                    else
+                    {
+                        _exeManager.ReplaceDefaultExecutable(newExec);
+                    }
 
                     // Refresh list of execs
                     RefreshExecListBox();

Rofl.Main/UpdateSplashForm.cs

@@ -18,8 +18,9 @@ public UpdateSplashForm(ExeManager exeManager)
             InitializeComponent();
         }
 
-        public UpdateSplashForm(string targetExec)
+        public UpdateSplashForm(ExeManager exeManager, string targetExec)
         {
+            _exeManager = exeManager;
             TargetExecToUpdate = targetExec;
             InitializeComponent();
         }