RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'eltos-patch-1'

pull/231/head
Varun Patil 2022-11-21 02:18:29 -08:00
parent cf4ae6a84a 81bceb9334
commit 348844f4e7
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Command/Index.php
View File

@ -40,6 +40,7 @@ use OCP\IUserManager;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\ConsoleSectionOutput;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
class Index extends Command class Index extends Command
@ -58,12 +59,14 @@ class Index extends Command
protected TimelineWrite $timelineWrite; protected TimelineWrite $timelineWrite;
// Stats // Stats
private int $nUser = 0;
private int $nProcessed = 0; private int $nProcessed = 0;
private int $nSkipped = 0; private int $nSkipped = 0;
private int $nInvalid = 0; private int $nInvalid = 0;
private int $nNoMedia = 0;
// Helper for the progress bar // Helper for the progress bar
private int $previousLineLength = 0; private ConsoleSectionOutput $outputSection;
public function __construct( public function __construct(
IRootFolder $rootFolder, IRootFolder $rootFolder,
@ -193,10 +196,11 @@ class Index extends Command
// Show some stats // Show some stats
$endTime = microtime(true); $endTime = microtime(true);
$execTime = (int) (($endTime - $startTime) * 1000) / 1000; $execTime = (int) (($endTime - $startTime) * 1000) / 1000;
$nTotal = $this->nInvalid + $this->nSkipped + $this->nProcessed; $nTotal = $this->nInvalid + $this->nSkipped + $this->nProcessed + $this->nNoMedia;
$this->output->writeln('=========================================='); $this->output->writeln('==========================================');
$this->output->writeln("Checked {$nTotal} files in {$execTime} sec"); $this->output->writeln("Checked {$nTotal} files of {$this->nUser} users in {$execTime} sec");
$this->output->writeln($this->nInvalid.' not valid media items'); $this->output->writeln($this->nInvalid.' not valid media items');
$this->output->writeln($this->nNoMedia.' .nomedia folders ignored');
$this->output->writeln($this->nSkipped.' skipped because unmodified'); $this->output->writeln($this->nSkipped.' skipped because unmodified');
$this->output->writeln($this->nProcessed.' (re-)processed'); $this->output->writeln($this->nProcessed.' (re-)processed');
$this->output->writeln('=========================================='); $this->output->writeln('==========================================');
@ -246,31 +250,31 @@ class Index extends Command
$uid = $user->getUID(); $uid = $user->getUID();
$userFolder = $this->rootFolder->getUserFolder($uid); $userFolder = $this->rootFolder->getUserFolder($uid);
$this->parseFolder($userFolder, $refresh); $this->outputSection = $this->output->section();
if ($this->previousLineLength) { $this->parseFolder($userFolder, $refresh, $this->nUser, $this->userManager->countSeenUsers());
$this->output->write("\r".str_repeat(' ', $this->previousLineLength)."\r"); $this->outputSection->overwrite('Scanned '.$userFolder->getPath());
} ++$this->nUser;
} }
private function parseFolder(Folder &$folder, bool &$refresh): void private function parseFolder(Folder &$folder, bool &$refresh, int $progress_i, int $progress_n): void
{ {
try { try {
$folderPath = $folder->getPath(); $folderPath = $folder->getPath();
// Respect the '.nomedia' file. If present don't traverse the folder // Respect the '.nomedia' file. If present don't traverse the folder
if ($folder->nodeExists('.nomedia')) { if ($folder->nodeExists('.nomedia')) {
$this->output->writeln('Skipping folder '.$folderPath.' because of .nomedia file'); ++$this->nNoMedia;
$this->previousLineLength = 0;
return; return;
} }
$nodes = $folder->getDirectoryListing(); $nodes = $folder->getDirectoryListing();
foreach ($nodes as &$node) { foreach ($nodes as $i => &$node) {
if ($node instanceof Folder) { if ($node instanceof Folder) {
$this->parseFolder($node, $refresh); $this->parseFolder($node, $refresh, $progress_i * \count($nodes) + $i, $progress_n * \count($nodes));
} elseif ($node instanceof File) { } elseif ($node instanceof File) {
$this->outputSection->overwrite(sprintf('%.2f%%', $progress_i / $progress_n * 100).' scanning '.$node->getPath());
$this->parseFile($node, $refresh); $this->parseFile($node, $refresh);
} }
} }
@ -285,14 +289,6 @@ class Index extends Command
private function parseFile(File &$file, bool &$refresh): void private function parseFile(File &$file, bool &$refresh): void
{ {
// Clear previous line and write new one
$line = 'Scanning file '.$file->getPath();
if ($this->previousLineLength) {
$this->output->write("\r".str_repeat(' ', $this->previousLineLength)."\r");
}
$this->output->write($line."\r");
$this->previousLineLength = \strlen($line);
// Process the file // Process the file
$res = $this->timelineWrite->processFile($file, $refresh); $res = $this->timelineWrite->processFile($file, $refresh);
if (2 === $res) { if (2 === $res) {