navilocal 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb824d3e18e7b2d37ced625268b37279a9768668db6b5b82e6c9f01bbbac3f11
-  data.tar.gz: fc3305d12b85df4c2d12cfdfd9fb79f7d500422f6ccd44aca7e3f2092b6dbb90
+  metadata.gz: 05a368e02f1bf323efd91ff2956334a344455f0aac36397e7f800fbdb81f1477
+  data.tar.gz: 2271622784a65fa90b8516dcbc22c310ff42947f839a017fcc41e41cd33b0fc4
 SHA512:
-  metadata.gz: 89b2a9ac7a0174d934cde92eec53896b0066dfaf91184d2d8373e9597cda32991ddb572f68a5abf89ee8f26259c24813a1ec68c24af213877401c17133cd4e22
-  data.tar.gz: 42ae809aa71c91248d371fe778969ca53d1c9ea7dcbe062e5da7cc083b817572d285fbbc53ffee03dfbcba72af069c349368c532159ef56d09e2acf30c030f29
+  metadata.gz: be1a74153f046cb2fd3152ac5b6192ebab4a9cb0d760d93f5c46ece94139ace561d72f1edf411f24971b0701ffd14ddf091176f4bb64db16904b969681f779bd
+  data.tar.gz: b624cc703a79d06c6acac23da9a8451697fe0217d05b0907e0f3f7a1da6facf6228fdfcf68a6424f76383f9f2681c2c372b6f4fa805c7931db77b8156d047a4f

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, :common_words_file, :wikipedia_topic_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, :logout].freeze
 
     PRIORITIES = ['high', 'medium', 'normal', 'low'].freeze
 

data/application/ui/navi/account_configuration.rb

@@ -3,10 +3,11 @@ module NaviClientInstaller
   class AccountConfiguration
     attr_accessor :window_ui
     include CommonFunctions
+    attr_accessor :next_btn
 
 
 
-    def initialize(settings, next_btn)
+    def initialize(settings, next_btn=nil)
       builder = Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/account_configuration.ui')
       css_provider = Gtk::CssProvider.new
       css_provider.load(:resource_path => '/com/navi/navi-client/css/main.css')
@@ -16,6 +17,9 @@ module NaviClientInstaller
       @combo_text_provider = builder.get_object("combo_text_ac_provider")
       @entry_email = builder.get_object("entry_email")
       @entry_password = builder.get_object("entry_password")
+      @next_btn = next_btn.nil? ?  builder.get_object("btn_change") : next_btn
+      @next_btn.visible = true
+
       # @settings = settings
       #
       @entry_email.set_text settings.username unless settings.username.nil?
@@ -26,6 +30,8 @@ module NaviClientInstaller
         @combo_text_provider.set_active item.path.to_s.to_i if (item.get_value 1) == settings.provider
       end
 
+      prepare_ui @next_btn
+
 
       view_info = builder.get_object("view_info")
 
@@ -35,17 +41,17 @@ module NaviClientInstaller
 
       @combo_text_provider.signal_connect "changed" do |widget|
         settings.provider = widget.active_iter.get_value(1)
-        prepare_ui next_btn
+        prepare_ui @next_btn
       end
 
       @entry_password.signal_connect "changed" do |widget|
         settings.password= widget.text
-        prepare_ui next_btn
+        prepare_ui @next_btn
       end
 
       @entry_email.signal_connect "changed" do |widget|
         settings.username = widget.text
-        prepare_ui next_btn
+        prepare_ui @next_btn
       end
 
       white  = Gdk::RGBA::new(1, 1, 1, 1.0)
@@ -61,7 +67,7 @@ module NaviClientInstaller
 
     def prepare_ui(nxt_btn, prev_btn = nil)
       valid = !@entry_email.text.empty? && !@entry_password.text.empty? && !@combo_text_provider.active_iter.get_value(1).nil?
-      nxt_btn.set_sensitive valid
+      nxt_btn&.set_sensitive valid
     end
   end
 end

data/application/ui/navi/agreement.rb

@@ -24,8 +24,8 @@ module NaviClientInstaller
       @rb_ac_agree.set_active(values.agreement == true)
 
       @rb_ac_agree.signal_connect("toggled") {|button|
-        btn_next.set_sensitive(button.active?)
-        values.agreement = button.active?
+        btn_next&.set_sensitive(button.active?)
+        values&.agreement = button.active?
       }
 
       agreementTextContent = Gio::Resources.lookup_data("/com/navi/navi-client/texts/agreement_main_content.html", 0)

data/application/ui/navi/installer_assistant.rb

@@ -26,12 +26,14 @@ module NaviClientInstaller
 
       css_provider = Gtk::CssProvider.new
       css_provider.load(:resource_path => '/com/navi/navi-client/css/main.css')
