navilocal 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6575cdbb5a600420d301caeecfe2bf46db5ed45670d31178961939ac52da0ed7
-  data.tar.gz: 757578ef7d44ae686c2aeb54c4536eb13f02eb923cbe3fb5b05a78ff4dff7516
+  metadata.gz: 861dbe709ba809a68edc0946987309c0a205ff16ae38b14192087915cd3e8551
+  data.tar.gz: 7da2bff65c99dc4ddde05a193df385d6743cd00b2e37f3c7ebcd952b0d3c802f
 SHA512:
-  metadata.gz: 87e23ffc790f52696b1f28afb844be7f3b71df42601f75bc04ba5afae3ec2810b896ce75a56293f9b20e15b9e53ed26858420ce0cceec07d92ff5c90a4408182
-  data.tar.gz: d2de279fddaab157e496a3ccd2e46337bd98c2d42bd073eb3e3f93581d1164ddc3f1d7eb0aee3b5af9ff8b40ca6db77208ac2e7aa933f9ac71ea0b828da9330d
+  metadata.gz: 5c9012fa20266028a1e174139d02030fac27c45aa961902f3668d7cbab5485089f665db0157d0f03df0f7f79d93ea5c628eaf4e57cf606f251ddaebe9abd2383
+  data.tar.gz: f218689d97637462e139ab3164ee21bc0d82a6da9261d811b28068f0f9d8e551ed670dffdbd5852bb5c8736a8088de876b01cde262e1e05e1acba79d665147a3

data/application/models/settings.rb

@@ -55,6 +55,32 @@ module NaviClientInstaller
       # raise ArgumentError, "Failed to load existing item: #{e.message}"
     end
 
+    def self.remove_downloaded_ai
+      %x(rm -rf #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai*)
+    end
+
+    def self.download_ai log_storage = NaviClientInstaller::Settings::DEFAULT_STORAGE + '/screen.log'
+      downloaded = false
+      unless File.file?(File.expand_path File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE,'bin', 'naviai'))
+        %x(rm -rf #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai*)
+
+
+        url= %x(uname).gsub(/\s+/, "") == 'Darwin' ? "https://s3.amazonaws.com/locallockbox/naviaiDarwin.zip" : "https://s3.amazonaws.com/locallockbox/naviai.zip"
+        FileUtils.mkdir_p(NaviClientInstaller::Settings::DEFAULT_STORAGE + '/bin')
+        # @replace_string = true
+        %x(curl -o #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip #{url} 2>&1 | tee #{log_storage})
+        # @replace_string = false
+
+        %x(unzip -a #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip -d #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/ 2>&1 | tee #{log_storage})
+        %x(chmod 777 #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai)
+        %x(rm -rf #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip 2>&1 | tee #{log_storage})
+
+        downloaded = true
+
+      end
+      return downloaded
+    end
+
     # Resolves if an item is new
     def is_new?
       !File.exists? @filename

data/application/ui/navi/main_runner.rb

@@ -74,6 +74,15 @@ module NaviClientInstaller
         terminate_worker_thread
       }
 
+      @preferences.update_btn.signal_connect 'clicked' do |button|
+
+        terminate_worker_thread
+        stack.set_visible_child stack.get_child_by_name('page1')
+        NaviClientInstaller::Settings::remove_downloaded_ai
+
+        restart_process false
+      end
+
     end
 
     def set_logout_action logout_control, application
@@ -106,6 +115,8 @@ module NaviClientInstaller
         @action_logout.set_enabled false
       end
 
+
+
       @action_logout.set_enabled false
     end
 
@@ -141,6 +152,14 @@ module NaviClientInstaller
 
     end
 
+    def download_ai
+      @logger.debug "Checking and Updating Navi services."
+      downloaded = NaviClientInstaller::Settings::download_ai
+      if downloaded
+        @logger.debug "Navi services updated.."
+      end
+    end
+
     def start_fetching
 
       @logger = CustomLogger.new @log_display.buffer, @iter_log
@@ -149,6 +168,8 @@ module NaviClientInstaller
 
       begin
 
+        download_ai
+
         if @settings.method == "imap"
           @client = NaviEmailSync::ImapApi.new @settings.method
           @logger.set_custom_logger @client.logger

data/application/ui/navi/navi_install.rb

@@ -86,24 +86,14 @@ module NaviClientInstaller
       @text_display.set_text "Configuring services..."
       @log_display.buffer.insert_markup(@iter_log, "Configuring services..\n")
 
-      unless File.file?(File.expand_path File.join(NaviClientInstaller::Settings::DEFAULT_STORAGE,'bin', 'naviai'))
-        %x(rm -rf #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai*)
+      new_ai_downloaded = NaviClientInstaller::Settings.download_ai @log_storage
 
-
-        url= %x(uname).gsub(/\s+/, "") == 'Darwin' ? "https://s3.amazonaws.com/locallockbox/naviaiDarwin.zip" : "https://s3.amazonaws.com/locallockbox/naviai.zip"
-        FileUtils.mkdir_p(NaviClientInstaller::Settings::DEFAULT_STORAGE + '/bin')
-        # @replace_string = true
-        %x(curl -o #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip #{url} 2>&1 | tee #{@log_storage})
-        # @replace_string = false
-
-        %x(unzip -a #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip -d #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/ 2>&1 | tee #{@log_storage})
-        %x(chmod 777 #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai)
-        %x(rm -rf #{NaviClientInstaller::Settings::DEFAULT_STORAGE}/bin/naviai.zip 2>&1 | tee #{@log_storage})
-
-        @log_display.buffer.insert_markup(@iter_log, "Done Configuring processes..\n")
+      if new_ai_downloaded
+        @log_display.buffer.insert_markup(@iter_log, "Done Configuring services..\n")
       else
-        @log_display.buffer.insert_markup(@iter_log, "Ai already installed...forwarding to the next step\n")
+        @log_display.buffer.insert_markup(@iter_log, "Services already installed...forwarding to the next step\n")
       end
+
       @progress_indicator.fraction = @limit_progress
 
     end

data/application/ui/navi/prefs.rb

@@ -7,6 +7,7 @@ module NaviClientInstaller
     include CommonFunctions
 
     attr_accessor :logout_btn
+    attr_accessor :update_btn
     attr_accessor :window_ui
 
     def initialize application
@@ -22,7 +23,7 @@ module NaviClientInstaller
         application&.quit
       end
 
-
+      @update_btn = builder.get_object("updateai_btn")
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Msanjib