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

Merge pull request #16492 from nextcloud/enh/exclude-rnd-files 

Exclude .rnd files from integrity check
This commit is contained in:
Morris Jobke 2019-07-23 14:57:55 +02:00 committed by GitHub
parent 4902e84346 8bed3021bd
commit d5b524ae07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php
View File

@ -43,6 +43,7 @@ class ExcludeFileByNameFilterIterator extends \RecursiveFilterIterator {
'Thumbs.db', // Microsoft Windows 'Thumbs.db', // Microsoft Windows
'.directory', // Dolphin (KDE) '.directory', // Dolphin (KDE)
'.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage web-apps. '.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage web-apps.
'.rnd',
]; ];
/** /**
@ -54,7 +55,7 @@ class ExcludeFileByNameFilterIterator extends \RecursiveFilterIterator {
*/ */
private $excludedFilenamePatterns = [ private $excludedFilenamePatterns = [
'/^\.webapp-nextcloud-(\d+\.){2}(\d+)(-r\d+)?$/', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage wep-apps. '/^\.webapp-nextcloud-(\d+\.){2}(\d+)(-r\d+)?$/', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manage wep-apps.
]; ];
/** /**
* @return bool * @return bool
@ -68,12 +69,12 @@ class ExcludeFileByNameFilterIterator extends \RecursiveFilterIterator {
} }
$currentFileName = $current->getFilename(); $currentFileName = $current->getFilename();
if (in_array($currentFileName, $this->excludedFilenames, true)){ if (in_array($currentFileName, $this->excludedFilenames, true)) {
return false; return false;
} }
foreach ($this->excludedFilenamePatterns as $pattern){ foreach ($this->excludedFilenamePatterns as $pattern) {
if (preg_match($pattern, $currentFileName) > 0){ if (preg_match($pattern, $currentFileName) > 0) {
return false; return false;
} }
} }

1
tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php
View File

@ -45,6 +45,7 @@ class ExcludeFileByNameFilterIteratorTest extends TestCase {
['.webapp-nextcloud-15.0.2', false], ['.webapp-nextcloud-15.0.2', false],
['.webapp-nextcloud-14.0.5-r3', false], ['.webapp-nextcloud-14.0.5-r3', false],
['wx.webapp-nextcloud-obee', true], ['wx.webapp-nextcloud-obee', true],
['.rnd', false],
]; ];
} }