Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1484 from erri120/fix-missing-knownfolders

Browse Source 
Fix missing KnownFolders
This commit is contained in:
Timothy Baldridge 2021-06-12 04:11:24 -07:00 committed by GitHub
commit e42dae9b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Wabbajack.Common/KnownFolders/KnownFolder.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Runtime.InteropServices;
using System.Security.Principal;
#nullable disable
namespace Wabbajack.Common.IO
{
@ -48,7 +47,7 @@ namespace Wabbajack.Common.IO
/// Gets the default path of the folder. This does not require the folder to be existent.
/// </summary>
/// <exception cref="ExternalException">The known folder could not be retrieved.</exception>
public string DefaultPath
public string? DefaultPath
{
get => GetPath(KnownFolderFlags.DontVerify | KnownFolderFlags.DefaultPath);
}
@ -57,10 +56,14 @@ namespace Wabbajack.Common.IO
/// Gets or sets the path as currently configured. This does not require the folder to be existent.
/// </summary>
/// <exception cref="ExternalException">The known folder could not be retrieved.</exception>
public string Path
public string? Path
{
get => GetPath(KnownFolderFlags.DontVerify);
set => SetPath(KnownFolderFlags.None, value);
set
{
if (value != null)
SetPath(KnownFolderFlags.None, value);
}
}
/// <summary>
@ -68,10 +71,14 @@ namespace Wabbajack.Common.IO
/// This does not require the folder to be existent.
/// </summary>
/// <exception cref="ExternalException">The known folder could not be retrieved.</exception>
public string ExpandedPath
public string? ExpandedPath
{
get => GetPath(KnownFolderFlags.DontVerify | KnownFolderFlags.NoAlias);
set => SetPath(KnownFolderFlags.DontUnexpand, value);
set
{
if (value != null)
SetPath(KnownFolderFlags.DontUnexpand, value);
}
}
// ---- METHODS (PUBLIC) ---------------------------------------------------------------------------------------
@ -87,20 +94,17 @@ namespace Wabbajack.Common.IO
// ---- METHODS (PRIVATE) --------------------------------------------------------------------------------------
private string GetPath(KnownFolderFlags flags)
private string? GetPath(KnownFolderFlags flags)
{
int result = SHGetKnownFolderPath(Type.GetGuid(), (uint)flags, Identity.Token, out IntPtr outPath);
if (result >= 0)
{
string path = Marshal.PtrToStringUni(outPath);
Marshal.FreeCoTaskMem(outPath);
return path;
}
else
{
throw new ExternalException("Cannot get the known folder path. It may not be available on this system.",
result);
}
if (result < 0)
return null;
var path = Marshal.PtrToStringUni(outPath);
Marshal.FreeCoTaskMem(outPath);
return path;
//throw new ExternalException("Cannot get the known folder path. It may not be available on this system." result);
}
private void SetPath(KnownFolderFlags flags, string path)

11
Wabbajack.Common/Paths/AbsolutePath.cs
View File

@ -176,7 +176,16 @@ namespace Wabbajack.Common
/// <summary>
/// Returns the path to the Windows folder, most often c:\Windows
/// </summary>
public static AbsolutePath WindowsFolder => (AbsolutePath)KnownFolders.Windows.Path;
public static AbsolutePath WindowsFolder
{
get
{
var path = KnownFolders.Windows.Path;
if (path == null)
throw new ArgumentNullException(nameof(path), "Unable to find path to the Windows folder!");
return new AbsolutePath(path);
}
}
public AbsolutePath Root => (AbsolutePath)Path.GetPathRoot(_path);

7
Wabbajack.Common/Paths/FileCompaction.cs
View File

@ -13,7 +13,12 @@ namespace Wabbajack.Common
{
if (_haveCompact != null && _haveCompact.Value) return _compactExecutable;
if (_haveCompact != null) return null;
_compactExecutable = ((AbsolutePath)KnownFolders.SystemX86.Path).Combine("compact.exe");
var x86Path = KnownFolders.SystemX86.Path;
if (x86Path == null)
return null;
_compactExecutable = ((AbsolutePath)x86Path).Combine("compact.exe");
if (!_compactExecutable.Exists) return null;

6
Wabbajack.Lib/MO2Installer.cs
View File

@ -511,7 +511,11 @@ namespace Wabbajack.Lib
if (game?.TryGetGameLocation() != null && path.IsChildOf(game.TryGetGameLocation())) return ErrorResponse.Fail("Cannot install to game directory.");
// Check if child of Program Files
if (path.IsChildOf(new AbsolutePath(KnownFolders.ProgramFiles.Path))) return ErrorResponse.Fail("Cannot install to Program Files directory.");
var programFilesPath = KnownFolders.ProgramFiles.Path;
if (programFilesPath != null)
{
if (path.IsChildOf(new AbsolutePath(programFilesPath))) return ErrorResponse.Fail("Cannot install to Program Files directory.");
}
// If the folder doesn't exist, it's empty so we don't need to check further
if (!path.Exists) return ErrorResponse.Success;

10
Wabbajack/View Models/Installers/InstallerVM.cs
View File

@ -97,17 +97,21 @@ namespace Wabbajack
public InstallerVM(MainWindowVM mainWindowVM) : base(mainWindowVM)
{
if (AbsolutePath.EntryPoint.IsChildOf(new AbsolutePath(KnownFolders.Downloads.Path)))
var downloadsPath = KnownFolders.Downloads.Path;
var skyDrivePath = KnownFolders.SkyDrive.Path;
if (downloadsPath != null && AbsolutePath.EntryPoint.IsChildOf(new AbsolutePath(downloadsPath)))
{
Utils.Error(new CriticalFailureIntervention(
"Wabbajack is running inside your Downloads folder. This folder is often highly monitored by antivirus software and these can often " +
"conflict with the operations Wabbajack needs to perform. Please move Wabbajack outside of your Downloads folder and then restart the app.",
"Cannot run inside Downloads", true));
}
else if (AbsolutePath.EntryPoint.IsChildOf(new AbsolutePath(KnownFolders.SkyDrive.Path)))
if (skyDrivePath != null && AbsolutePath.EntryPoint.IsChildOf(new AbsolutePath(skyDrivePath)))
{
Utils.Error(new CriticalFailureIntervention(
$"Wabbajack is running inside a OneDrive folder \"{new AbsolutePath(KnownFolders.SkyDrive.Path)}\". This folder is known to cause issues with Wabbajack. " +
$"Wabbajack is running inside a OneDrive folder \"{skyDrivePath}\". This folder is known to cause issues with Wabbajack. " +
"Please move Wabbajack outside of your OneDrive folder and then restart the app.",
"Cannot run inside OneDrive", true));
}