navilocal 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20947b2bd4ecfd18dce0f3ac9a0c01fb8e13563b4a0c5d075ddf1aa04bbf2b6
-  data.tar.gz: a137c27598d2282309bc5ddbe5d3e0d451ae76e96046dd843c5a176e03427242
+  metadata.gz: 223602614811ebf611613e5443045e790288bae8de501b2b711470e04d340715
+  data.tar.gz: '0096e6ce6bde4b267a643159c9b7bf1c946f12b34084c2f08ed424f41625a71f'
 SHA512:
-  metadata.gz: 45a09a0e3ae7d106fd533e4395fd4fb8bdb8c332b86f55dd8c8eecec7edb19afd7672cfc974f64345ca9d788488d6fb05b796fbef6aec4547f36ca56a78cb207
-  data.tar.gz: 54c1a1185942ee28d3e727c73164f3300b71ebd27c2ed9573683b57fa4ee0857b58cf3ee3f32a615f7a013c897caf75ae2a09ffe2e0f20e5103e465465a28d99
+  metadata.gz: 3159051407ce0afa9a42a00568fb4bff3520024cc96301c56ffc661e1737ac926dbdbb5e77539e666ca7477ba67d40a8a1941836e789610230114a42753707a6
+  data.tar.gz: b2900d824e9e50e64f8f7452a73d5c06d9da2b7dffc0d814f54547f1426701ed5e8bde3a93acd8360d17f47b7fff3aba360de8146ea3b0695973c3a55e34f18a

data/application/models/settings.rb

@@ -3,19 +3,12 @@ require 'json'
 
 module NaviClientInstaller
   class Settings
-    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, :logout].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, :logout, :env].freeze
 
     PRIORITIES = ['high', 'medium', 'normal', 'low'].freeze
 
     DEFAULT_STORAGE = File.expand_path File.join('~', '.navi')
 
-    SSO_URL = "https://signin.navihq.com"
-    # SSO_URL = "http://localhost:3008"
-    # GENERATE_CSV_URL = "http://localhost:3020/v2/generate_csv_input"
-    GENERATE_CSV_URL = "https://api2.navihq.com/v2/generate_csv_input"
-
-
-
     attr_accessor *PROPERTIES
 
     def initialize(options = {})

data/application/ui/navi/installer_assistant.rb

@@ -33,6 +33,9 @@ module NaviClientInstaller
       @settings.load_from_file_yaml(NaviClientInstaller::Settings::DEFAULT_STORAGE + '/config.yml')
       @settings.creation_datetime = Time.now.to_s if @settings.creation_datetime.nil?
 
+      @settings.env = "production" if @settings.env.nil?
+      load_env @settings.env
+
       @splash = NaviClientInstaller::SplashWindow.new @settings
       @application = application
       main_stack.add_named(@splash.window_ui, "splash")
@@ -44,6 +47,13 @@ module NaviClientInstaller
       apply_css content_box, css_provider
     end
 
+    def load_env env = 'production'
+      application_root_path = File.expand_path('../../../', __dir__)
+      envs = YAML.load_file(File.join(application_root_path, 'resources', 'texts', 'env.yml'))[env]
+      ENV['env'] = env
+      envs.each {|k,v| ENV[k] = v }
+    end
+
     def initiate_splash
       bbox_navigation.set_visible false
       main_stack.set_visible_child(@splash.window_ui)

data/application/ui/navi/main_runner.rb

@@ -23,6 +23,7 @@ module NaviClientInstaller
       @refresh_btn = builder.get_object("process_refresh_btn")
       @email_display = builder.get_object("email_label_holder")
       @settings = settings
+      stop_naviai
 
       @email_display.label = settings&.username if settings&.username
 
@@ -69,6 +70,11 @@ module NaviClientInstaller
     def set_logout_action logout_control, application
       @action_logout = Gio::SimpleAction.new("logout")
       @action_logout.signal_connect("activate") do |_action, parameter|
+        @settings.logout = true
+        @settings.username = nil
+        @settings.password = nil
+        @settings.hash = nil
+        @settings.save_settings
         terminate_worker_thread
         logout_control.call
         @action_logout.set_enabled false
@@ -122,11 +128,7 @@ module NaviClientInstaller
 
     def start_fetching
 
-      env = "development"
-      sso_web_url = NaviClientInstaller::Settings::SSO_URL
-      gen_csv_url = NaviClientInstaller::Settings::GENERATE_CSV_URL
-
-      @client = NaviClient::Local.new(sso_web_url, "local", gen_csv_url, true, env)
+      @client = NaviClient::Local.new
       @client.set_token "Token: #{@token}##{@settings.username}"
       @logger = CustomLogger.new @log_display.buffer, @iter_log, @client.logger
       @client.override_logger @logger
@@ -166,20 +168,22 @@ module NaviClientInstaller
           downloaded = [downloaded, total].min
 
           @email_indicator.label = "#{downloaded}/#{total}"
-          @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username, total_email: total, already_downloaded: downloaded})
+          @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: ENV['env'], storage: "local", email: @settings.username, total_email: total, already_downloaded: downloaded})
 
             # start_naviai
           @notifier.label = "Checking for previous failures.."
-
+          @logger.debug "Parsing previously fetched emails"
           start_naviai
           new_emails = @client.parse_prev_failed_emails
-          stop_naviai
+          @logger.debug "Complete. OK..."
+          # stop_naviai
           @notifier.label = "Fetching emails..."
