去掉vlog中的TAG

Author: coer-j-ayl

config/server_cmds

@@ -1,2 +1,5 @@
 # remote_command local_command
 # file  subl
+
+# default must
+explore xdg-open

config/server_dirs

@@ -0,0 +1 @@
+/opt/jupengfei /home/ubuntu/compile

config/server_map config/server_mapsconfig/server_map renamed to config/server_maps

@@ -1,2 +1,2 @@
 # type1:type2:typ3...   remote_command
-# txt:html:xml file
+txt:html:xml explore

core/rd.lua

@@ -1,4 +1,3 @@
-local Log     = require("log")
 local Socket  = require("lsocket")
 local CMD_PDU = require("cmd_pdu")
 local PDU     = require("pdu")

core/rd_server.lua

@@ -3,8 +3,6 @@ local Log     = require("log")
 local PDU     = require("pdu")
 local CMD_PDU = require("cmd_pdu")
 
-local LOG_TAG = "rd_server"
-
 local function get_note_cus_cmd (suffix)
     local cmd = nil
 
@@ -22,31 +20,7 @@ local function get_note_cus_cmd (suffix)
 end
 
 local function get_note_sys_cmd (suffix)
-    local file_type, file_cmd
-
-    local type_file = io.popen("assoc ." .. suffix, "r")
-    if (type_file ~= nil) then
-        local msg = type_file:read("*l")
-
-        file_type = msg and string.match(msg, "=%a+")
-        type_file:close()
-    end
-
-    if (file_type ~= nil) then
-        local cmd_file = io.popen("ftype " .. string.sub(file_type, 2), "r")
-        if (cmd_file ~= nil) then
-            local msg = cmd_file:read("*l")
-
-            file_cmd = msg and string.match(msg, "=%a+")
-            cmd_file:close()
-        end
-    end
-
-    if (file_cmd ~= nil) then
-        return string.sub(file_cmd, 2)
-    else
-        return nil
-    end
+    return nil
 end
 
 local custom_remote_command = {
@@ -71,17 +45,18 @@ local custom_remote_command = {
 }
 
 local function get_mapped_cmd (cmd, cmd_args, cmd_path)
-    local remote_cmd = cmd
+    local remote_cmd = nil
 
     if (custom_remote_command[cmd] ~= nil) then
         remote_cmd = custom_remote_command[cmd](cmd, cmd_args, cmd_path)
-    else
-        for cmd, cmd_proc in pairs(server_cfg.remote_cmd_map) do
-            if (remote_cmd == cmd) then
-                remote_cmd = cmd_proc
-                break
-            end
-        end
+    end
+
+    if remote_cmd == nil then
+        remote_cmd = server_cfg.remote_cmd_map[cmd]
+    end
+
+    if remote_cmd == nil then
+       remote_cmd = cmd
     end
 
     return remote_cmd
@@ -108,11 +83,7 @@ local function get_local_command (cmd, cmd_args, cmd_path)
 
     cmd_args = string.gsub(cmd_args, "\\", "/")
     cmd_path = string.gsub(cmd_path, "\\", "/")
-    ext_command = " & "
-
-    target_cmd = server_cfg.remote_cmd_map[cmd]
-    target_cmd = target_cmd or cmd
-    target_cmd = target_cmd.." "..cmd_args
+    target_cmd = cmd.." "..cmd_args
 
     if (cmd_path and #cmd_path > 0) then
          target_cmd = "cd "..cmd_path..";"..target_cmd.." & "
@@ -159,7 +130,7 @@ local function handle_client (socket)
             end
         end
     else
-        Log.e(LOG_TAG, "rd_server receive illegal message")
+        Log.e("rd_server receive illegal message")
     end
 end
 
@@ -169,7 +140,7 @@ dofile(cur_path .. "/core/config.lua")
 
 local server_socket = Socket.server(GLOBAL_CONFIG.server_ip, GLOBAL_CONFIG.server_port)
 if (server_socket == nil) then
-    Log.e(LOG_TAG, "rd_server create failed")
+    Log.e("rd_server create failed")
     return
 end
 

core/server_params.lua

@@ -4,12 +4,16 @@ local function parse_server (path)
 
     local line = f:read("*line")
     while line ~= nil do
-        local temp = {}
-        string.gsub(line, "[^ ]+", function (w)
-            table.insert(temp, w)
-        end)
+	local temp = {}
+
+        for w in string.gmatch(line, "%g+") do
+	    table.insert(temp, w)
+	end
+
+	if #temp >= 2 and temp[1] ~= "#" then
+            result[temp[1]] = temp[2]
+	end
 
-        result[tmep[0]] = temp[1]
         line = f:read("*line")
     end
 
@@ -22,8 +26,8 @@ local cmds = cur_path .. "/config/server_cmds"
 local maps = cur_path .. "/config/server_maps"
 
 server_cfg = {
-    ["remote_cmd_map"]      = parse_server(cmds),    -- offer avalable commands
-    ["share_directory_map"] = parse_server(dirs),    -- map remoteDir to LocalDir
+    ["remote_cmd_map"]      = parse_server(cmds),  -- offer avalable commands
+    ["share_directory_map"] = parse_server(dirs),  -- map remoteDir to LocalDir
 }
 
 local function parse_file_type (path)
@@ -33,9 +37,9 @@ local function parse_file_type (path)
 
     for k, v in pairs(map) do
         result[k] = remote_cmds[v]
-    do
+    end
 
     return result
 end
 
-server_cfg["file_type_map"] = parse_file_type(maps)  -- map fileType to Commands
+server_cfg["file_type_map"] = parse_file_type(maps)  -- map fileType to Commands

lib/liblog.so

@@ -18,26 +18,26 @@
 
 local vlog = require("liblog")
 
-local function log_detail (tag, level, msg)
+local function log_detail (level, msg)
     local msg = level .. " " .. msg
-    vlog.log (tag, msg)
+    vlog.log (msg)
 end
 
 local Log = {}
-function Log.d (tag, msg)
-    log_detail (tag, "DEBUG", msg)
+function Log.d (msg)
+    log_detail ("DEBUG", msg)
 end
 
-function Log.i (tag, msg)
-    log_detail (tag, "INFO", msg)
+function Log.i (msg)
+    log_detail ("INFO", msg)
 end
 
-function Log.e (tag, msg)
-    log_detail (tag, "ERROR", msg)
+function Log.e (msg)
+    log_detail ("ERROR", msg)
 end
 
-function Log.v (tag, msg)
-    log_detail (tag, "VERBOSE", msg)
+function Log.v (msg)
+    log_detail ("VERBOSE", msg)
 end
 
-return Log
+return Log