Compare commits

..

No commits in common. "0a0615813c7e60d1f3f2aadbcfb3fd5fd90e5b9d" and "944e34fa6b361a55f66fbf6b12ef2cfe0b09530c" have entirely different histories.

3 changed files with 6 additions and 23 deletions

View File

@ -61,7 +61,7 @@ public static class FileHelper
if (currentFileRelativePath.EndsWith(".bak")) if (currentFileRelativePath.EndsWith(".bak"))
{ {
Log.Debug($"EXCLUDING BAK FILE :: {currentFileRelativePath}"); Log.Debug($"EXCLUDING BAK FILE :: {currentFileRelativePath}");
continue; break;
} }
fileCopies.Add(new CopyInfo(file.FullName, file.FullName.Replace(sourceDir.FullName, targetDir.FullName))); fileCopies.Add(new CopyInfo(file.FullName, file.FullName.Replace(sourceDir.FullName, targetDir.FullName)));

View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon> <ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.89</AssemblyVersion> <AssemblyVersion>2.88</AssemblyVersion>
<FileVersion>2.89</FileVersion> <FileVersion>2.88</FileVersion>
<Company>SPT</Company> <Company>SPT</Company>
</PropertyGroup> </PropertyGroup>

View File

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Diagnostics;
using System.Diagnostics;
using Avalonia; using Avalonia;
using ReactiveUI; using ReactiveUI;
using Serilog; using Serilog;
@ -94,26 +93,15 @@ public class MessageViewModel : ViewModelBase
} }
var dataObject = new DataObject(); var dataObject = new DataObject();
var filesToCopy = new List<IStorageFile>();
var logFile = await desktop.MainWindow.StorageProvider.TryGetFileFromPathAsync(data.DebugMode ? App.LogDebugPath : App.LogPath); var logFile = await desktop.MainWindow.StorageProvider.TryGetFileFromPathAsync(data.DebugMode ? App.LogDebugPath : App.LogPath);
var patcherLogFile = await desktop.MainWindow.StorageProvider.TryGetFileFromPathAsync(Path.Join(data.TargetInstallPath, "patcher.log"));
if (logFile == null) if (logFile == null)
{ {
ClipCommandText = "Could not get log file :("; ClipCommandText = "Could not get log file :(";
return; return;
} }
filesToCopy.Add(logFile); dataObject.Set(DataFormats.Files, new[] {logFile});
if (patcherLogFile != null)
{
filesToCopy.Add(patcherLogFile);
}
dataObject.Set(DataFormats.Files, filesToCopy.ToArray());
await desktop.MainWindow.Clipboard.SetDataObjectAsync(dataObject); await desktop.MainWindow.Clipboard.SetDataObjectAsync(dataObject);
ClipCommandText = "Copied!"; ClipCommandText = "Copied!";
@ -202,11 +190,6 @@ public class MessageViewModel : ViewModelBase
} }
File.Copy(App.LogPath, Path.Join(data.TargetInstallPath, "spt-installer.log"), true); File.Copy(App.LogPath, Path.Join(data.TargetInstallPath, "spt-installer.log"), true);
if (data.DebugMode)
{
File.Copy(App.LogDebugPath, Path.Join(data.TargetInstallPath, "spt-installer-debug.log"), true);
}
} }
catch (Exception ex) catch (Exception ex)
{ {