Skip to content

[fix] Improve targeted action logging and source validation #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paul-fresquet merged 12 commits into from
Jan 3, 2026
Merged

[fix] Improve targeted action logging and source validation #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8721f4a
Add targeted action validation logging
paul-fresquet Jan 1, 2026
1b6418c
Log targeted action creation success
paul-fresquet Jan 2, 2026
24f5d62
Use ILogger for synchronization rule logging
paul-fresquet Jan 2, 2026
7d3a22e
Relax logger mock in sync rule tests
paul-fresquet Jan 2, 2026
3b2d7bd
refactor: cleanup
paul-fresquet Jan 2, 2026
7c3a96d
Split invalid source count validation
paul-fresquet Jan 3, 2026
572d760
feat: improve logging
paul-fresquet Jan 3, 2026
d3711e5
feat: "contents" is now called "content"
paul-fresquet Jan 3, 2026
c907aad
refactor: cleanup
paul-fresquet Jan 3, 2026
20b815b
test: improve tests
paul-fresquet Jan 3, 2026
582a14e
Add AtomicActionEditViewModel unit tests
paul-fresquet Jan 3, 2026
12c559d
test: improve tests
paul-fresquet Jan 3, 2026
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
42 changes: 27 additions & 15 deletions src/ByteSync.Client/Assets/Resources/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions src/ByteSync.Client/Assets/Resources/Resources.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@
<data name="AtomicActionEdit_Destination" xml:space="preserve">
<value>Destination</value>
</data>
<data name="AtomicActionEdit_SynchronizeContentAndDate" xml:space="preserve">
<data name="AtomicActionEdit_Copy" xml:space="preserve">
<value>Copier</value>
</data>
<data name="AtomicActionEdit_SynchronizeContent" xml:space="preserve">
<data name="AtomicActionEdit_CopyContent" xml:space="preserve">
<value>Copier le contenu uniquement</value>
</data>
<data name="AtomicActionEdit_SynchronizeDate" xml:space="preserve">
<data name="AtomicActionEdit_CopyDate" xml:space="preserve">
<value>Copier les dates uniquement</value>
</data>
<data name="AtomicActionEdit_DoNothing" xml:space="preserve">
Expand Down Expand Up @@ -289,13 +289,13 @@
<data name="TargetedActionEditionGlobal_DoTheFollowingAction" xml:space="preserve">
<value>Effectuer l'action suivante :</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeContent" xml:space="preserve">
<data name="SynchronizationActionDescription_Action_CopyContent" xml:space="preserve">
<value>Copier le contenu uniquement</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeContentAndDate" xml:space="preserve">
<data name="SynchronizationActionDescription_Action_Copy" xml:space="preserve">
<value>Copier</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeDate" xml:space="preserve">
<data name="SynchronizationActionDescription_Action_CopyDate" xml:space="preserve">
<value>Copier les dates uniquement</value>
</data>
<data name="SynchronizationActionDescription_Action_DoNothing" xml:space="preserve">
Expand Down Expand Up @@ -1654,8 +1654,11 @@ Voulez-vous enregistrer ce nouveau Profil de Session avec ce nom ?</value>
<value>Destination requise pour la création</value>
</data>
<!-- Advanced Consistency - Source Issues -->
<data name="ValidationFailure_InvalidSourceCount" xml:space="preserve">
<value>Données source invalides</value>
<data name="ValidationFailure_SourceMissing" xml:space="preserve">
<value>Source introuvable</value>
</data>
<data name="ValidationFailure_SourceHasMultipleIdentities" xml:space="preserve">
<value>Plusieurs sources trouvées</value>
</data>
<data name="ValidationFailure_SourceHasAnalysisError" xml:space="preserve">
<value>Erreur d'analyse de la source</value>
Expand Down
27 changes: 15 additions & 12 deletions src/ByteSync.Client/Assets/Resources/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<value>of the following conditions are met:</value>
</data>
<data name="AtomicConditionEdit_Content" xml:space="preserve">
<value>Contents</value>
<value>Content</value>
</data>
<data name="AtomicConditionEdit_LastWriteTime" xml:space="preserve">
<value>Last write time</value>
Expand Down Expand Up @@ -232,13 +232,13 @@
<data name="AtomicActionEdit_Destination" xml:space="preserve">
<value>Destination</value>
</data>
<data name="AtomicActionEdit_SynchronizeContentAndDate" xml:space="preserve">
<data name="AtomicActionEdit_Copy" xml:space="preserve">
<value>Copy</value>
</data>
<data name="AtomicActionEdit_SynchronizeContent" xml:space="preserve">
<value>Copy contents only</value>
<data name="AtomicActionEdit_CopyContent" xml:space="preserve">
<value>Copy content only</value>
</data>
<data name="AtomicActionEdit_SynchronizeDate" xml:space="preserve">
<data name="AtomicActionEdit_CopyDate" xml:space="preserve">
<value>Copy dates only</value>
</data>
<data name="AtomicActionEdit_DoNothing" xml:space="preserve">
Expand Down Expand Up @@ -289,13 +289,13 @@
<data name="TargetedActionEditionGlobal_DoTheFollowingAction" xml:space="preserve">
<value>Do the following action:</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeContent" xml:space="preserve">
<value>Copy contents only</value>
<data name="SynchronizationActionDescription_Action_CopyContent" xml:space="preserve">
<value>Copy content only</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeDate" xml:space="preserve">
<data name="SynchronizationActionDescription_Action_CopyDate" xml:space="preserve">
<value>Copy dates only</value>
</data>
<data name="SynchronizationActionDescription_Action_SynchronizeContentAndDate" xml:space="preserve">
<data name="SynchronizationActionDescription_Action_Copy" xml:space="preserve">
<value>Copy</value>
</data>
<data name="SynchronizationActionDescription_Action_DoNothing" xml:space="preserve">
Expand Down Expand Up @@ -353,7 +353,7 @@ Would you like to continue ?</value>
<value>If</value>
</data>
<data name="AtomicConditionDescription_ComparisonElement_Content" xml:space="preserve">
<value>Contents</value>
<value>Content</value>
</data>
<data name="AtomicConditionDescription_ComparisonElement_Date" xml:space="preserve">
<value>Date</value>
Expand Down Expand Up @@ -1696,8 +1696,11 @@ Do you want to save this new Session Profile with this name?</value>
<value>Destination required for create</value>
</data>
<!-- Advanced Consistency - Source Issues -->
<data name="ValidationFailure_InvalidSourceCount" xml:space="preserve">
<value>Invalid source data</value>
<data name="ValidationFailure_SourceMissing" xml:space="preserve">
<value>Source not found</value>
</data>
<data name="ValidationFailure_SourceHasMultipleIdentities" xml:space="preserve">
<value>Multiple sources found</value>
</data>
<data name="ValidationFailure_SourceHasAnalysisError" xml:space="preserve">
<value>Source has analysis error</value>
Expand Down
66 changes: 29 additions & 37 deletions src/ByteSync.Client/Business/Actions/Shared/SharedActionsGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,34 @@ public SharedActionsGroup()
{
Targets = new HashSet<SharedDataPart>();
}

