Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Models/AvatarManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static AvatarManager Instance

public void Start()
{
_storePath = Path.Combine(Native.OS.DataDir, "avatars");
_storePath = Path.Combine(Native.OS.CacheDir, "avatars");
if (!Directory.Exists(_storePath))
Directory.CreateDirectory(_storePath);

Expand Down
2 changes: 1 addition & 1 deletion src/Models/IpcChannel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public IpcChannel()
{
try
{
_singletonLock = File.Open(Path.Combine(Native.OS.DataDir, "process.lock"), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
_singletonLock = File.Open(Path.Combine(Native.OS.RuntimeDir, "process.lock"), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
IsFirstInstance = true;
_server = new NamedPipeServerStream(
"SourceGitIPCChannel" + Environment.UserName,
Expand Down
49 changes: 44 additions & 5 deletions src/Native/OS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ public static string DataDir
private set;
} = string.Empty;

public static string CacheDir
{
get;
private set;
} = string.Empty;

public static string RuntimeDir
{
get;
private set;
} = string.Empty;

public static string GitExecutable
{
get => _gitExecutable;
Expand Down Expand Up @@ -150,14 +162,41 @@ public static void SetupDataDir()
}
}

var osAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
if (string.IsNullOrEmpty(osAppDataDir))
DataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sourcegit");
else
DataDir = Path.Combine(osAppDataDir, "SourceGit");
DataDir = Path.Combine(Xdg.Directories.BaseDirectory.ConfigHome, "SourceGit");
CacheDir = Path.Combine(Xdg.Directories.BaseDirectory.CacheHome, "SourceGit");
RuntimeDir = Path.Combine(Xdg.Directories.BaseDirectory.RuntimeDir, "SourceGit");

if (!Directory.Exists(DataDir))
{
Directory.CreateDirectory(DataDir);
}

if (!Directory.Exists(CacheDir))
{
Directory.CreateDirectory(CacheDir);
}

if (!Directory.Exists(RuntimeDir))
{
Directory.CreateDirectory(RuntimeDir);
}

var osAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
var oldDir = string.IsNullOrEmpty(osAppDataDir) ?
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sourcegit") :
Path.Combine(osAppDataDir, "SourceGit");


if (Directory.Exists(oldDir) && oldDir != DataDir)
{
foreach (var file in Directory.GetFiles(oldDir))
{
var fileName = Path.GetFileName(file);
File.Move(file, Path.Combine(DataDir, fileName));
}

Directory.Delete(oldDir, true);
}
}

public static void SetupExternalTools()
Expand Down
1 change: 1 addition & 0 deletions src/SourceGit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<PackageReference Include="Pfim" Version="0.11.4" />
<PackageReference Include="TextMateSharp" Version="2.0.2" />
<PackageReference Include="TextMateSharp.Grammars" Version="2.0.2" />
<PackageReference Include="Xdg.Directories" Version="0.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down