Ready to test
This commit is contained in:
		| @ -1,3 +1,4 @@ | ||||
| using FaceRecognitionDotNet; | ||||
| using System.Text.Json; | ||||
| using View_by_Distance.Metadata.Models; | ||||
| using View_by_Distance.Property.Models; | ||||
| @ -28,7 +29,7 @@ internal class E3_Rename | ||||
|         return result; | ||||
|     } | ||||
|  | ||||
|     internal string[] GetDirectoryRenameCollection(Property.Models.Configuration configuration, string relativePath, string newDirectoryName, bool jsonFiles4InfoAny) | ||||
|     internal string[] GetDirectoryRenameCollection(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string relativePath, string newDirectoryName, bool jsonFiles4InfoAny) | ||||
|     { | ||||
|         List<string> results = new(); | ||||
|         bool add; | ||||
| @ -41,9 +42,11 @@ internal class E3_Rename | ||||
|         string aPropertySingletonDirectory; | ||||
|         string bMetadataSingletonDirectory; | ||||
|         string eDistanceCollectionDirectory; | ||||
|         string modelName = model.ToString(); | ||||
|         string g2IdentifyCollectionDirectory; | ||||
|         string d2FaceLandmarksContentDirectory; | ||||
|         add = Directory.Exists(string.Concat(Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), _Configuration.ValidResolutions[0], includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"), relativePath)); | ||||
|         string predictorModelName = predictorModel.ToString(); | ||||
|         add = Directory.Exists(string.Concat(Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), _Configuration.ValidResolutions[0], includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"), relativePath)); | ||||
|         bMetadataSingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(B_Metadata), "{}"); | ||||
|         if (Directory.Exists(bMetadataSingletonDirectory)) | ||||
|         { | ||||
| @ -56,7 +59,7 @@ internal class E3_Rename | ||||
|             to = Path.Combine(string.Concat(aPropertySingletonDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|             results.Add(to); | ||||
|         } | ||||
|         cResizeContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), _Configuration.ValidResolutions[0], includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"); | ||||
|         cResizeContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), _Configuration.ValidResolutions[0], includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"); | ||||
|         if (Directory.Exists(cResizeContentDirectory)) | ||||
|         { | ||||
|             to = Path.Combine(string.Concat(cResizeContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
| @ -64,37 +67,37 @@ internal class E3_Rename | ||||
|         } | ||||
|         foreach (string outputResolution in _Configuration.ValidResolutions) | ||||
|         { | ||||
|             cResizeSingletonDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "{}"); | ||||
|             cResizeSingletonDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "{}"); | ||||
|             if (Directory.Exists(cResizeSingletonDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(cResizeSingletonDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(to); | ||||
|             } | ||||
|             dFacesContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             dFacesContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             if (Directory.Exists(dFacesContentDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(dFacesContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(to); | ||||
|             } | ||||
|             dFacesCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             dFacesCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             if (Directory.Exists(dFacesCollectionDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(dFacesCollectionDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(to); | ||||
|             } | ||||
|             d2FaceLandmarksContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D2_FaceLandmarks), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             d2FaceLandmarksContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D2_FaceLandmarks), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             if (add && _Configuration.SaveFaceLandmarkForOutputResolutions.Contains(outputResolution) && Directory.Exists(d2FaceLandmarksContentDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(d2FaceLandmarksContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(to); | ||||
|             } | ||||
|             eDistanceContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             eDistanceContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             if (Directory.Exists(eDistanceContentDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(eDistanceContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(to); | ||||
|             } | ||||
|             eDistanceCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             eDistanceCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             if (Directory.Exists(eDistanceCollectionDirectory)) | ||||
|             { | ||||
|                 to = Path.Combine(string.Concat(eDistanceCollectionDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
| @ -110,7 +113,7 @@ internal class E3_Rename | ||||
|         return results.ToArray(); | ||||
|     } | ||||
|  | ||||
|     internal List<string[]> GetDirectoryRenameCollections(Property.Models.Configuration configuration, string relativePath, string newDirectoryName, bool jsonFiles4InfoAny) | ||||
|     internal List<string[]> GetDirectoryRenameCollections(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string relativePath, string newDirectoryName, bool jsonFiles4InfoAny) | ||||
|     { | ||||
|         List<string[]> results = new(); | ||||
|         if (_Configuration?.PropertyConfiguration is null) | ||||
| @ -126,9 +129,11 @@ internal class E3_Rename | ||||
|         string eDistanceContentDirectory; | ||||
|         string bMetadataSingletonDirectory; | ||||
|         string aPropertySingletonDirectory; | ||||
|         string modelName = model.ToString(); | ||||
|         string eDistanceCollectionDirectory; | ||||
|         string g2IdentifyCollectionDirectory; | ||||
|         string d2FaceLandmarksContentDirectory; | ||||
|         string predictorModelName = predictorModel.ToString(); | ||||
|         if (!string.IsNullOrEmpty(relativePath)) | ||||
|         { | ||||
|             from = string.Concat(_Configuration.PropertyConfiguration.RootDirectory, relativePath); | ||||
| @ -137,7 +142,7 @@ internal class E3_Rename | ||||
|         } | ||||
|         foreach (string outputResolution in _Configuration.ValidResolutions) | ||||
|         { | ||||
|             add = Directory.Exists(string.Concat(Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"), relativePath)); | ||||
|             add = Directory.Exists(string.Concat(Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"), relativePath)); | ||||
|             bMetadataSingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(B_Metadata), "{}"); | ||||
|             from = string.Concat(bMetadataSingletonDirectory, relativePath); | ||||
|             exists = Directory.Exists(bMetadataSingletonDirectory); | ||||
| @ -154,7 +159,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(aPropertySingletonDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             cResizeContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"); | ||||
|             cResizeContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "()"); | ||||
|             from = string.Concat(cResizeContentDirectory, relativePath); | ||||
|             exists = Directory.Exists(cResizeContentDirectory); | ||||
|             if (exists) | ||||
| @ -162,7 +167,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(cResizeContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             cResizeSingletonDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "{}"); | ||||
|             cResizeSingletonDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(C_Resize), outputResolution, includeResizeGroup: true, includeModel: false, includePredictorModel: false), "{}"); | ||||
|             from = string.Concat(cResizeSingletonDirectory, relativePath); | ||||
|             exists = Directory.Exists(cResizeSingletonDirectory); | ||||
|             if (exists) | ||||
| @ -170,7 +175,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(cResizeSingletonDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             dFacesContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             dFacesContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             from = string.Concat(dFacesContentDirectory, relativePath); | ||||
|             exists = Directory.Exists(dFacesContentDirectory); | ||||
|             if (exists) | ||||
| @ -178,7 +183,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(dFacesContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             dFacesCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             dFacesCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D_Face), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             from = string.Concat(dFacesCollectionDirectory, relativePath); | ||||
|             exists = Directory.Exists(dFacesCollectionDirectory); | ||||
|             if (exists) | ||||
| @ -186,7 +191,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(dFacesCollectionDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             d2FaceLandmarksContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(D2_FaceLandmarks), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             d2FaceLandmarksContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(D2_FaceLandmarks), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             from = string.Concat(d2FaceLandmarksContentDirectory, relativePath); | ||||
|             exists = Directory.Exists(d2FaceLandmarksContentDirectory); | ||||
|             if (!exists && add && _Configuration.SaveFaceLandmarkForOutputResolutions.Contains(outputResolution)) | ||||
| @ -196,7 +201,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(d2FaceLandmarksContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             eDistanceContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             eDistanceContentDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "()"); | ||||
|             from = string.Concat(eDistanceContentDirectory, relativePath); | ||||
|             exists = Directory.Exists(eDistanceContentDirectory); | ||||
|             if (exists) | ||||
| @ -204,7 +209,7 @@ internal class E3_Rename | ||||
|                 to = Path.Combine(string.Concat(eDistanceContentDirectory, Path.GetDirectoryName(relativePath)), newDirectoryName); | ||||
|                 results.Add(new string[] { from, to }); | ||||
|             } | ||||
|             eDistanceCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             eDistanceCollectionDirectory = Path.Combine(Property.Models.Stateless.IResult.GetResultsFullGroupDirectory(configuration, modelName, predictorModelName, nameof(E_Distance), outputResolution, includeResizeGroup: true, includeModel: true, includePredictorModel: true), "[]"); | ||||
|             from = string.Concat(eDistanceCollectionDirectory, relativePath); | ||||
|             exists = Directory.Exists(eDistanceCollectionDirectory); | ||||
|             if (exists) | ||||
| @ -226,7 +231,7 @@ internal class E3_Rename | ||||
|         return results; | ||||
|     } | ||||
|  | ||||
|     internal void DirectoryRename(Property.Models.Configuration configuration, string relativePath, string newDirectoryName) | ||||
|     internal void DirectoryRename(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel, string relativePath, string newDirectoryName) | ||||
|     { | ||||
|         if (_Configuration?.PropertyConfiguration is null) | ||||
|             throw new Exception($"{nameof(_Configuration.PropertyConfiguration)} must be set!"); | ||||
| @ -236,7 +241,7 @@ internal class E3_Rename | ||||
|         string error = "Error"; | ||||
|         string target = "Target"; | ||||
|         string pending = "Pending"; | ||||
|         DirectoryInfo directoryInfo; | ||||
|         System.IO.DirectoryInfo directoryInfo; | ||||
|         IEnumerator<FileInfo> fileInfoCollection; | ||||
|         string oldValue = string.Concat("\"", relativePath); | ||||
|         string oldDirectoryName = Path.GetFileName(relativePath); | ||||
| @ -248,7 +253,7 @@ internal class E3_Rename | ||||
|         string newValue = string.Concat("\"", Path.Combine(relativePathParent, newDirectoryName)); | ||||
|         string e3RenameContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(E3_Rename), "()"); | ||||
|         string jsonRootDirectory = Path.Combine(string.Concat(_Configuration.PropertyConfiguration.RootDirectory, " - Copied"), string.Concat(directoryName, " - 4) Info"), _Configuration.PropertyConfiguration.DateGroup, "[]"); | ||||
|         directoryInfo = new DirectoryInfo(jsonRootDirectory); | ||||
|         directoryInfo = new System.IO.DirectoryInfo(jsonRootDirectory); | ||||
|         if (!directoryInfo.Exists) | ||||
|             directoryInfo.Create(); | ||||
|         IEnumerator<FileInfo> fileInfoCollection4 = directoryInfo.EnumerateFiles("*.json", SearchOption.AllDirectories).GetEnumerator(); | ||||
| @ -257,7 +262,7 @@ internal class E3_Rename | ||||
|             current = new(string.Empty); | ||||
|         else | ||||
|             current = fileInfoCollection4.Current; | ||||
|         List<string[]> directoryCollections = GetDirectoryRenameCollections(configuration, relativePath, newDirectoryName, fileInfoCollection4MoveNext); | ||||
|         List<string[]> directoryCollections = GetDirectoryRenameCollections(configuration, model, predictorModel, relativePath, newDirectoryName, fileInfoCollection4MoveNext); | ||||
|         if ((from l in directoryCollections where l.Length != 2 select true).Any()) | ||||
|             throw new Exception(); | ||||
|         if (!Directory.Exists(e3RenameContentDirectory)) | ||||
| @ -277,7 +282,7 @@ internal class E3_Rename | ||||
|         { | ||||
|             foreach (string[] directoryCollection in directoryCollections) | ||||
|             { | ||||
|                 directoryInfo = new DirectoryInfo(directoryCollection[0]); | ||||
|                 directoryInfo = new System.IO.DirectoryInfo(directoryCollection[0]); | ||||
|                 if (!directoryInfo.Exists) | ||||
|                     continue; | ||||
|                 fileInfoCollection = directoryInfo.EnumerateFiles("*.json", SearchOption.AllDirectories).GetEnumerator(); | ||||
| @ -314,7 +319,7 @@ internal class E3_Rename | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     internal void RenameQueue(Property.Models.Configuration configuration) | ||||
|     internal void RenameQueue(Property.Models.Configuration configuration, Model model, PredictorModel predictorModel) | ||||
|     { | ||||
|         string[] lines; | ||||
|         string[] segments; | ||||
| @ -330,7 +335,7 @@ internal class E3_Rename | ||||
|                 segments = line.Split('\t'); | ||||
|                 if (segments.Length != 2) | ||||
|                     throw new Exception(); | ||||
|                 DirectoryRename(configuration, segments[0], segments[1]); | ||||
|                 DirectoryRename(configuration, model, predictorModel, segments[0], segments[1]); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user