navilocal 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d414157c1ba844642c5fa5fa57f71e0178a213f42f5c0a1b793d7182761f7e
-  data.tar.gz: cc3ec0775db2a854e634e0e241634d62d8b7bd3b0a97d0fb85f2e62459f1a29d
+  metadata.gz: 5bcf59a597cb852b806c79df3c602297018d306d1b977909c4059bd551507095
+  data.tar.gz: d8373fdb539bb5d9413ffd8be1aed18fcd4159c6ca8585d0e0684599cf07b3d5
 SHA512:
-  metadata.gz: 24c88c04b34e71ede3c766030a3bad7fbbfc2338b73b6d6c6bfaba7d80549908b3b12adcf5b129c2a22447c21afb4b42a2a9e3271f4659fb4646382b764b50c3
-  data.tar.gz: bed76f2a0d23071ab8b3929f650a25d0ac895fd7a266cfd4e3e24b3b0f332891ac027288aeb58c3167a57a36fff7c1b4b42d4f822f57e6e3f56735f2df09423b
+  metadata.gz: 88b31f39f535dcda3fa9cce6106492a59e67abdbe281dd817893bf00e0201d3df3931e685c7b86c7b07061eacc5148b1004afb6ba3563e6f74b8c736093876c2
+  data.tar.gz: af952607c446527216c8d3699293d7fea8642eab20db784dd321683661b21267017c1abdf4e8ad34ae3cb672010f2edad46d570da09ec76dbc5eaa07bb3eaa3b

data/application/models/settings.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module NaviClientInstaller
   class Settings
-    PROPERTIES = [:provider, :username, :password, :agreement, :location, :creation_datetime, :last_modified, :download_path, :install, :hash, :client_log_file, :training_data_file, :ai_log_file].freeze
+    PROPERTIES = [:provider, :username, :password, :agreement, :location, :creation_datetime, :last_modified, :download_path, :install, :hash, :client_log_file, :common_words_file, :wikipedia_topic_file, :ai_log_file].freeze
 
     PRIORITIES = ['high', 'medium', 'normal', 'low'].freeze
 

data/application/ui/navi/main_runner.rb

@@ -185,8 +185,6 @@ module NaviClientInstaller
           @imap.disconnect
 
         rescue => e
-          @imap&.logout
-          @imap&.disconnect
           @logger.debug "#{e.message}"
         end
 

data/application/ui/navi/navi_install.rb

@@ -57,7 +57,8 @@ module NaviClientInstaller
       @settings.download_path = File.join(@settings.location, 'downloads', '')
       @settings.client_log_file = File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE, 'logs', 'client.log')
       @settings.ai_log_file = File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE, 'logs', 'ai.log')
-      @settings.training_data_file = File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE, 'WIKI-models', '')
+      @settings.common_words_file = File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE, 'common-words')
+      @settings.wikipedia_topic_file = File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE, 'wikipedia-titles')
       @settings.save_settings
       prev_btn.set_opacity 0
       prev_btn.set_sensitive false
@@ -71,8 +72,10 @@ module NaviClientInstaller
       Thread.new do
         read_logs
         configure_ai
-        install_mitie
-        download_wiki_models
+        download_wiki_topics
+        download_wiki_common_words
+        # install_mitie
+        # download_wiki_models
         finalize
       end
 
@@ -106,41 +109,48 @@ module NaviClientInstaller
     end
 
 
-    def install_mitie()
-      @text_display.set_text "Installing mitie..."
+    def download_wiki_topics
+      @text_display.set_text "Downloading wikipedia titles.."
       @limit_progress = @progress_indicator.fraction + @fraction
-      if %x(uname).gsub(/\s+/, "") == 'Darwin'
-        @log_display.buffer.insert_markup(@iter_log, "Installing mitie...\n")
-        %x(brew  install mitie  2>&1 | tee #{@log_storage})
-        # sleep 3
-        append_logs
+      @log_display.buffer.insert_markup(@iter_log, "Downloading wikipedia titles..\n")
 
-        @log_display.buffer.insert_markup(@iter_log, "Finished Updating Home brew...\n")
+      wiki_storage = File.expand_path File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE,'wikipedia-titles')
 
+      unless File.file?(wiki_storage)
+        download_url = "https://s3.amazonaws.com/locallockbox/wikipedia-titles.zip"
+        # wiki_url = "https://s3.amazonaws.com/locallockbox/WIKI-models.zip"
+        #
+        %x(rm -rf #{wiki_storage}*)
+
+        %x(curl -o #{wiki_storage}.zip #{download_url} 2>&1 | tee #{@log_storage})
+        %x(unzip -a #{wiki_storage}.zip -d #{NaviClientInstaller::Settings::DEFAULT_STORAGE} 2>&1 | tee #{@log_storage})
+        %x(rm -rf #{wiki_storage}.zip 2>&1 | tee #{@log_storage})
       else
-        @log_display.buffer.insert_markup(@iter_log, "Mitie not installed. Install it manually...\n")
+        @log_display.buffer.insert_markup(@iter_log, "Wikipedia titles already downloaded.\n")
       end
+
       @progress_indicator.fraction = @limit_progress
+
     end
 
-    def download_wiki_models
-      @text_display.set_text "Downloading wiki models.."
+    def download_wiki_common_words
+      @text_display.set_text "Downloading common words.."
       @limit_progress = @progress_indicator.fraction + @fraction
-      @log_display.buffer.insert_markup(@iter_log, "Downloading wiki models\n")
+      @log_display.buffer.insert_markup(@iter_log, "Downloading common words..\n")
 
-      models_storage = File.expand_path File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE,'WIKI-models')
+      common_storage = File.expand_path File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE,'common-words')
 
-      unless File.directory?(models_storage)
-        wiki_url = "https://s3.amazonaws.com/locallockbox/naviaiDarwin.zip"
+      unless File.file?(common_storage)
+        download_url = "https://s3.amazonaws.com/locallockbox/common-words.zip"
         # wiki_url = "https://s3.amazonaws.com/locallockbox/WIKI-models.zip"
         #
-        %x(rm -rf #{models_storage}*)
+        %x(rm -rf #{common_storage}*)
 
-        %x(curl -o #{models_storage}.zip #{wiki_url} 2>&1 | tee #{@log_storage})
-        %x(unzip -a #{models_storage}.zip -d #{NaviClientInstaller::Settings::DEFAULT_STORAGE} 2>&1 | tee #{@log_storage})
-        %x(rm -rf #{models_storage}.zip 2>&1 | tee #{@log_storage})
+        %x(curl -o #{common_storage}.zip #{download_url} 2>&1 | tee #{@log_storage})
+        %x(unzip -a #{common_storage}.zip -d #{NaviClientInstaller::Settings::DEFAULT_STORAGE} 2>&1 | tee #{@log_storage})
+        %x(rm -rf #{common_storage}.zip 2>&1 | tee #{@log_storage})
       else
-        @log_display.buffer.insert_markup(@iter_log, "Wiki models already downloaded.\n")
+        @log_display.buffer.insert_markup(@iter_log, "Wikipedia titles already downloaded.\n")
       end
 
 
@@ -195,6 +205,7 @@ module NaviClientInstaller
 
     def finalize
       setup_navi_path
+      %x(rm -rf #{@log_storage}*) if File.file? @log_storage
       @next.set_sensitive true
       @next.set_label "Finish"
       @install = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Msanjib
@@ -42,16 +42,16 @@ dependencies:
   name: navi_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement