Merge branch 'master' into stable24

old_stable24
Varun Patil 2022-11-22 09:42:58 -08:00
commit 37728437d9
2 changed files with 3 additions and 13 deletions

View File

@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
]]></description>
<version>3.8.0</version>
<version>3.7.2</version>
<licence>agpl</licence>
<author mail="radialapps@gmail.com" >Varun Patil</author>
<namespace>Memories</namespace>

View File

@ -268,11 +268,6 @@ class Index extends Command
return;
}
// check path contains IMDB then skip
if (false !== strpos($folderPath, 'IMDB')) {
return;
}
$nodes = $folder->getDirectoryListing();
foreach ($nodes as $i => &$node) {
@ -292,21 +287,16 @@ class Index extends Command
}
}
private function parseFile(File &$file, bool &$refresh): bool
private function parseFile(File &$file, bool &$refresh): void
{
// Process the file
$res = $this->timelineWrite->processFile($file, $refresh);
if (2 === $res) {
++$this->nProcessed;
return true;
}
if (1 === $res) {
} elseif (1 === $res) {
++$this->nSkipped;
} else {
++$this->nInvalid;
}
return false;
}
}