+          stamp = (Time.now.to_f * 1000).to_s
           @client.retrieve_emails(@imap, ['ALL'], folder) do |mail, index, isLast, id|
 
             @logger.debug "processing email##{index + 1} with id #{mail.__id__.to_s} and uuid #{id}"
 
-            filenames << @client.process_email(mail, id)
+            filenames << @client.process_email(mail, id, stamp)
             downloaded+=1
             downloaded = [downloaded, total].min
             @email_indicator.label = "#{downloaded}/#{total}"
@@ -188,20 +192,21 @@ module NaviClientInstaller
 
             if filenames.size == 50 || isLast
               sendEmailCompletedEvent = !sendEmailCompletedEvent
+              stamp = (Time.now.to_f * 1000).to_s
 
               @logger.debug "Sending Bulk Request for #{isLast ? filenames.size : 50} emails to Navi AI."
               @notifier.label = "Parsing the emails..."
 
               start_naviai
-              @client.send_request(filenames)
-              stop_naviai
+              @client.send_request(filenames, stamp)
+              # stop_naviai
 
               @logger.debug "Complete Ok... continue email sync"
               @notifier.label = "Fetching emails..."
               # verify
               filenames = []
               if sendEmailCompletedEvent && !isLast
-                @client.logToLoggly({event:"EMAIL_SYNC_IN_PROGRESS", env: env, storage: "local", email: @settings.username, emailCount: index + 1})
+                @client.logToLoggly({event:"EMAIL_SYNC_IN_PROGRESS", env: ENV['env'], storage: "local", email: @settings.username, emailCount: index + 1})
                 # exit
               elsif isLast
 
@@ -209,7 +214,7 @@ module NaviClientInstaller
                 totalTimeInSecs = (dateEnded - dateStarted) * 24 * 60 * 60
                 new_emails = true
 
-                @client.logToLoggly({event:"EMAIL_SYNC_FINISHED", env: env, storage: "local", email: @settings.username, emailCount: index + 1, time_elapsed: totalTimeInSecs.to_f.round(2), total_email: total, already_downloaded: downloaded})
+                @client.logToLoggly({event:"EMAIL_SYNC_FINISHED", env: ENV['env'], storage: "local", email: @settings.username, emailCount: index + 1, time_elapsed: totalTimeInSecs.to_f.round(2), total_email: total, already_downloaded: downloaded})
                 @logger.debug "#{index + 1} emails from the #{folder} has been downloaded. OK"
                 @logger.debug "started: #{dateStarted.to_s} , ended: #{dateEnded.to_s}, Total time: #{totalTimeInSecs.to_f.round(2)} secs"
               end
@@ -244,7 +249,7 @@ module NaviClientInstaller
               @notifier.label = "Parsing the emails..."
               start_naviai
             else
-              stop_naviai
+              # stop_naviai
               @logger.debug "Waiting new mails (IDLE loop)..."
               @notifier.label = "Waiting for the new emails.."
             end
@@ -273,10 +278,32 @@ module NaviClientInstaller
     end
 
     def start_naviai
-      stop_naviai
-      navi_path = NaviClientInstaller::Settings::DEFAULT_STORAGE
-      system("#{navi_path}/bin/naviai &")
-      sleep 1
+
+      if(!isNaviAiUp)
+        # stop_naviai
+        navi_path = NaviClientInstaller::Settings::DEFAULT_STORAGE
+        system("#{navi_path}/bin/naviai &")
+
+        up = false
+        while ! up
+          up = isNaviAiUp
+          sleep 5
+        end
+
+      end
+
+
+    end
+
+    def isNaviAiUp
+      begin
+        # Process.kill('QUIT', File.read(navi_path).to_i)
+        up = %x(lsof -i tcp:9090 | grep naviai | awk {'print $2'})
+
+        return ! up.to_s.empty?
+      rescue
+        return false
+      end
     end
 
     def stop_naviai
@@ -285,7 +312,7 @@ module NaviClientInstaller
         # Process.kill('QUIT', File.read(navi_path).to_i)
         %x(lsof -i tcp:9090 | grep naviai | awk {'print $2'} | xargs kill -9)
       rescue
-        @logger.debug "Could not stop navi ai." unless @logger.nil?
+        @logger.debug "Could not stop navi server." unless @logger.nil?
       end
     end
 

data/application/ui/navi/splash.rb

@@ -34,7 +34,7 @@ module NaviClientInstaller
     def validate_email(email, pass)
       # need to remove this hardcoded code
       begin
-        HTTParty.post(NaviClientInstaller::Settings::SSO_URL + "/oauth/token",
+        HTTParty.post(ENV['api_url'] + "/oauth/token",
                       body: {
                           email: email, # get from sso_web application
                           password: pass,

data/resources/texts/env.yml

@@ -0,0 +1,11 @@
+development:
+  api_url: http://localhost:3020/
+  parser_url: http://localhost:9090
+
+staging:
+  api_url: http://localhost:3020
+  parser_url: http://34.214.134.104:9090
+
+production:
+  api_url: https://signin.navihq.com
+  parser_url: http://localhost:9090

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Msanjib
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - application/ui/navi/splash.rb
 - bin/navilocal
 - gresource.bin
+- resources/texts/env.yml
 homepage: http://rubygems.org/gems/navilocal
 licenses:
 - NAVI