phares3757/view-by-distance-mklink-console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

House Cleaning

Browse Source
This commit is contained in:
Mike Phares
2025-07-05 19:54:45 -07:00
parent 30d8a270f9
commit 1ede3ebcdb
25 changed files with 445 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Map/Models/Stateless/FaceFileLogic.cs
View File

@ -64,20 +64,19 @@ internal abstract class FaceFileLogic
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
LocationContainer locationContainer = new(dateOnly,
exifDirectory,
mappedFile.DirectoryNumber,
personDisplayDirectoryName,
null,
null,
mappedFile.FilePath,
fromDistanceContent,
id.Value,
null,
null,
mappedFile.PersonKey,
rectangle,
wholePercentages.Value);
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
ExifDirectory: exifDirectory,
DirectoryNumber: mappedFile.DirectoryNumber,
DisplayDirectoryName: personDisplayDirectoryName,
Encoding: null,
FaceFile: null,
FilePath: mappedFile.FilePath,
FromDistanceContent: fromDistanceContent,
Id: id.Value,
LengthPermyriad: null,
LengthSource: null,
PersonKey: mappedFile.PersonKey,
WholePercentages: wholePercentages.Value);
lock (locationContainers)
locationContainers.Add(locationContainer);
}
@ -167,23 +166,19 @@ internal abstract class FaceFileLogic
MoveUnableToMatch(filePath);
return;
}
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
if (rectangle is null)
return;
LocationContainer locationContainer = new(dateOnly,
exifDirectory,
null,
null,
null,
faceFile,
filePath,
fromDistanceContent,
filePath.Id.Value,
null,
null,
null,
rectangle,
wholePercentages.Value);
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
ExifDirectory: exifDirectory,
DirectoryNumber: null,
DisplayDirectoryName: null,
Encoding: null,
FaceFile: faceFile,
FilePath: filePath,
FromDistanceContent: fromDistanceContent,
Id: filePath.Id.Value,
LengthPermyriad: null,
LengthSource: null,
PersonKey: null,
WholePercentages: wholePercentages.Value);
lock (locationContainers)
locationContainers.Add(locationContainer);
}

40
Map/Models/Stateless/MapLogic.cs
View File

@ -1152,22 +1152,20 @@ internal abstract class MapLogic
exifDirectory = null;
else
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
LocationContainer locationContainer = new(dateOnly,
exifDirectory,
mappedFile.DirectoryNumber,
personDisplayDirectoryName,
null,
null,
mappedFile.FilePath,
fromDistanceContent,
id.Value,
null,
null,
mappedFile.PersonKey,
rectangle,
wholePercentages.Value);
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
ExifDirectory: exifDirectory,
DirectoryNumber: mappedFile.DirectoryNumber,
DisplayDirectoryName: personDisplayDirectoryName,
Encoding: null,
FaceFile: null,
FilePath: mappedFile.FilePath,
FromDistanceContent: fromDistanceContent,
Id: id.Value,
LengthPermyriad: null,
LengthSource: null,
PersonKey: mappedFile.PersonKey,
WholePercentages: wholePercentages.Value);
lock (locationContainers)
locationContainers.Add(locationContainer);
}
@ -1192,12 +1190,18 @@ internal abstract class MapLogic
if (item.WholePercentages == locationContainer.WholePercentages)
continue;
itemPercentagesRectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, item.WholePercentages);
if (itemPercentagesRectangle is null || locationContainer.Rectangle is null)
if (itemPercentagesRectangle is null)
percent = null;
else
{
itemPercentagesArea = itemPercentagesRectangle.Value.Width * itemPercentagesRectangle.Value.Height;
percent = ILocation.GetIntersectPercent(itemPercentagesRectangle.Value, itemPercentagesArea, locationContainer.Rectangle.Value);
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, item.WholePercentages);
if (rectangle is null)
percent = null;
else
{
itemPercentagesArea = itemPercentagesRectangle.Value.Width * itemPercentagesRectangle.Value.Height;
percent = ILocation.GetIntersectPercent(itemPercentagesRectangle.Value, itemPercentagesArea, rectangle.Value);
}
}
delete.Add(item.FilePath);
delete.Add(locationContainer.FilePath);