rbzk 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1290a1fd6cc12310c5471f045a47e0c8d5b598326d7e5db899bde02ec6bc96ee
-  data.tar.gz: 172c829144c8aa97e998c19803d5d19fd9d379f38c93170295f149f4a163c2c0
+  metadata.gz: 30de1318989db7b9f80b389d3ca68436938ac0a05b19946e605f852bff717cb1
+  data.tar.gz: c9eb7a35862c70f94a9b7e35ad0ca61866c073de69bb8b9f06f84cb2737c22bc
 SHA512:
-  metadata.gz: 4ee4a5a83b9f129158ea253868b4033d6c0013360d67fe05ba7518a67c6baaf971eeaf764ef447638a0e029a927524ccc51e7871ef0c22ea89b98d3608579542
-  data.tar.gz: 75af5b6ac2c57fe3e0dce24be118ac1fc69cb941d8d78bb8d706da6913ddcc9cf36e669c12e2f114c366eded3be18da5e3bec956e071657250a0812acf57810d
+  metadata.gz: b9fa15daacc07d2b86b931ea453f16f4d29071bc760d2cd888a464a02b5281f90ceb855c29a2ec5a4eafaec6a0df5129163d4ef5c4c8c6739be08aa92d8121ca
+  data.tar.gz: 381807e8e37f62cf560dd61f3e6798d1727f4911df14454d59163c9894e6ca4df99b4cf499fcb2f85eddf9f5c7ad13ee2f34f70d647f25d2419ac98e1813ed03

data/lib/rbzk/cli/commands.rb

@@ -63,7 +63,7 @@ module RBZK
             table = ::Terminal::Table.new do |t|
               t.title = 'Device Information'
               device_info.each do |key, value|
-                t << [key, value]
+                t << [ key, value ]
               end
             end
 
@@ -108,28 +108,28 @@ module RBZK
       map 'logs-today' => 'logs'
 
       def logs_today(ip = nil)
-        invoke :logs, [ip], { today: true }.merge(options)
+        invoke :logs, [ ip ], { today: true }.merge(options)
       end
 
       desc 'logs-yesterday [IP]', "Get yesterday's attendance logs"
       map 'logs-yesterday' => 'logs'
 
       def logs_yesterday(ip = nil)
-        invoke :logs, [ip], { yesterday: true }.merge(options)
+        invoke :logs, [ ip ], { yesterday: true }.merge(options)
       end
 
       desc 'logs-week [IP]', "Get this week's attendance logs"
       map 'logs-week' => 'logs'
 
       def logs_week(ip = nil)
-        invoke :logs, [ip], { week: true }.merge(options)
+        invoke :logs, [ ip ], { week: true }.merge(options)
       end
 
       desc 'logs-month [IP]', "Get this month's attendance logs"
       map 'logs-month' => 'logs'
 
       def logs_month(ip = nil)
-        invoke :logs, [ip], { month: true }.merge(options)
+        invoke :logs, [ ip ], { month: true }.merge(options)
       end
 
       desc 'logs-all [IP]', 'Get all attendance logs without limit'
@@ -153,7 +153,7 @@ module RBZK
               # Pretty table output
               table = ::Terminal::Table.new do |t|
                 t.title = 'All Attendance Logs (Showing All Records)'
-                t.headings = ['UID', 'User ID', 'Time', 'Status', 'Punch Type']
+                t.headings = [ 'UID', 'User ID', 'Time', 'Status', 'Punch Type' ]
 
                 # Show all logs in the table
                 logs.each do |log|
@@ -185,7 +185,7 @@ module RBZK
       def logs_custom(start_date, end_date, ip = nil)
         # Use IP from options if not provided as argument
         ip ||= options[:ip] || @config['ip']
-        invoke :logs, [ip], { start_date: start_date, end_date: end_date }.merge(options)
+        invoke :logs, [ ip ], { start_date: start_date, end_date: end_date }.merge(options)
       end
 
       desc 'logs [IP]', 'Get attendance logs'
@@ -298,7 +298,7 @@ module RBZK
               # Pretty table output
               table = ::Terminal::Table.new do |t|
                 t.title = title || 'Attendance Logs'
-                t.headings = ['UID', 'User ID', 'Time', 'Status', 'Punch Type']
+                t.headings = [ 'UID', 'User ID', 'Time', 'Status', 'Punch Type' ]
 
                 # Show logs in the table based on limit
                 display_logs.each do |log|
@@ -427,17 +427,38 @@ module RBZK
         with_connection(ip, options) do |conn|
           puts 'Adding/updating user...'
 
