lib/core/util/disk.rb in nucleon-0.1.14 vs lib/core/util/disk.rb in nucleon-0.1.15

- old
+ new

@@ -4,12 +4,10 @@ class Disk #----------------------------------------------------------------------------- # Properties - @@files = {} - @@separator = false @@description = '' @@file_lock = Mutex.new @@ -26,66 +24,36 @@ return ( file_name.is_a?(Array) ? file_name.join(::File::SEPARATOR) : file_name.to_s ) end #--- - def self.open(file_name, options = {}, reset = false) - mode = options[:mode].to_s - - @@separator = ( options[:separator] ? options[:separator] : false ) - @@description = ( options[:description] ? options[:description] : '' ) - - if @@files.has_key?(file_name) && ! reset - reset = true if ! mode.empty? && mode != @@files[file_name][:mode] - end - - @@file_lock.synchronize do - if ! @@files.has_key?(file_name) || ! @@files[file_name][:file] || reset - @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file] - unless mode.empty? || ( mode == 'r' && ! ::File.exists?(file_name) ) - @@files[file_name] = { - :file => ::File.open(file_name, mode), - :mode => mode, - } - end - end - end - return nil unless @@files[file_name] - return @@files[file_name][:file] - end - - #--- - def self.read(file_name, options = {}) result = nil options[:mode] = ( options[:mode] ? options[:mode] : 'r' ) - file = open(file_name, options) - if file - @@file_lock.synchronize do - file.pos = 0 if options[:mode] == 'r' - result = file.read + @@file_lock.synchronize do + begin + if file = ::File.open(file_name, options[:mode]) + result = file.read + file.close + end + rescue # TODO: Only catch error if file is not found. end end return result end #--- def self.write(file_name, data, options = {}) + result = nil options[:mode] = ( options[:mode] ? options[:mode] : 'w' ) - file = open(file_name, options) - result = nil - - if file - @@file_lock.synchronize do - file.pos = 0 if options[:mode] == 'w' + + @@file_lock.synchronize do + if file = ::File.open(file_name, options[:mode]) result = file.write(data) - begin - file.flush - rescue # In case the file is already closed - end + file.close end end return result end @@ -101,32 +69,16 @@ #--- def self.log(data, options = {}) reset = ( options[:file_name] || options[:mode] ) - file = open(( options[:file_name] ? options[:file_name] : 'log.txt' ), options, reset) - if file - @@file_lock.synchronize do + + @@file_lock.synchronize do + if file = ::File.open(( options[:file_name] ? options[:file_name] : 'log.txt' ), options[:mode]) file.write("--------------------------------------\n") if @@separator file.write("#{@@description}\n") if @@description file.write("#{data}\n") - end - end - end - - #--- - - def self.close(file_names = []) - file_names = @@files.keys unless file_names && ! file_names.empty? - - unless file_names.is_a?(Array) - file_names = [ file_names ] - end - - file_names.each do |file_name| - @@file_lock.synchronize do - @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file] - @@files.delete(file_name) + file.close end end end end end