Runs but broken
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using View_by_Distance.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.Instance.Models;
|
||||
|
||||
@ -24,14 +25,16 @@ internal class F_Random
|
||||
return result;
|
||||
}
|
||||
|
||||
private static ReadOnlyDictionary<string, List<string>> GetDayToRelativePaths(ReadOnlyCollection<Shared.Models.Mapping> mappingCollection, string dateFormat, ReadOnlyDictionary<int, List<long>> idToPersonKeys)
|
||||
private static ReadOnlyDictionary<string, List<string>> GetDayToRelativePaths(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection, string dateFormat, Dictionary<string, ImmichAsset> immichAssets, ReadOnlyDictionary<int, List<long>> idToPersonKeys)
|
||||
{
|
||||
Dictionary<string, List<string>> results = [];
|
||||
string key;
|
||||
DateTime dateTime;
|
||||
List<long>? personKeys;
|
||||
ImmichAsset? immichAsset;
|
||||
List<string>? relativePaths;
|
||||
foreach (Shared.Models.Mapping mapping in mappingCollection)
|
||||
bool immichAssetsCountIsZero = immichAssets.Count == 0;
|
||||
foreach (Mapping mapping in distinctValidImageMappingCollection)
|
||||
{
|
||||
if (mapping.MappingFromItem.FilePath.DirectoryName is null || mapping.MappingFromPerson is null)
|
||||
continue;
|
||||
@ -49,29 +52,55 @@ internal class F_Random
|
||||
if (!results.TryGetValue(key, out relativePaths))
|
||||
throw new Exception();
|
||||
}
|
||||
relativePaths.Add(mapping.MappingFromItem.RelativePath);
|
||||
if (immichAssetsCountIsZero)
|
||||
relativePaths.Add(mapping.MappingFromItem.RelativePath);
|
||||
else
|
||||
{
|
||||
if (!immichAssets.TryGetValue(mapping.MappingFromItem.RelativePath, out immichAsset))
|
||||
continue;
|
||||
relativePaths.Add(immichAsset.PreviewPath);
|
||||
}
|
||||
}
|
||||
return new(results);
|
||||
}
|
||||
|
||||
internal void Random(Property.Models.Configuration configuration, int radomUseBirthdayMinimum, string[] validKeyWordsToIgnoreInRandom, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<int>? notNineCollection, ReadOnlyCollection<Shared.Models.Mapping> mappingCollection)
|
||||
private static Dictionary<string, ImmichAsset> GetImmichAssets(string immichAssetsFile)
|
||||
{
|
||||
Dictionary<string, ImmichAsset> results = [];
|
||||
if (!string.IsNullOrEmpty(immichAssetsFile) && File.Exists(immichAssetsFile))
|
||||
{
|
||||
string json = File.ReadAllText(immichAssetsFile);
|
||||
ImmichAsset[]? immichAssets = JsonSerializer.Deserialize(json, ImmichAssetCollectionSourceGenerationContext.Default.ImmichAssetArray);
|
||||
if (immichAssets is not null)
|
||||
{
|
||||
foreach (ImmichAsset immichAsset in immichAssets)
|
||||
results.Add(immichAsset.OriginalPath, immichAsset);
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
internal void Random(Property.Models.Configuration configuration, string immichAssetsFile, int radomUseBirthdayMinimum, string[] validKeyWordsToIgnoreInRandom, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<int>? notNineCollection, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
|
||||
{
|
||||
string key;
|
||||
string json;
|
||||
string jsonFile;
|
||||
Random random = new();
|
||||
List<string>? collection;
|
||||
ImmichAsset? immichAsset;
|
||||
string dateFormat = "MM-dd";
|
||||
List<string> relativePaths = [];
|
||||
List<int> distinctCollection = [];
|
||||
DateTime dateTime = new(2024, 1, 1); //Leap year
|
||||
Dictionary<string, ImmichAsset> immichAssets = GetImmichAssets(immichAssetsFile);
|
||||
ReadOnlyDictionary<int, List<long>> idToPersonKeys = Map.Models.Stateless.Methods.IMapLogic.GetIdToPersonKeys(personKeyToIds);
|
||||
ReadOnlyDictionary<string, List<string>> dayToRelativePaths = GetDayToRelativePaths(mappingCollection, dateFormat, idToPersonKeys);
|
||||
ReadOnlyDictionary<string, List<string>> dayToRelativePaths = GetDayToRelativePaths(distinctValidImageMappingCollection, dateFormat, immichAssets, idToPersonKeys);
|
||||
string fRandomCollectionDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(F_Random), "[]");
|
||||
string[] files = Directory.GetFiles(fRandomCollectionDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||
foreach (string file in files)
|
||||
File.Delete(file);
|
||||
foreach (Shared.Models.Mapping mapping in mappingCollection)
|
||||
bool immichAssetsCountIsZero = immichAssets.Count == 0;
|
||||
foreach (Mapping mapping in distinctValidImageMappingCollection)
|
||||
{
|
||||
if (distinctCollection.Contains(mapping.MappingFromItem.Id))
|
||||
continue;
|
||||
@ -81,7 +110,14 @@ internal class F_Random
|
||||
continue;
|
||||
if (mapping.MappingFromItem.Keywords is not null && mapping.MappingFromItem.Keywords.Any(l => validKeyWordsToIgnoreInRandom.Contains(l)))
|
||||
continue;
|
||||
relativePaths.Add(mapping.MappingFromItem.RelativePath);
|
||||
if (immichAssetsCountIsZero)
|
||||
relativePaths.Add(mapping.MappingFromItem.RelativePath);
|
||||
else
|
||||
{
|
||||
if (!immichAssets.TryGetValue(mapping.MappingFromItem.RelativePath, out immichAsset))
|
||||
continue;
|
||||
relativePaths.Add(immichAsset.PreviewPath);
|
||||
}
|
||||
distinctCollection.Add(mapping.MappingFromItem.Id);
|
||||
}
|
||||
if (relativePaths.Count > 0)
|
||||
|
Reference in New Issue
Block a user