-          result = conn.set_user(
-            uid: options[:uid],
-            name: options[:name] || '',
-            privilege: options[:privilege] || 0,
-            password: options[:password] || '',
-            group_id: options[:group_id] || '',
-            user_id: options[:user_id] || '',
-            card: options[:card] || 0
-          )
-
-          puts '✓ User added/updated successfully!' if result
+          # Disable device for exclusive access during modification
+          begin
+            puts '✓ Disabling device...'
+            conn.disable_device
+          rescue StandardError
+            nil
+          end
+
+          begin
+            result = conn.set_user(
+              uid: options[:uid],
+              name: options[:name] || '',
+              privilege: options[:privilege] || 0,
+              password: options[:password] || '',
+              group_id: options[:group_id] || '',
+              user_id: options[:user_id] || '',
+              card: options[:card] || 0
+            )
+            puts '✓ User added/updated successfully!' if result
+          rescue RBZK::ZKError => e
+            # Reraise to let the with_connection handler print device messages
+            raise e
+          ensure
+            # Re-enable device after modification (always)
+            begin
+              puts '✓ Re-enabling device...'
+              conn.enable_device
+            rescue StandardError => e
+              # Do not raise - just log a warning if verbose
+              puts "Warning: failed to re-enable device: #{e.message}" if options[:verbose]
+            end
+          end
         end
       end
 
@@ -487,7 +508,7 @@ module RBZK
             # Use Terminal::Table for pretty output
             table = ::Terminal::Table.new do |t|
               t.title = 'Fingerprint Templates'
-              t.headings = ['UID', 'Finger ID', 'Valid', 'Size']
+              t.headings = [ 'UID', 'Finger ID', 'Valid', 'Size' ]
 
               templates.each do |template|
                 t << [
@@ -527,10 +548,9 @@ module RBZK
 
           # Extract parameters from options
           uid = options[:uid] || 0
-          user_id = options[:user_id] || ''
           finger_id = options[:finger_id] || 0
 
-          template = conn.get_user_template(uid: uid, temp_id: finger_id, user_id: user_id)
+          template = conn.get_user_template(uid, finger_id)
 
           if template
             puts '✓ Found fingerprint template:'
@@ -645,6 +665,34 @@ module RBZK
         end
       end
 
+      desc 'enable-device [IP]', 'Enable the device'
+      map 'enable-device' => :enable_device
+
+      def enable_device(ip = nil)
+        # Use IP from options if not provided as argument
+        ip ||= options[:ip] || @config['ip']
+
+        with_connection(ip, options) do |conn|
+          puts 'Enabling device...'
+          result = conn.enable_device
+          puts '✓ Device enabled successfully!' if result
+        end
+      end
+
+      desc 'disable-device [IP]', 'Disable the device'
+      map 'disable-device' => :disable_device
+
+      def disable_device(ip = nil)
+        # Use IP from options if not provided as argument
+        ip ||= options[:ip] || @config['ip']
+
+        with_connection(ip, options) do |conn|
+          puts 'Disabling device...'
+          result = conn.disable_device
+          puts '✓ Device disabled successfully!' if result
+        end
+      end
+
       desc 'poweroff [IP]', 'Power off the device'
 
       def poweroff(ip = nil)
@@ -743,6 +791,8 @@ module RBZK
         rescue RBZK::ZKNetworkError => e
           puts "✗ Network Error: #{e.message}"
           puts 'Please check the IP address and ensure the device is reachable.'
+        rescue RBZK::ZKErrorExists => e
+          puts "✗ Device Error: #{e.message}"
         rescue RBZK::ZKErrorResponse => e
           puts "✗ Device Error: #{e.message}"
           puts 'The device returned an error response.'
@@ -771,7 +821,7 @@ module RBZK
           # Use Terminal::Table for pretty output
           table = ::Terminal::Table.new do |t|
             t.title = 'Users'
-            t.headings = ['UID', 'User ID', 'Name', 'Privilege', 'Password', 'Group ID', 'Card']
+            t.headings = [ 'UID', 'User ID', 'Name', 'Privilege', 'Password', 'Group ID', 'Card' ]
 
             users.each do |user|
               t << [
@@ -815,11 +865,10 @@ module RBZK
 
       def format_privilege(privilege)
         case privilege
-        when 0 then 'User'
-        when 1 then 'Enroller'
-        when 2 then 'Manager'
-        when 3 then 'Administrator'
-        when 14 then 'Super Admin'
+        when RBZK::Constants::USER_DEFAULT then 'User'
+        when RBZK::Constants::USER_ENROLLER then 'Enroller'
+        when RBZK::Constants::USER_MANAGER then 'Manager'
+        when RBZK::Constants::USER_ADMIN then 'Admin'
         else "Unknown (#{privilege})"
         end
       end

data/lib/rbzk/exceptions.rb

@@ -20,4 +20,10 @@ module RBZK
       super
     end
   end
+
+  class ZKErrorExists < ZKError
+    def initialize(msg = 'Data already exists')
+      super
+    end
+  end
 end

data/lib/rbzk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBZK
-  VERSION = '0.1.7'
+  VERSION = '0.1.9'
 end