diff --git a/TGServerService/Repository.cs b/TGServerService/Repository.cs index 1165777e83..7267e5de8c 100644 --- a/TGServerService/Repository.cs +++ b/TGServerService/Repository.cs @@ -47,7 +47,7 @@ namespace TGServerService public readonly string PathToChangelogPy; public readonly string ChangelogPyArguments; public readonly IList PipDependancies = new List(); - public readonly IList ChangelogPathsToStage = new List(); + public readonly IList PathsToStage = new List(); public readonly IList StaticDirectoryPaths = new List(); public readonly IList DLLPaths = new List(); @@ -70,16 +70,16 @@ namespace TGServerService PipDependancies = LoadArray(details["pip_dependancies"]); } catch { } - try - { - ChangelogPathsToStage = LoadArray(details["synchronize_paths"]); - } - catch { } } catch { ChangelogSupport = false; } try + { + PathsToStage = LoadArray(json["synchronize_paths"]); + } + catch { } + try { StaticDirectoryPaths = LoadArray(json["static_directories"]); } @@ -115,7 +115,7 @@ namespace TGServerService && PathToChangelogPy == other.PathToChangelogPy && ChangelogPyArguments == other.ChangelogPyArguments && ListEquals(PipDependancies, other.PipDependancies) - && ListEquals(ChangelogPathsToStage, other.ChangelogPathsToStage) + && ListEquals(PathsToStage, other.PathsToStage) && ListEquals(StaticDirectoryPaths, other.StaticDirectoryPaths) && ListEquals(DLLPaths, other.DLLPaths); } @@ -127,7 +127,7 @@ namespace TGServerService hashCode = hashCode * -1521134295 + EqualityComparer.Default.GetHashCode(PathToChangelogPy); hashCode = hashCode * -1521134295 + EqualityComparer.Default.GetHashCode(ChangelogPyArguments); hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(PipDependancies); - hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(ChangelogPathsToStage); + hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(PathsToStage); hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(StaticDirectoryPaths); hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(DLLPaths); return hashCode; @@ -1012,7 +1012,7 @@ namespace TGServerService try { // Stage the file - foreach(var I in Config.ChangelogPathsToStage) + foreach(var I in Config.PathsToStage) Commands.Stage(Repo, I); if (Repo.RetrieveStatus().Staged.Count() == 0) //nothing to commit