import_remotecontrol 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI0OWJkNjhhMjc0OTIyYjVhY2M0YjE0ODg3NDU2YTY4YWJmYjQzNQ==
+    OTI2YjM0YmYxMjdlY2VhMDFhNWQ5NjE3YTFhOTlmNzZkMzNlY2IzOQ==
   data.tar.gz: !binary |-
-    ZGZkMDI5OTEzOTg4MDdmY2Y5ZTIxZDFkYmZkZGY4MDI3YzA5MjZjNw==
+    MTgwZTI5OGZiNmJiMWIzYTFiOGUwOGIwZmFmMzZhYmI5MWU3ZjI3YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWI5ZjRlMjEyZjM1YzM3MmZkMDlkY2I0Y2JiZGIzYjU2ODY5OWU1ZGVjMjg5
-    ZWQ5YjgxMjkzYTM5NDAyMGI4MjM0OGI2MTM4Yzg5NGM5MDgxZjE4YWQ1NDlk
-    ZWMxMWRmMmE5YWFjMDY5YTFiMjA1NmRmMGQwYjQ2MmUwY2IxY2Q=
+    ZTg2ZTM4MGY0MWQwMDAwZDZkMTg4MGQzM2MwZjljMTEzMDIyNzljNTEyYzM2
+    YzFlNGEyMzZhZmEwNTkwODUxMzY0YTgyMjYxYzViNzAxOTgxZjRjODk4ODZk
+    ODM4MTk4MWIxOTNhYjU2NTc0MzUzZjVhNmRhODFmYzlhODM5OGM=
   data.tar.gz: !binary |-
-    MzM0NDkwMmU2NDcwYjkxMDIwZmNmNWM1MmZjMjI5MTI4MjI4ZDA0OGUyYzMz
-    YjQ1Y2M3MDM5ZTAzNzljY2RhZGQ4N2VmNWUyZTBiZDg3MTAzMDA3ZDYwNzBh
-    YWQ0NTc5MTRlYjc2YWQ4NGJmYjQyN2IxNDBlZWExMWU4MGY2OWE=
+    ZDhmZGM0OTFlMDk5OWRlZmM1MmYyOTU3YWNhYjg2ZGQzOTA3MTZjOGI3ZTgz
+    NTJlN2VjNDgzNDQxOTQ5NWFhMGQxNjA1MjRjZmE3MzU2NTM0MzUzYzgwMTJh
+    MGE4ZDg4NWU1OWFkNWVmZjFiMjQ4NDdmZTc3NmJiMTMwNDI4MDE=

data/lib/import_code.rb

@@ -76,9 +76,38 @@ module ImportCode
     rescue => err
       raise ArgumentError, get_error_msg(err,{METHOD_NAME => "getFileNames"})
     end
+    p "File_path: #{@file_path_array}"
     @file_path_array
   end
 
+  def self.getFileNames(dir_path)
+    file_path_array = []
+    allre= []
+    begin
+      Dir.foreach(dir_path).each do |path|
+        allre << path
+      end
+      allre.each do |file_name|
+        full_file_name = dir_path + "/" + file_name
+        unless file_name == "."||file_name == ".."
+          if File.directory?(full_file_name)
+            fileNames = getFileNames(full_file_name)
+            if fileNames.count>0
+              file_path_array = file_path_array + fileNames
+            end
+          elsif(file_name.eql?("protocol"))
+            getProtocolList(full_file_name)
+          else
+            file_path_array << {"file_path"=>full_file_name,"file_name"=>file_name}
+          end
+        end
+      end
+    rescue => err
+      raise ArgumentError, get_error_msg(err,{METHOD_NAME => "getFileNames"})
+    end
+    file_path_array
+  end
+
   #判断是否是按键编码对应的KEY
   def self.isProcolCode?(key)
     !DEFAULT_UNCLUDE.include?(key)
@@ -265,18 +294,19 @@ module ImportCode
 
 
 
-
-  #获取遥控编码数组
   def self.getRemoteCodeArray(dir_path)
     @remote_code_array = []
     @statistics = {}
     if FileTest.directory?(dir_path)
       filenames =  getFileNames(dir_path)
       filenames.each do |file_msg|
-        @statistics={}
+        p "File_Path : #{file_msg["file_path"]}"
+        @statistics = {}
         @remote_code_array<<importRemoteCode(file_msg)
       end
     end
     @remote_code_array
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: import_remotecontrol
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - zql