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

PhotoPrism

Browse Source
This commit is contained in:
Mike Phares
2022-12-27 08:57:12 -07:00
parent d08cffe50d
commit e5dc8c1c05
25 changed files with 318 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Instance/DlibDotNet.cs
View File

@ -9,6 +9,7 @@ using View_by_Distance.FaceParts.Models;
using View_by_Distance.Instance.Models;
using View_by_Distance.Map.Models;
using View_by_Distance.Metadata.Models;
using View_by_Distance.PhotoPrism.Models;
using View_by_Distance.Property.Models;
using View_by_Distance.Resize.Models;
using View_by_Distance.Shared.Models;
@ -864,7 +865,7 @@ public partial class DlibDotNet
string dFacesCollectionDirectory = Path.Combine(dResultsFullGroupDirectory, "[]", _Configuration.PropertyConfiguration.ResultAllInOne);
(Dictionary<long, int> personKeyToCount, int totalNotMapped) = mapLogic.AddToMapping(mappingCollection);
if (!string.IsNullOrEmpty(_Configuration.PhotoPrismDirectory) && Directory.Exists(_Configuration.PhotoPrismDirectory))
mapLogic.WriteMatches(ticks, distinctFilteredFaces);
F_PhotoPrism.WriteMatches(_Configuration.PhotoPrismDirectory, _Configuration.PersonBirthdayFormat, ticks, distinctFilteredFaces, mapLogic);
if (_Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution))
{
List<Item> filteredItems = GetItems(argZero, containers);
@ -1059,8 +1060,7 @@ public partial class DlibDotNet
string d2ResultsFullGroupDirectory;
if (!string.IsNullOrEmpty(_Configuration.PhotoPrismDirectory) && Directory.Exists(_Configuration.PhotoPrismDirectory))
{
Map.Models.MapLogic.SaveMarkers(_Configuration.PhotoPrismDirectory);
Dictionary<string, List<MappingFromPhotoPrism>> fileNameToCollection = Map.Models.MapLogic.GetFileNameToCollection(_Configuration.PhotoPrismDirectory);
Dictionary<string, List<MappingFromPhotoPrism>> fileNameToCollection = F_PhotoPrism.GetFileNameToCollection(_Configuration.PhotoPrismDirectory);
foreach (KeyValuePair<string, List<MappingFromPhotoPrism>> keyValuePair in fileNameToCollection)
_FileNameToCollection.Add(keyValuePair.Key, keyValuePair.Value);
}

1
Instance/Instance.csproj
View File

@ -55,6 +55,7 @@
<ProjectReference Include="..\FaceParts\FaceParts.csproj" />
<ProjectReference Include="..\Map\Map.csproj" />
<ProjectReference Include="..\Metadata\Metadata.csproj" />
<ProjectReference Include="..\PhotoPrism\PhotoPrism.csproj" />
<ProjectReference Include="..\Property-Compare\Property-Compare.csproj" />
<ProjectReference Include="..\Property\Property.csproj" />
<ProjectReference Include="..\Resize\Resize.csproj" />

11
Instance/appsettings.Development.json
View File

@ -12,11 +12,12 @@
"Configuration": {
"DistanceRenameToMatch": false,
"DistanceMoveUnableToMatch": false,
"PhotoPrismDirectory": "G:/photo-prism/Not-Copy-Copy-4d49b68/phpMyAdmin/export",
"PhotoPrismDirectory": "D:/Docker/photoprism/windows/Images/storage/backup",
"xRootDirectory": "D:/Tmp/phares/Pictures",
"RootDirectory": "E:/Tmp/Phares/Compare/Not-Copy-Copy-4d49b68",
"xxxRootDirectory": "E:/Tmp/Phares/Compare/Images-4d49b68",
"xxxxRootDirectory": "F:/Tmp/Phares/Compare/Images-4d49b68/Facebook/=2022.3 Facebook",
"xxRootDirectory": "D:/Tmp/Phares/Compare/Not-Copy-Copy-37c7b67",
"xxxRootDirectory": "D:/Tmp/Phares/Compare/Corrupt",
"RootDirectory": "D:/1) Images A/Images-37c7b67",
"xxxxxRootDirectory": "F:/Tmp/Phares/Compare/Images-37c7b67/Facebook/=2022.3 Facebook",
"JLinks": [
"Julie"
],
@ -37,7 +38,7 @@
],
"RangeDistanceTolerance": [
0,
0.5,
0.4,
0.6
],
"RangeFaceAreaPermilleTolerance": [

2
Instance/appsettings.json
View File

@ -53,7 +53,7 @@
"CheckDFaceAndUpWriteDates": false,
"CheckJsonForDistanceResults": false,
"CrossDirectoryMaxItemsInDistanceCollection": 7,
"DateGroup": "2022-12-21",
"DateGroup": "2022-12-25",
"DistanceFactor": 8,
"DistanceMoveUnableToMatch": false,
"DistancePixelDistanceTolerance": 1,