diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 413f34e..989797b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -24,4 +24,26 @@ class ApplicationController < ActionController::Base return @config end + def file_directory(dir) + @current_dir = dir + dir_list = `ls #{@current_dir} -l` + parsing_list = dir_list.split("\n") + @files = Array.new + file = Hash.new + + @total_list = parsing_list[0] + for t in 1..(parsing_list.length-1) + parsing_file = parsing_list[t].split(" ") + file["auth"] = parsing_file[0] + file["size"] = parsing_file[4] + file["date"] = parsing_file[5] + " " + parsing_file[6] + " " + parsing_file[7] + file["name"] = parsing_file[8] + @files << file + file = Hash.new + end + puts @files + return @files + end + + end diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb index 167354c..9a87794 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/volume_controller.rb @@ -39,27 +39,7 @@ class VolumeController < ApplicationController end - def file_directory(dir) - @current_dir = dir - dir_list = `ls #{@current_dir} -l` - parsing_list = dir_list.split("\n") - @files = Array.new - file = Hash.new - - @total_list = parsing_list[0] - for t in 1..(parsing_list.length-1) - parsing_file = parsing_list[t].split(" ") - file["auth"] = parsing_file[0] - file["size"] = parsing_file[4] - file["date"] = parsing_file[5] + " " + parsing_file[6] + " " + parsing_file[7] - file["name"] = parsing_file[8] - @files << file - file = Hash.new - end - puts @files - return @files - end - + def checkDir files = file_directory(params[:path]) render :json => {:file => files , :current => @current_dir}