+      init_menus application
 
       @settings = NaviClientInstaller::Settings.new
       @settings.load_from_file_yaml(NaviClientInstaller::Settings::DEFAULT_STORAGE + '/config.yml')
       @settings.creation_datetime = Time.now.to_s if @settings.creation_datetime.nil?
 
       @splash = NaviClientInstaller::SplashWindow.new @settings
+      @application = application
       main_stack.add_named(@splash.window_ui, "splash")
 
       # setupMainApp
@@ -72,33 +74,86 @@ module NaviClientInstaller
     end
 
     def setupMainApp()
+      @runner_window = NaviClientInstaller::NaviRunner.new @settings, @application
+      main_stack.add_named(@runner_window.window_ui, "runner_main")
+      @signup_gauss = Proc.new do |token, *args|
+        if @settings.logout
+
+          main_stack.remove @runner_window.window_ui
+          @runner_window = NaviClientInstaller::NaviRunner.new @settings, @application
+          main_stack.add_named(@runner_window.window_ui, "runner_main")
+          @runner_window.set_logout_action @logout_control, @application
+        end
 
-      @runner_window = NaviClientInstaller::NaviRunner.new @settings
-      main_stack.add_named(@runner_window.window_ui, "signup")
-
-      resp = @splash.validate_email( @settings.username, @settings.hash)
-
-      if(resp && @settings.hash && resp.code == 200)
+        @settings.logout = false
+        @settings.save_settings
         @current_window = @runner_window
-        @runner_window.set_token resp["access_token"]
+        @runner_window.set_token token
+        main_stack.set_transition_type(Gtk::Stack::TransitionType::SLIDE_RIGHT)
+        main_stack.set_visible_child(@current_window.window_ui)
+
         @runner_window.start
-        endSplash
-        # main_stack.set_visible_child(@splash.window_ui)
+      end
 
-      else
-        Thread.new do
-          # duration for the splash screen
-          gaussian = Proc.new do |token, *args|
-            # @current_window.prepare_ui btn_next, btn_back
-            @current_window = @runner_window
-            @runner_window.set_token token
-            main_stack.set_transition_type(Gtk::Stack::TransitionType::SLIDE_RIGHT)
-            main_stack.set_visible_child(@current_window.window_ui)
-            @runner_window.start
+
+      @logout_control = Proc.new do |arg|
+        # @current_window.prepare_ui btn_next, btn_back
+        #
+        main_stack.remove (@step_account_configuration.window_ui) if @step_account_configuration
+
+        @step_account_configuration = NaviClientInstaller::AccountConfiguration.new @settings
+
+        @step_account_configuration.next_btn.signal_connect 'clicked' do |button|
+
+          @settings.save_settings
+          main_stack.set_visible_child(@splash.window_ui)
+          # @initiate_login.call
+          @splash.initiate_signup @signup_gauss, @logout_control
+        end
+
+        main_stack.add_named(@step_account_configuration.window_ui, "account_configuration")
+
+
+        @current_window = @step_account_configuration
+
+        main_stack.set_transition_type(Gtk::Stack::TransitionType::SLIDE_RIGHT)
+
+        main_stack.set_visible_child(@current_window.window_ui)
+
+      end
+
+      @runner_window.set_logout_action @logout_control, @application
+
+      @initiate_login = Proc.new do |arg|
+        # main_stack.remove (@runner_window.window_ui) if @runner_window
+
+
+        resp = @splash.validate_email( @settings.username, @settings.hash)
+
+        if(resp && @settings.hash && resp.code == 200)
+          @settings.logout = false
+          @settings.save_settings
+          @current_window = @runner_window
+          @runner_window.set_token resp["access_token"]
+          @runner_window.start
+          endSplash
+          # main_stack.set_visible_child(@splash.window_ui)
+
+        else
+          Thread.new do
+            # duration for the splash screen
+
+            sleep 3
+            @splash.initiate_signup @signup_gauss, @logout_control
           end
-          sleep 3
-          @splash.initiate_signup gaussian
         end
+
+      end
+
+      if @settings.logout
+        @logout_control.call
+      else
+        @initiate_login.call
       end
 
     end
@@ -167,6 +222,18 @@ module NaviClientInstaller
       end
     end
 
+    def init_menus application
+      app_menu =Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/menu.ui').get_object("appmenu")
+      application.set_app_menu(app_menu)
+
+      action_quit = Gio::SimpleAction.new("quit")
+      action_quit.signal_connect("activate") do |_action, parameter|
+        application.quit
+      end
+      application.add_action(action_quit)
+      # action_logout.set_enabled false
+    end
+
   end
 
 end