public PathIdentity PathIdentity { get; set; } = null!;

public SharedDataPart? Source { get; set; }

public HashSet<SharedDataPart> Targets { get; set; }

public SynchronizationTypes? SynchronizationType { get; set; }

public SynchronizationStatus? SynchronizationStatus { get; set; }

public bool IsFromSynchronizationRule { get; set; }

public string LinkingKeyValue
{
get
{
return PathIdentity.LinkingKeyValue;
}
get { return PathIdentity.LinkingKeyValue; }
}

public bool IsFile
{
get
{
return PathIdentity.FileSystemType == FileSystemTypes.File;
}
get { return PathIdentity.FileSystemType == FileSystemTypes.File; }
}

public bool IsDirectory
{
get
{
return PathIdentity.FileSystemType == FileSystemTypes.Directory;
}
get { return PathIdentity.FileSystemType == FileSystemTypes.Directory; }
}

public string Key
{
get
Expand All @@ -62,27 +53,27 @@ public string Key
+ SynchronizationType;
}
}

public string GetSourceFullName()
{
string sourceFileName = GetFullName(Source!);

return sourceFileName;
}

public HashSet<string> GetTargetsFullNames(ByteSyncEndpoint endpoint)
{
HashSet<string> result = new HashSet<string>();

foreach (var target in Targets.Where(sdp => Equals(sdp.ClientInstanceId, endpoint.ClientInstanceId)))
{
var fullName = GetFullName(target);
result.Add(fullName);
}

return result;
}

public string GetFullName(SharedDataPart sharedDataPart)
{
string sourceFileName;
Expand All @@ -94,36 +85,37 @@ public string GetFullName(SharedDataPart sharedDataPart)
{
sourceFileName = sharedDataPart.RootPath;
}

return sourceFileName;
}

private bool Equals(SharedActionsGroup other)
{
return ActionsGroupId == other.ActionsGroupId;
}

public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != this.GetType()) return false;
return Equals((SharedActionsGroup) obj);

return Equals((SharedActionsGroup)obj);
}

public override int GetHashCode()
{
return ActionsGroupId.GetHashCode();
}

public ActionsGroupDefinition GetDefinition()
{
var actionsGroupDefinition = new ActionsGroupDefinition();

actionsGroupDefinition.ActionsGroupId = ActionsGroupId;
actionsGroupDefinition.FileSystemType = PathIdentity.FileSystemType;
actionsGroupDefinition.Operator = Operator;
actionsGroupDefinition.AppliesOnlySynchronizeDate = AppliesOnlySynchronizeDate;
actionsGroupDefinition.AppliesOnlyCopyDate = AppliesOnlyCopyDate;
actionsGroupDefinition.SourceClientInstanceId = Source?.ClientInstanceId;
actionsGroupDefinition.TargetClientInstanceAndNodeIds = Targets
.Select(t => new ClientInstanceIdAndNodeId
Expand All @@ -135,7 +127,7 @@ public ActionsGroupDefinition GetDefinition()
actionsGroupDefinition.Size = Size;
actionsGroupDefinition.CreationTimeUtc = CreationTimeUtc;
actionsGroupDefinition.LastWriteTimeUtc = LastWriteTimeUtc;

return actionsGroupDefinition;
}
}
3 changes: 2 additions & 1 deletion src/ByteSync.Client/Business/Comparisons/AtomicActionValidationFailureReason.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ public enum AtomicActionValidationFailureReason
DestinationRequiredForCreateOperation = 22,

// Advanced Consistency - Source Issues
InvalidSourceCount = 30,
SourceHasAnalysisError = 31,
SourceNotAccessible = 32,
SourceMissing = 33,
SourceHasMultipleIdentities = 34,

// Advanced Consistency - Target Issues
TargetFileNotPresent = 40,
Expand Down
Loading
Loading