dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 04:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style: add .editorconfig for code formatting. see issu #25

Browse source
This commit is contained in:
leo 2024-03-18 09:37:06 +08:00
parent a8eeea4f78
commit 18aaa0a143
225 changed files with 7781 additions and 3911 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/ViewModels/DiffContext.cs
View file

@ -1,61 +1,77 @@
using Avalonia;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using System.IO;
using System.IO;
using System.Threading.Tasks;
namespace SourceGit.ViewModels {
public class DiffContext : ObservableObject {
public string RepositoryPath {
using Avalonia;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
{
public class DiffContext : ObservableObject
{
public string RepositoryPath
{
get => _repo;
}
public Models.Change WorkingCopyChange {
public Models.Change WorkingCopyChange
{
get => _option.WorkingCopyChange;
}
public bool IsUnstaged {
public bool IsUnstaged
{
get => _option.IsUnstaged;
}
public string FilePath {
public string FilePath
{
get => _option.Path;
}
public bool IsOrgFilePathVisible {
public bool IsOrgFilePathVisible
{
get => !string.IsNullOrWhiteSpace(_option.OrgPath) && _option.OrgPath != "/dev/null";
}
public string OrgFilePath {
public string OrgFilePath
{
get => _option.OrgPath;
}
public bool IsLoading {
public bool IsLoading
{
get => _isLoading;
private set => SetProperty(ref _isLoading, value);
}
public bool IsNoChange {
public bool IsNoChange
{
get => _isNoChange;
private set => SetProperty(ref _isNoChange, value);
}
public bool IsTextDiff {
public bool IsTextDiff
{
get => _isTextDiff;
private set => SetProperty(ref _isTextDiff, value);
}
public object Content {
public object Content
{
get => _content;
private set => SetProperty(ref _content, value);
}
public Vector SyncScrollOffset {
public Vector SyncScrollOffset
{
get => _syncScrollOffset;
set => SetProperty(ref _syncScrollOffset, value);
}
public DiffContext(string repo, Models.DiffOption option) {
public DiffContext(string repo, Models.DiffOption option)
{
_repo = repo;
_option = option;
@ -63,33 +79,46 @@ namespace SourceGit.ViewModels {
OnPropertyChanged(nameof(IsOrgFilePathVisible));
OnPropertyChanged(nameof(OrgFilePath));
Task.Run(() => {
Task.Run(() =>
{
var latest = new Commands.Diff(repo, option).Result();
var binaryDiff = null as Models.BinaryDiff;
if (latest.IsBinary) {
if (latest.IsBinary)
{
binaryDiff = new Models.BinaryDiff();
var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath;
if (option.Revisions.Count == 2) {
if (option.Revisions.Count == 2)
{
binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, option.Revisions[0]).Result();
binaryDiff.NewSize = new Commands.QueryFileSize(repo, _option.Path, option.Revisions[1]).Result();
} else {
}
else
{
binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, "HEAD").Result();
binaryDiff.NewSize = new FileInfo(Path.Combine(repo, _option.Path)).Length;
}
}
Dispatcher.UIThread.InvokeAsync(() => {
if (latest.IsBinary) {
Dispatcher.UIThread.InvokeAsync(() =>
{
if (latest.IsBinary)
{
Content = binaryDiff;
} else if (latest.IsLFS) {
}
else if (latest.IsLFS)
{
Content = latest.LFSDiff;
} else if (latest.TextDiff != null) {
}
else if (latest.TextDiff != null)
{
latest.TextDiff.File = _option.Path;
Content = latest.TextDiff;
IsTextDiff = true;
} else {
}
else
{
IsTextDiff = false;
IsNoChange = true;
}
@ -99,12 +128,14 @@ namespace SourceGit.ViewModels {
});
}
public async void OpenExternalMergeTool() {
public async void OpenExternalMergeTool()
{
var type = Preference.Instance.ExternalMergeToolType;
var exec = Preference.Instance.ExternalMergeToolPath;
var tool = Models.ExternalMergeTools.Supported.Find(x => x.Type == type);
if (tool == null || !File.Exists(exec)) {
if (tool == null || !File.Exists(exec))
{
App.RaiseException(_repo, "Invalid merge tool in preference setting!");
return;
}
@ -113,12 +144,12 @@ namespace SourceGit.ViewModels {
await Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, _option));
}
private string _repo = string.Empty;
private Models.DiffOption _option = null;
private readonly string _repo = string.Empty;
private readonly Models.DiffOption _option = null;
private bool _isLoading = true;
private bool _isNoChange = false;
private bool _isTextDiff = false;
private object _content = null;
private Vector _syncScrollOffset = Vector.Zero;
}
}
}