Any
This commit is contained in:
parent
5130c76413
commit
7408b3d589
@ -157,7 +157,7 @@ internal abstract class MapLogic
|
|||||||
yearDirectoryName = Path.GetFileName(yearDirectory);
|
yearDirectoryName = Path.GetFileName(yearDirectory);
|
||||||
matchDirectories = Directory.GetDirectories(yearDirectory, "*", SearchOption.TopDirectoryOnly);
|
matchDirectories = Directory.GetDirectories(yearDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||||
alphaDirectories = matchDirectories.Where(l => !long.TryParse(Path.GetFileName(l), out long a)).ToArray();
|
alphaDirectories = matchDirectories.Where(l => !long.TryParse(Path.GetFileName(l), out long a)).ToArray();
|
||||||
if (!alphaDirectories.Any())
|
if (alphaDirectories.Length == 0)
|
||||||
continue;
|
continue;
|
||||||
alphaDirectoryName = Path.GetFileName(alphaDirectories[0]);
|
alphaDirectoryName = Path.GetFileName(alphaDirectories[0]);
|
||||||
foreach (string matchDirectory in matchDirectories)
|
foreach (string matchDirectory in matchDirectories)
|
||||||
@ -172,7 +172,7 @@ internal abstract class MapLogic
|
|||||||
facesFileNames = (from l in collection where l.Extension == configuration.FacesFileNameExtension select l.FullName).ToArray();
|
facesFileNames = (from l in collection where l.Extension == configuration.FacesFileNameExtension select l.FullName).ToArray();
|
||||||
else
|
else
|
||||||
facesFileNames = (from l in collection where l.Extension == configuration.FacesFileNameExtension && l.Name.Contains(matchDirectoryName) select l.FullName).ToArray();
|
facesFileNames = (from l in collection where l.Extension == configuration.FacesFileNameExtension && l.Name.Contains(matchDirectoryName) select l.FullName).ToArray();
|
||||||
if (!facesFileNames.Any())
|
if (facesFileNames.Length == 0)
|
||||||
continue;
|
continue;
|
||||||
personDisplayDirectory = Path.Combine(matchDirectory, alphaDirectoryName);
|
personDisplayDirectory = Path.Combine(matchDirectory, alphaDirectoryName);
|
||||||
if (!Directory.Exists(personDisplayDirectory) || !Directory.Exists(matchDirectory))
|
if (!Directory.Exists(personDisplayDirectory) || !Directory.Exists(matchDirectory))
|
||||||
@ -182,7 +182,7 @@ internal abstract class MapLogic
|
|||||||
{
|
{
|
||||||
Thread.Sleep(500);
|
Thread.Sleep(500);
|
||||||
actionDirectories = Directory.GetDirectories(matchDirectory, "*", SearchOption.TopDirectoryOnly).Where(l => l != personDisplayDirectory && !l.EndsWith("Maybe")).ToArray();
|
actionDirectories = Directory.GetDirectories(matchDirectory, "*", SearchOption.TopDirectoryOnly).Where(l => l != personDisplayDirectory && !l.EndsWith("Maybe")).ToArray();
|
||||||
if (actionDirectories.Any())
|
if (actionDirectories.Length > 0)
|
||||||
{
|
{
|
||||||
MoveTo(actionDirectories[0], ticksDirectory, directory, personKeyFormatted, yearDirectoryName, alphaDirectoryName, files, facesFileNames);
|
MoveTo(actionDirectories[0], ticksDirectory, directory, personKeyFormatted, yearDirectoryName, alphaDirectoryName, files, facesFileNames);
|
||||||
break;
|
break;
|
||||||
@ -317,7 +317,7 @@ internal abstract class MapLogic
|
|||||||
foreach (string personNameDirectory in personNameDirectories)
|
foreach (string personNameDirectory in personNameDirectories)
|
||||||
{
|
{
|
||||||
personDisplayDirectoryNames = IPath.GetDirectoryNames(personNameDirectory);
|
personDisplayDirectoryNames = IPath.GetDirectoryNames(personNameDirectory);
|
||||||
if (!personDisplayDirectoryNames.Any())
|
if (personDisplayDirectoryNames.Length == 0)
|
||||||
continue;
|
continue;
|
||||||
isDefault = personDisplayDirectoryNames[^1].First() == 'X' && IPersonBirthday.IsCounterPersonYear(personKeyFormatted[..4]);
|
isDefault = personDisplayDirectoryNames[^1].First() == 'X' && IPersonBirthday.IsCounterPersonYear(personKeyFormatted[..4]);
|
||||||
if (isDefault && personDisplayDirectoryNames[^1].Length == 1)
|
if (isDefault && personDisplayDirectoryNames[^1].Length == 1)
|
||||||
@ -1167,13 +1167,13 @@ internal abstract class MapLogic
|
|||||||
yearDirectories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
|
yearDirectories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||||
yearDirectoryNames.AddRange(GetCollection(yearDirectories));
|
yearDirectoryNames.AddRange(GetCollection(yearDirectories));
|
||||||
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('^') select l).OrderByDescending(l => l.Item2).ToArray();
|
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('^') select l).OrderByDescending(l => l.Item2).ToArray();
|
||||||
if (!yearDirectoryNameCheck.Any())
|
if (yearDirectoryNameCheck.Length == 0)
|
||||||
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('~') select l).OrderByDescending(l => l.Item2).ToArray();
|
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('~') select l).OrderByDescending(l => l.Item2).ToArray();
|
||||||
if (!yearDirectoryNameCheck.Any())
|
if (yearDirectoryNameCheck.Length == 0)
|
||||||
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('=') select l).OrderByDescending(l => l.Item2).ToArray();
|
yearDirectoryNameCheck = (from l in yearDirectoryNames where l.Item2.Contains('=') select l).OrderByDescending(l => l.Item2).ToArray();
|
||||||
if (!yearDirectoryNameCheck.Any())
|
if (yearDirectoryNameCheck.Length == 0)
|
||||||
yearDirectoryNameCheck = (from l in yearDirectoryNames select l).OrderByDescending(l => l).ToArray();
|
yearDirectoryNameCheck = (from l in yearDirectoryNames select l).OrderByDescending(l => l).ToArray();
|
||||||
if (!yearDirectoryNameCheck.Any())
|
if (yearDirectoryNameCheck.Length == 0)
|
||||||
continue;
|
continue;
|
||||||
foreach ((string yearDirectory, string yearDirectoryName) in yearDirectoryNameCheck)
|
foreach ((string yearDirectory, string yearDirectoryName) in yearDirectoryNameCheck)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user