diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-10-12 14:59:16 +0300 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-10-12 14:59:16 +0300 |
commit | 8185eaa6dd1ca6c86bff73002e5a1a71bbd17529 (patch) | |
tree | 2558059280cafb8f7f2d6f9bfe24883eadf32649 | |
parent | 0036c637fcafe121cd964f29ad998c9b1bfc31ec (diff) |
also detect files in a .part folder as part file
-rw-r--r-- | lib/private/files/cache/scanner.php | 4 | ||||
-rw-r--r-- | tests/lib/files/cache/scanner.php | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index dbffba1e306..b0890dcdc00 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -408,6 +408,10 @@ class Scanner extends BasicEmitter { if (pathinfo($file, PATHINFO_EXTENSION) === 'part') { return true; } + if (strpos($file, '.part/') !== false) { + return true; + } + return false; } diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index b44cf0a49df..871b12bac3a 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -284,4 +284,27 @@ class Scanner extends \Test\TestCase { $cachedData = $this->cache->get('folder/bar.txt'); $this->assertEquals($newFolderId, $cachedData['parent']); } + + /** + * @dataProvider dataTestIsPartialFile + * + * @param string $path + * @param bool $expected + */ + public function testIsPartialFile($path, $expected) { + $this->assertSame($expected, + $this->scanner->isPartialFile($path) + ); + } + + public function dataTestIsPartialFile() { + return [ + ['foo.txt.part', true], + ['/sub/folder/foo.txt.part', true], + ['/sub/folder.part/foo.txt', true], + ['foo.txt', false], + ['/sub/folder/foo.txt', false], + ]; + } + } |