0.6.5

7 files changed, 37 insertions, 15 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abb634e..9c8026f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
-*v0.6.4**
+**v0.6.5**
+- Optimized Index/Extract/Commit
+- complete debug information while indexing
+- better nextant:optimize
+- live queueID is now unique and generated on-the-fly, fixing an issue when more than one cloud is running on the same server.
+- File Filters (#58)
+- fixed home link (#60)
+- search suggestion in public link (#59)
+
+
+**v0.6.4**
 - better error and debug information
 - bugfixes
  
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2debf9f..ad9da94 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -40,7 +40,7 @@
 
 
 	</description>
-	<version>0.6.4</version>
+	<version>0.6.5</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<types>
diff --git a/appinfo/register_command.php b/appinfo/register_command.php
index e4771fe..f689d0c 100644
--- a/appinfo/register_command.php
+++ b/appinfo/register_command.php
@@ -29,7 +29,7 @@ $c = $app->getContainer();
 
 $application->add(new OCA\Nextant\Command\Check($c->query('SolrService'), $c->query('SolrToolsService'), $c->query('SolrAdminService')));
 $application->add(new OCA\Nextant\Command\Clear($c->query('ConfigService'), $c->query('SolrService'), $c->query('SolrAdminService')));
-$application->add(new OCA\Nextant\Command\Index(OC::$server->getUserManager(), $c->query('RootFolder'), $c->query('IndexService'), $c->query('QueueService'), $c->query('SolrService'), $c->query('SolrAdminService'), $c->query('ConfigService'), $c->query('FileService'), $c->query('BookmarkService'), $c->query('MiscService')));
+$application->add(new OCA\Nextant\Command\Index(OC::$server->getUserManager(), $c->query('RootFolder'), $c->query('IndexService'), $c->query('QueueService'), $c->query('SolrService'), $c->query('SolrToolsService'), $c->query('SolrAdminService'), $c->query('ConfigService'), $c->query('FileService'), $c->query('BookmarkService'), $c->query('MiscService')));
 $application->add(new OCA\Nextant\Command\Optimize($c->query('ConfigService'), $c->query('SolrService'), $c->query('SolrToolsService')));
 $application->add(new OCA\Nextant\Command\Live($c->query('QueueService'), $c->query('IndexService'), $c->query('SolrService'), $c->query('SolrToolsService'), $c->query('ConfigService'), $c->query('FileService'), $c->query('BookmarkService'), $c->query('MiscService')));
 
diff --git a/js/settings.admin.js b/js/settings.admin.js
index ebe171b..1ea1344 100644
--- a/js/settings.admin.js
+++ b/js/settings.admin.js
@@ -213,8 +213,10 @@ $(document)
 										'disabled', false);
 								$('#nextant_help_link').unbind('click');
 								$('#nextant_suboptions').fadeTo(delay, 1);
-								$('#solr_index_live_queuekey').prop('disabled', true);
-								$('#solr_index_live_queuekey').fadeTo(delay, 0.85);
+								$('#solr_index_live_queuekey').prop('disabled',
+										true);
+								$('#solr_index_live_queuekey').fadeTo(delay,
+										0.85);
 							} else {
 								$('#nextant_suboptions :input').attr(
 										"disabled", true);
@@ -319,15 +321,17 @@ $(document)
 							if (response.configured == 0) {
 								$('#solr_current_docs').text(
 										'Nextant is not configured yet');
+								$('#solr_current_segments').text('');
 								$('#nextant_force_index').hide(delay);
 								$('#nextant_index_scheduled').hide(delay);
 								$('#nextant_first_index').hide(delay);
 								$('#nextant_index_scheduled').hide(delay);
 								$('#nextant_index_inprogress').hide(delay);
-							} else if (response.solr_ping == 'false')
+							} else if (response.solr_ping == 'false') {
 								$('#solr_current_docs').text(
 										'Solr Core is down');
-							else {
+								$('#solr_current_segments').text('');
+							} else {
 								if (response.index_locked > 0) {
 									$('#nextant_first_index').hide(delay);
 									$('#nextant_index_scheduled').hide(delay);
@@ -349,10 +353,12 @@ $(document)
 									$('#nextant_force_index').show(delay);
 									$('#nextant_index_inprogress').hide(delay);
 								}
-								if (response.current_docs > 0)
+								if (response.current_docs > 0) {
 									$('#solr_current_docs').text(
 											response.current_docs);
-								else
+									$('#solr_current_segments').text(
+											response.current_segments);
+								} else
 									$('#solr_current_docs').text('none');
 							}
 						},
diff --git a/lib/Command/Check.php b/lib/Command/Check.php
index c9c89fa..5111727 100644
--- a/lib/Command/Check.php
+++ b/lib/Command/Check.php
@@ -87,8 +87,7 @@ class Check extends Base
         $output->writeln(' - ' . $this->solrTools->count('files') . ' files');
         $output->writeln(' - ' . $this->solrTools->count('bookmarks') . ' bookmarks');
         
-        $infos = $this->solrTools->getInfoCore();
-        $output->writeln(' - ' . $infos->index->segmentCount . ' segments');
+        $output->writeln(' - ' .  $this->solrTools->getInfoCore()->index->segmentCount . ' segments');
     }
 }
 
diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 8ffd31c..d9bafe8 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -52,6 +52,8 @@ class Index extends Base
 
     private $solrService;
 
+    private $solrTools;
+
     private $solrAdmin;
 
     private $configService;
@@ -64,8 +66,7 @@ class Index extends Base
 
     private $currentIndexStatus = array();
 
-
-    public function __construct(IUserManager $userManager, $rootFolder, $indexService, $queueService, $solrService, $solrAdmin, $configService, $fileService, $bookmarkService, $miscService)
+    public function __construct(IUserManager $userManager, $rootFolder, $indexService, $queueService, $solrService, $solrTools, $solrAdmin, $configService, $fileService, $bookmarkService, $miscService)
     {
         parent::__construct();
         $this->userManager = $userManager;
@@ -73,6 +74,7 @@ class Index extends Base
         $this->indexService = $indexService;
         $this->queueService = $queueService;
         $this->solrService = $solrService;
+        $this->solrTools = $solrTools;
         $this->solrAdmin = $solrAdmin;
         $this->configService = $configService;
         $this->fileService = $fileService;
@@ -211,7 +213,8 @@ class Index extends Base
         $this->configService->setAppValue('configured', '1');
         
         $output->writeln('');
-        $output->writeln('Indexing took ' . $this->indexService->getIndexDuration() . 's.');
+        $output->writeln('Indexing took ' . $this->indexService->getIndexDuration());
+        $output->writeln('You index now contains ' . $this->solrTools->getInfoCore()->index->segmentCount . ' segments');
     }
 
     /**
diff --git a/lib/Service/IndexService.php b/lib/Service/IndexService.php
index ad845d9..4bb1492 100644
--- a/lib/Service/IndexService.php
+++ b/lib/Service/IndexService.php
@@ -303,6 +303,7 @@ class IndexService
         if ($progress != null) {
             $progress->setMessage('', 'jvm');
             $progress->setMessage('', 'infos');
+            $progress->setMessage('', 'duration');
             $progress->finish();
         }
         
@@ -422,6 +423,7 @@ class IndexService
         if ($progress != null) {
             $progress->setMessage('', 'jvm');
             $progress->setMessage('', 'infos');
+            $progress->setMessage('', 'duration');
             $progress->finish();
         }
         
@@ -527,6 +529,7 @@ class IndexService
         if ($progress != null) {
             $progress->setMessage('', 'jvm');
             $progress->setMessage('', 'infos');
+            $progress->setMessage('', 'duration');
             $progress->finish();
         }
         
@@ -579,6 +582,7 @@ class IndexService
         if ($progress != null) {
             $progress->setMessage('', 'jvm');
             $progress->setMessage('', 'infos');
+            $progress->setMessage('', 'duration');
             $progress->finish();
         }
     }
@@ -708,6 +712,7 @@ class IndexService
             if ($progress != null) {
                 $progress->setMessage('', 'jvm');
                 $progress->setMessage('', 'infos');
+                $progress->setMessage('', 'duration');
                 $progress->finish();
             }
             
@@ -729,7 +734,6 @@ class IndexService
         
         if ($this->output != null && $this->debug) {
             $this->output->writeln('');
-            $this->output->writeln('');
             if ($ierror->getCode() > 0)
                 $this->output->writeln('*** Error #' . $ierror->getCode() . ' (' . $ierror->getMessage() . ')');
             $this->output->writeln('*** ' . $message);