diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2018-10-21 18:32:25 +0300 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2018-10-21 18:32:25 +0300 |
| commit | 5d7563d1a0bcf1c6dc7ba3320824efa1fe624b4c (patch) | |
| tree | 85f0aaab45ad96af07627f69b7a0601eb65c66fb | |
| parent | 78a7fbe6d453e0355ee393465db33a1ad7d6b4d8 (diff) | |
| parent | 524dd6297c87b249803851b1a76a2eb15dea5b48 (diff) | |
Merge branch 'stable14'
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | lib/Service/IndexService.php | 11 |
4 files changed, 18 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 39ef361..3d23624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +### 1.0.3 + +- improvement: display process advancement during compareWithCurrentIndex + + ### 1.0.2 - improvement: long process while indexing should not timeout (Force Quit). @@ -1,6 +1,6 @@ app_name=fulltextsearch -project_dir=$(CURDIR)/../$(app_name) +project_dir=$(CURDIR) build_dir=$(CURDIR)/build/artifacts appstore_dir=$(build_dir)/appstore source_dir=$(build_dir)/source @@ -8,8 +8,9 @@ sign_dir=$(build_dir)/sign package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud +branch=stable14 codecov_token_dir=$(HOME)/.nextcloud/codecov_token -version+=1.0.2 +version+=1.0.3 all: appstore @@ -19,6 +20,7 @@ github-release: github-release release \ --user $(github_account) \ --repo $(app_name) \ + --target $(branch) \ --tag v$(version) \ --name "$(app_name) v$(version)" diff --git a/appinfo/info.xml b/appinfo/info.xml index 7b4be3e..3e95264 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -10,7 +10,7 @@ Core App of the full-text search framework for your Nextcloud. ]]> </description> - <version>1.0.2</version> + <version>1.0.3</version> <licence>agpl</licence> <author>Maxence Lange</author> <namespace>FullTextSearch</namespace> diff --git a/lib/Service/IndexService.php b/lib/Service/IndexService.php index d54bc24..85564cb 100644 --- a/lib/Service/IndexService.php +++ b/lib/Service/IndexService.php @@ -183,8 +183,7 @@ class IndexService { * @param IndexOptions $options * * @return IndexDocument[] - * @throws InterruptException - * @throws TickDoesNotExistException + * @throws Exception */ private function updateDocumentsWithCurrIndex( IFullTextSearchProvider $provider, array $documents, IndexOptions $options @@ -192,8 +191,14 @@ class IndexService { $currIndex = $this->getProviderIndexFromProvider($provider); $result = []; + $count = 0; foreach ($documents as $document) { - $this->updateRunnerAction('compareWithCurrentIndex'); + + if ($count % 1000 === 0) { + $this->updateRunnerAction('compareWithCurrentIndex', true); + $this->updateRunnerInfo('documentCurrent', $count); + } + $count++; $index = $currIndex->getIndex($document->getId()); if ($index === null) { |