da_funk 3.28.1 → 3.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311e4bb5dbb5ecdb3a478dd44abf39209723de9dc7fd5e5fa9d0cc862d164392
-  data.tar.gz: 708e6b4ad318d18bc9f5b5e46a5fd3a6132f82f36550aa77f715f901d13cbf33
+  metadata.gz: b4d0d54c5c119b8292581b762890e56ac8236cfaba00da8a7771b7cbd7bb4e86
+  data.tar.gz: 010a769cea5606eb804a641d1608ee0eb26ee9284d987606b4654fde8a7c4dcf
 SHA512:
-  metadata.gz: 67ddb6cbebcbe026dddc91bd4eb4eadbdb0a5e8a3f1d24f83677afbcc2249ab78ff2847618770492e0fa8223d771df9d3f8aa00708be1431f8255fd3d677ee4a
-  data.tar.gz: ded4f9f7947ca0423b946426bc7a1a440b88ecfa499acfd0f3f9e05c61c369c690f25511d6c1b3bb1b6008679722d88aaef8ee7378aea62abaef2a744f177c56
+  metadata.gz: b395196c638fc69b56609d90eb1e460b1db746eca86d641964c7efb38106a154ba303aa4aa49b9e01134ea8658930630516fd7959a657d208f3787674ec145d1
+  data.tar.gz: c8f3818542777f7b5c2338913a6fe760a6f81532640a6b7e79e712f6ed76297f1c813071b4a5beb987b4c3830e023741ae84844811439e26423bb26e3e08f05c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.28.1)
+    da_funk (3.28.2)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 3.28.2 - 2020-10-07
+
+- Added support of params.dat file restore if it was corrupted;
+- Wait 3 seconds before restart after main update;
+- Fixed method_missing exception;
+
 ### 3.28.1 - 2020-09-26
 
 - Close socket in case of ssl exceptions;

data/lib/da_funk/params_dat.rb

@@ -5,7 +5,7 @@ module DaFunk
     include DaFunk::Helper
 
     class << self
-      attr_accessor :file, :apps, :valid, :files
+      attr_accessor :file, :apps, :valid, :files, :checksum
     end
 
     self.apps = Array.new
@@ -20,9 +20,19 @@ module DaFunk
     end
 
     def self.setup
+      @checksum = calculate_checksum
       @file = FileDb.new(FILE_NAME)
     end
 
+    def self.calculate_checksum
+      Device::Crypto.crc16_hex(File.read(FILE_NAME)) if exists?
+    end
+
+    def self.corrupted?
+      return true unless exists?
+      @checksum != calculate_checksum
+    end
+
     def self.exists?
       File.exists?(FILE_NAME)
     end
@@ -153,6 +163,7 @@ module DaFunk
       Device::Display.clear
       if File.exists?('./shared/init_reboot.bmp')
         Device::Display.print_bitmap('./shared/init_reboot.bmp')
+        getc(3000)
       else
         I18n.pt(:admin_main_update_message)
         3.times do |i|

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.28.1"
+  VERSION="3.28.2"
 end
 

data/lib/device/setting.rb

@@ -152,16 +152,16 @@ class Device
 
     # Custom Attributes
     def self.tcp_recv_timeout
-      DaFunk::ParamsDat.file["tcp_recv_timeout"] || method_missing(:tcp_recv_timeout)
+      DaFunk::ParamsDat.file["tcp_recv_timeout"] || @file&.dig("tcp_recv_timeout")
     end
 
     def self.attach_gprs_timeout
-      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || method_missing(:attach_gprs_timeout))
+      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || @file&.dig("attach_gprs_timeout"))
       value.to_s.empty? ? nil : value.to_s.to_i
     end
 
     def self.heartbeat
-      DaFunk::ParamsDat.file["heartbeat"] || method_missing(:heartbeat)
+      DaFunk::ParamsDat.file["heartbeat"] || @file&.dig("heartbeat")
     end
 
     def self.logical_number

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.28.1
+  version: 3.28.2
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake