import_remotecontrol 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTA1YzExYmQyOTQxOTM1ZDlhNTU2YTYwMTU3MGM0Mjc0ZGM1YWIwMA==
+    YmU4NTk1ODU3YzI4N2RjNTFhY2NiNjJhMGJjMjVjMTNlZDI4NDlmNQ==
   data.tar.gz: !binary |-
-    YzI4YmRjNjViOTNhYjM5NTE1MDIxMTcyMmM4OWQ0NTA1MzJkNjlkMw==
+    MzU2Mzc1MThhMjhhMmM1NmNjNTczM2JlODdlY2NiNTEzM2NmYzA3MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Nzg5NzRhMTFmZDg1N2RjNzMzOWEzNjI2MzA1MTNiNjQzZjA3NTAxOWJjNGMx
-    MTU4M2M2MTRlY2VkMDY4OWI3NGZmMTNmM2YwMmNmYTNmYjMzYTZmZGJiYzMx
-    NTc0YjM1NDYzNTU3ZmEwMjczNzQyMTAwZTAwY2M5YjQ3MTgxNTA=
+    ODQ1ZmVhMzc3N2QxYTg0MzU1M2I1Zjg3ZDc5ZjNlOTZjMGI0ODQ3Mjc3NDY4
+    NGMyOWY2NGU1MzEyN2E0N2UxYjAyMWIyYjIzM2MyNWUzZTcyNjZlMzE5ZWFj
+    Mjc5YWQ1M2EyZjZiM2VkZTM4NWM5MTRjY2ZlYjc2YjA1YmJlZDU=
   data.tar.gz: !binary |-
-    MGNjZjk0MDE2ZTAxYmU4ZTAwN2I4YWZkNDE2YzBlOWNlMjNlZjAyMmQ3ZTRj
-    MzI3NzRhNTUxYzFmYTRjNWJlNDZjOTBkZGMzMTdkMmM3YzAyMmM4NjU5MDMx
-    MTQ1YTk4NzY3ZTQ4OWQ5MTA1ODgzYmQzNzk2ZjI0ZWJhMmQ1MmY=
+    NDFmYTEwMTc1OWEzMTBhODY5NGM2OGE5MWI5NTY2ZWEzZTdkOTFjMDhkZTU5
+    OThkOWU0ODY1MTAyOWVhM2QzNGFmYzE2OTY1YzdlY2JmZGNkYjg0ZGEyMDVk
+    MWU5OTQyYmZkOGVjY2Y3YjA2MTdlZGRhOTAyNTVjNTBkMGQ0MzY=

data/lib/import_code.rb

@@ -1,4 +1,5 @@
 #encoding:utf-8
+require 'find'
 module ImportCode
   # To change this template use File | Settings | File Templates.
   attr_accessor :file_path_array
@@ -135,9 +136,12 @@ module ImportCode
     #protocol_user_code = codelist[1]
     #other_code = ""
     code = ""
+    p codelist
     1.upto(codelist.size-1).each do |index|
-      code = codelist[index] + ":"
+      code =code + codelist[index]
+      code =code + ":" unless index == codelist.size-1
     end
+    p code
     {protocol_name:protocol,code:code}
   end
 

data/lib/import_remotecontrol.rb

@@ -1,177 +1,3 @@
 #encoding:utf-8
 require 'find'
 require 'import_code'
-module ImportRemotecontrol
-	class ImportRemote
-    attr_accessor :file_path_array
-    attr_accessor :remote_code_array
-    attr_accessor :protocol_hash
-
-    DEFAULT_UNCLUDE = ["FileFormat","Remotecontroldescripe","Device","Brand","Model","Button'scounts"]
-    DEFAULT_NOIMPORT = ["FileFormat","Remotecontroldescripe","Button'scounts"]
-
-    METHOD_NAME = "method_name"
-
-    DEFAULT_CODENAME = {"机顶盒电源"=>"power","静音"=>"voice_quiet","菜单"=>"menu",
-                        "上"=>"up","下"=>"down","左"=>"left","右"=>"right",
-                        "音量+"=>'voice_up',"音量-"=>"voice_down",
-                        "频道+"=>"channel_up","频道-"=>"channel_down"}
-
-    BRAND ="Brand"
-    MODEL = "model"
-
-
-    def self.get_error_msg(error,options={})
-      ret = ""
-      ret = ret + "ClassName: import_remotecontrol gem     "
-      if options["method_name"]
-        ret = ret + "MethodName: #{options["method_name"]}     "
-      end
-      if error
-        ret = ret + "Error Msg: #{error.to_s}"
-      end
-      ret
-    end
-
-    #遍历文件夹获取全部的文件名
-		def self.getFileNames(dir_path)
-      @file_path_array = []
-      begin
-      Find.find(dir_path).each do |path|
-        if FileTest.directory?(path)
-          Dir.foreach(path) do |file_path|
-            if(file_path != "."&&file_path!= "..")
-              if FileTest.directory?("#{path}/#{file_path}")
-                self.getFileNames("#{path}/#{file_path}")
-              else
-                if(file_path.eql?("protocol"))
-                  getProtocolList("#{path}/#{file_path}")
-                else
-                  @file_path_array << {"file_path"=>"#{path}/#{file_path}","file_name"=>"#{file_path}"}
-                end
-              end
-            end
-          end
-        end
-      end
-      rescue => err
-        raise ArgumentError, get_error_msg(err,{METHOD_NAME => "getFileNames"})
-      end
-      @file_path_array
-    end
-
-
-    def self.isProcolCode?(key)
-      !DEFAULT_UNCLUDE.include?(key)
-    end
-
-    def self.isBrand?(key)
-      key.eql?("Brand")
-    end
-
-
-
-    def self.getHashRemoteCode(file_path)
-      ret = {}
-      brand = ""
-      remote_code_line = File.read(file_path)
-      remote_code_line.split("\r\n").each do |code|
-        i = code.split("=")
-        if i.count>=2
-          i[0] = "" unless i[0]
-          key = i[0].gsub(" ","")
-          key = DEFAULT_CODENAME[key] if DEFAULT_CODENAME.has_key?(key)
-          if isBrand?(key)
-            brand = i[1]
-          end
-          if i
-            if i[0]
-              if(i[0].split(",").count > 1)
-                key = i[0].split(",")[1]
-                unless isProcolCode?(key)
-                  ret.merge!({key => i[1]})  unless DEFAULT_NOIMPORT.include?(key)
-                else
-                  codehash = disposeProtocolCode(i[1],brand)
-                  ret.merge!({key=>codehash}) unless DEFAULT_NOIMPORT.include?(key)
-                end
-              else
-                ret.merge!({key=>i[1]}) unless DEFAULT_NOIMPORT.include?(key)
-              end
-            end
-          end
-        end
-      end
-      ret
-    end
-
-    def self.getProtocolList(file_path)
-      @protocol_hash = {}
-      protocol_lines = File.read(file_path)
-      protocol_lines.split("\n").each do |protocol_line|
-        protocol = protocol_line.split(":")
-        if(@protocol_hash.has_key?(protocol[0]))
-          @protocol_hash["#{protocol[0]}"].merge!({protocol[1]=>protocol[2]}) if protocol[2]!=nil&&protocol[2]!=""
-        else
-          @protocol_hash["#{protocol[0]}"] = {protocol[1]=>protocol[2]} if protocol[2]!=nil&&protocol[2]!=""
-        end
-      end
-      @protocol_hash
-    end
-
-
-    def self.disposeProtocolCode(codes,brand)
-      protocol = ""
-      codelist = codes.split(" ")
-      protocol_name = codelist[0]
-      if @protocol_hash[brand]
-        protocol = @protocol_hash[brand][protocol_name] if @protocol_hash[brand][protocol_name]
-      else
-      end
-      #protocol_user_code = codelist[1]
-      #other_code = ""
-      code = ""
-      1.upto(codelist.size-1).each do |index|
-        code = codelist[index] + ":"
-      end
-      {protocol_name:protocol,code:code}
-    end
-
-
-    def self.importRemoteCode(file_msg)
-      remote_code_hash = {}
-      begin
-        if file_msg
-          file_path = nil
-          file_path = file_msg["file_path"]
-          file_name = nil
-          file_name = file_msg["file_name"]
-          if file_path
-              remote_code_hash.merge!(getHashRemoteCode(file_path))
-          else
-
-          end
-        end
-      rescue => err
-        raise ArgumentError, get_error_msg(err,{METHOD_NAME => "importRemoteCode"})
-      end
-      remote_code_hash
-    end
-
-
-
-
-
-    def self.getRemoteCodeArray(dir_path)
-      @remote_code_array = []
-      if FileTest.directory?(dir_path)
-        filenames =  getFileNames(dir_path)
-		    filenames.each do |file_msg|
-		      @remote_code_array<<importRemoteCode(file_msg)
-		    end
-      end
-      @remote_code_array
-    end
-  end
-
-
-end

metadata

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