data/application/ui/navi/main_runner.rb

@@ -9,7 +9,7 @@ module NaviClientInstaller
 
     include CommonFunctions
 
-    def initialize(settings, token=nil)
+    def initialize(settings, application)
       builder = Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/main/main_runner.ui')
       css_provider = Gtk::CssProvider.new
       css_provider.load(:resource_path => '/com/navi/navi-client/css/main.css')
@@ -22,16 +22,20 @@ module NaviClientInstaller
       @stop_btn = builder.get_object("process_stop_btn")
       @refresh_btn = builder.get_object("process_refresh_btn")
       @email_display = builder.get_object("email_label_holder")
+      @settings = settings
 
-      @email_display.label = settings&.username
+      @email_display.label = settings&.username if settings&.username
 
       image = builder.get_object("app_logo")
       image.set_from_resource('/com/navi/navi-client/images/navi-logo-small.png')
 
       stack = builder.get_object("app_stack")
 
+      @preferences = NaviClientInstaller::Prefs.new application
+
+      stack.add_titled(@preferences.window_ui, "Settings", "Settings")
+
       @settings = settings
-      @token = token
       apply_css @window_ui, css_provider
 
       @iter_log = @log_display.buffer.get_iter_at(:offset => 0)
@@ -49,6 +53,7 @@ module NaviClientInstaller
         @notifier.label = "Terminated.."
       end
 
+
       @refresh_btn.signal_connect 'clicked' do |button|
         restart_process
       end
@@ -59,8 +64,34 @@ module NaviClientInstaller
 
     end
 
+    def set_logout_action logout_control, application
+      @action_logout = Gio::SimpleAction.new("logout")
+      @action_logout.signal_connect("activate") do |_action, parameter|
+        terminate_worker_thread
+        logout_control.call
+        @action_logout.set_enabled false
+      end
+
+
+      application.add_action(@action_logout)
+      @preferences.logout_btn.signal_connect 'clicked' do |button|
+        @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
+      end
+
+      @action_logout.set_enabled false
+    end
+
 
     def start
+      @action_logout.set_enabled true
+
       @worker_thread = Thread.new do
         @spinner_indicator.active = true
         @refresh_btn.sensitive = true
@@ -98,6 +129,8 @@ module NaviClientInstaller
       @logger = CustomLogger.new @log_display.buffer, @iter_log, @client.logger
       @client.override_logger @logger
 
+      new_emails = false
+
       #logging to loggly
       logToLoggly = false
       if logToLoggly
@@ -129,6 +162,7 @@ module NaviClientInstaller
           total = @imap.uid_search(['ALL']).size
           downloaded = @client.getMessageUUIds("#{@settings.download_path}#{@settings.username}/meta/").size
           downloaded = downloaded - 2 if downloaded > 1
+          downloaded = [downloaded, total].min
 
           @email_indicator.label = "#{downloaded}/#{total}"
 
@@ -137,7 +171,7 @@ module NaviClientInstaller
           @notifier.label = "Checking for previous failures.."
 
           start_naviai
-          @client.parse_prev_failed_emails
+          new_emails = @client.parse_prev_failed_emails
           stop_naviai
           @notifier.label = "Fetching emails..."
           @client.retrieve_emails(@imap, ['ALL'], folder) do |mail, index, isLast, id|
@@ -146,6 +180,7 @@ module NaviClientInstaller
 
             filenames << @client.process_email(mail, id)
             downloaded+=1
+            downloaded = [downloaded, total].min
             @email_indicator.label = "#{downloaded}/#{total}"
 
             @logger.debug "Processing Complete. OK..."
@@ -171,6 +206,7 @@ module NaviClientInstaller
 
                 dateEnded = DateTime.now
                 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)})
                 @logger.debug "#{index + 1} emails from the #{folder} has been downloaded. OK"
@@ -184,7 +220,7 @@ module NaviClientInstaller
 
           @notifier.label = "Finalizing..."
 
-          @client.initate_csv_generation(@settings.username)
+          @client.initate_csv_generation(@settings.username) if new_emails
 
           callback = Proc.new do |mail, index, id, complete|
             # complete = args.first || false
@@ -197,6 +233,7 @@ module NaviClientInstaller
               @logger.debug "processing email##{index + 1} with id #{mail.__id__.to_s} and uuid #{id}"
               total+=1
             end
+            downloaded = [downloaded, total].min
             @email_indicator.label = "#{downloaded}/#{total}"
 
           end

data/application/ui/navi/prefs.rb

@@ -0,0 +1,32 @@
+require 'yaml'
+require_relative '../../lib/common_functions'
+
+module NaviClientInstaller
+  class Prefs
+
+    include CommonFunctions
+
+    attr_accessor :logout_btn
+    attr_accessor :window_ui
+
+    def initialize application
+      builder = Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/prefs.ui')
+      css_provider = Gtk::CssProvider.new
+      css_provider.load(:resource_path => '/com/navi/navi-client/css/main.css')
+      @window_ui = builder.get_object("box_prefs")
+
+      @logout_btn = builder.get_object("logout_btn")
+      close_btn = builder.get_object("close_btn")
+
+      close_btn.signal_connect 'clicked' do |button|
+        application&.quit
+      end
+
+
+
+    end
+
+
+  end
+
+end

data/application/ui/navi/splash.rb

@@ -46,45 +46,60 @@ module NaviClientInstaller
       end
     end
 
-    def initiate_signup callback
+    def initiate_signup callback, back_callback=nil
+
 
       login_info = @builder.get_object("view_splash_info")
-      @spinner = @builder.get_object("spinner_splash_loader")
-      @error_label = @builder.get_object("label_splash_error")
+      spinner = @builder.get_object("spinner_splash_loader")
+      error_label = @builder.get_object("label_splash_error")
       # @spinner.active = true
 
       email_entry = @builder.get_object("entry_splash_email")
-      @password_entry = @builder.get_object("entry_splash_pass")
-      @signup_control = @builder.get_object("box_splash_login")
-      email_entry.set_text @settings.username
-
-      @password_entry.signal_connect("activate") {|widget|
-        unless widget.text.empty?
-          @spinner.active = true
-          @password_entry.sensitive = false
+      password_entry = @builder.get_object("entry_splash_pass")
+      back_btn = @builder.get_object("back")
 
+      email_entry.set_text @settings.username
+      password_entry.set_text ""
+
+      if login_info.buffer.text.to_s.empty?
+        back_btn.signal_connect("clicked") {|widget|
+          back_callback&.call
+        }
+
+        password_entry.signal_connect("activate") {|widget|
+          unless widget.text.empty?
+            spinner.active = true
+            password_entry.sensitive = false
+
+            response = validate_email @settings.username, widget.text
+
+            spinner.active = false
+            password_entry.sensitive = true
+
+            if response && response.code == 200
+              error_label.set_opacity 0
+              @settings.hash = widget.text
+              @settings.save_settings
+              callback.call response["access_token"]
+            else
+              error_label.set_opacity 1
+            end
+          end
+        }
 
-          response = validate_email @settings.username, widget.text
+        create_tags(login_info.buffer)
+        login_info.buffer.insert(login_info.buffer.get_iter_at(:offset => 0), "We need you to connect to our app. Please sign in. If you donot have the account already, please sign up first.",
+                                 :tags => %w(double_spaced_line large))
 
-          @spinner.active = false
-          @password_entry.sensitive = true
+      end
 
-          if response && response.code == 200
-            @error_label.set_opacity 0
-            @settings.hash = widget.text
-            @settings.save_settings
-            callback.call response["access_token"]
-          else
-            @error_label.set_opacity 1
-          end
-        end
-      }
 
-      create_tags(login_info.buffer)
-      login_info.buffer.insert(login_info.buffer.get_iter_at(:offset => 0), "We need you to connect to our app. Please sign in. If you donot have the account already, please sign up first.",
-                               :tags => %w(double_spaced_line large))
+      show_signup
+    end
 
-      @signup_control.visible = true
+    def show_signup
+      @signup_control = @builder.get_object("box_splash_login")
+      @signup_control&.visible = true
     end
 
     def add_timeout

data/bin/navilocal

@@ -17,15 +17,15 @@ resource_bin = File.join(application_root_path, 'gresource.bin')
 
 # the commented block below is required to generate resources folder or update if any changes
 
-# resource_xml = File.join(application_root_path, 'resources', 'gresources.xml')
-# # # Build the binary
-# system("glib-compile-resources",
-#        "--target", resource_bin,
-#        "--sourcedir", File.dirname(resource_xml),
-#        resource_xml)
-#
-#
-#
+resource_xml = File.join(application_root_path, 'resources', 'gresources.xml')
+# # Build the binary
+system("glib-compile-resources",
+       "--target", resource_bin,
+       "--sourcedir", File.dirname(resource_xml),
+       resource_xml)
+
+
+
 resource = Gio::Resource.load(resource_bin)
 Gio::Resources.register(resource)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Msanjib
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,7 @@ files:
 - application/ui/navi/installer_assistant.rb
 - application/ui/navi/main_runner.rb
 - application/ui/navi/navi_install.rb
+- application/ui/navi/prefs.rb
 - application/ui/navi/splash.rb
 - bin/navilocal
 - gresource.bin