Skip to content

[master] add options to fully ignore external storage #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Feb 28, 2019
Merged

[master] add options to fully ignore external storage #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/admin.settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var files_settings = {

updateSettingPage: function (result) {
files_elements.files_local.prop('checked', (result.files_local === '1'));
files_elements.files_external.prop('checked', (result.files_external === '1'));
files_elements.files_external.val(result.files_external);
files_elements.files_group_folders.prop('checked', (result.files_group_folders === '1'));
files_elements.files_encrypted.prop('checked', (result.files_encrypted === '1'));
files_elements.files_federated.prop('checked', (result.files_federated === '1'));
Expand All @@ -63,7 +63,7 @@ var files_settings = {
saveSettings: function () {
var data = {
files_local: (files_elements.files_local.is(':checked')) ? 1 : 0,
files_external: (files_elements.files_external.is(':checked')) ? 1 : 0,
files_external: files_elements.files_external.val(),
files_encrypted: (files_elements.files_encrypted.is(':checked')) ? 1 : 0,
files_federated: (files_elements.files_federated.is(':checked')) ? 1 : 0,
files_group_folders: (files_elements.files_group_folders.is(':checked')) ? 1 : 0,
Expand Down
12 changes: 12 additions & 0 deletions lib/Service/FilesService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,12 @@ public function getFilesFromDirectory(string $userId, Folder $node): array {
return $documents;
}

if ($this->configService->getAppValue(ConfigService::FILES_EXTERNAL) === '2'
&& $node->getMountPoint()
->getMountType() === 'external') {
return $documents;
}

$files = $node->getDirectoryListing();
foreach ($files as $file) {

Expand Down Expand Up @@ -517,6 +523,12 @@ private function generateDocumentFromIndex(IIndex $index): FilesDocument {

try {
$file = $this->getFileFromIndex($index);

if ($file->getMountPoint()
->getMountType() === 'external'
&& $this->configService->getAppValue(ConfigService::FILES_EXTERNAL) === '2') {
throw new Exception();
}
} catch (Exception $e) {
$index->setStatus(IIndex::INDEX_REMOVE);
$document = new FilesDocument($index->getProviderId(), $index->getDocumentId());
Expand Down
7 changes: 5 additions & 2 deletions templates/settings.admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
declare(strict_types=1);



/**
* Files_FullTextSearch - Index the content of your files
*
Expand Down Expand Up @@ -63,7 +62,11 @@
<em><?php p($l->t('Index the content of external files.')); ?></em>
</div>
<div class="div-table-col">
<input type="checkbox" id="files_external" value="1"/>
<select id="files_external">
<option value="0"><?php p($l->t('Index path only')); ?></option>
<option value="1"><?php p($l->t('Index path and content')); ?></option>
<option value="2"><?php p($l->t('Do not index path nor content')); ?></option>
</select>
</div>
</div>

Expand Down