mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add files:scan warning when NFD or incompatible encoding found

This commit is contained in:
Vincent Petry 2016-04-29 10:43:07 +02:00
parent daf5f793a4
commit 61203eee04
No known key found for this signature in database
GPG Key ID: AF8F9EFC56562186
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/files/command/scan.php
View File

@ -89,6 +89,15 @@ class Scan extends Base {
); );
} }
public function checkScanWarning($fullPath, OutputInterface $output) {
$normalizedPath = basename(\OC\Files\Filesystem::normalizePath($fullPath));
$path = basename($fullPath);
if ($normalizedPath !== $path) {
$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
}
}
protected function scanFiles($user, $path, $verbose, OutputInterface $output) { protected function scanFiles($user, $path, $verbose, OutputInterface $output) {
$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); $scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
@ -126,6 +135,12 @@ class Scan extends Base {
} }
}); });
} }
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
$this->checkScanWarning($path, $output);
});
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
$this->checkScanWarning($path, $output);
});
try { try {
$scanner->scan($path); $scanner->scan($path);
@ -133,7 +148,9 @@ class Scan extends Base {
$output->writeln("<error>Home storage for user $user not writable</error>"); $output->writeln("<error>Home storage for user $user not writable</error>");
$output->writeln("Make sure you're running the scan command only as the user the web server runs as"); $output->writeln("Make sure you're running the scan command only as the user the web server runs as");
} catch (\Exception $e) { } catch (\Exception $e) {
# exit the function if ctrl-c has been pressed if ($e->getMessage() !== 'ctrl-c') {
$output->writeln('<error>Exception while scanning: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
}
return; return;
} }
} }