Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2025-08-02 19:05:32 -04:00
Code Issues Projects Releases Wiki Activity

Better method naming in DirEntry

Browse Source
This commit is contained in:
Alex Ling 2022-05-22 04:20:14 +00:00
parent 82c60ccc1d
commit 872e6dc6d6
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/library/dir_entry.cr
View File

@ -98,7 +98,7 @@ class DirEntry < Entry
def examine : Bool def examine : Bool
existence = File.exists? @dir_path existence = File.exists? @dir_path
return false unless existence return false unless existence
files = DirEntry.get_valid_files @dir_path files = DirEntry.image_files @dir_path
signature = Dir.directory_entry_signature @dir_path signature = Dir.directory_entry_signature @dir_path
existence = files.size > 0 && @signature == signature existence = files.size > 0 && @signature == signature
@sorted_files = nil unless existence @sorted_files = nil unless existence
@ -111,30 +111,25 @@ class DirEntry < Entry
def sorted_files def sorted_files
cached_sorted_files = @sorted_files cached_sorted_files = @sorted_files
return cached_sorted_files if cached_sorted_files return cached_sorted_files if cached_sorted_files
@sorted_files = DirEntry.get_valid_files_sorted @dir_path @sorted_files = DirEntry.sorted_image_files @dir_path
@sorted_files.not_nil! @sorted_files.not_nil!
end end
def self.image_files(dir_path)
Dir.entries(dir_path)
.reject(&.starts_with? ".")
.map { |fn| File.join dir_path, fn }
.select { |fn| is_supported_image_file fn }
.reject { |fn| File.directory? fn }
.select { |fn| File.readable? fn }
end
def self.sorted_image_files(dir_path)
self.image_files(dir_path)
.sort { |a, b| compare_numerically a, b }
end
def self.validate_directory_entry(dir_path) def self.validate_directory_entry(dir_path)
files = DirEntry.get_valid_files dir_path image_files(dir_path).size > 0
files.size > 0
end
def self.get_valid_files(dir_path)
files = [] of String
Dir.entries(dir_path).each do |fn|
next if fn.starts_with? "."
path = File.join dir_path, fn
next unless is_supported_image_file path
next if File.directory? path
next unless File.readable? path
files << path
end
files
end
def self.get_valid_files_sorted(dir_path)
files = DirEntry.get_valid_files dir_path
files.sort! { |a, b| compare_numerically a, b }
end end
end end

2
src/util/signature.cr
View File

@ -84,7 +84,7 @@ class Dir
return cache[dirname + "?entry"] if cache[dirname + "?entry"]? return cache[dirname + "?entry"] if cache[dirname + "?entry"]?
Fiber.yield Fiber.yield
signatures = [] of String signatures = [] of String
image_files = DirEntry.get_valid_files_sorted dirname image_files = DirEntry.sorted_image_files dirname
if image_files.size > 0 if image_files.size > 0
image_files.each do |path| image_files.each do |path|
signatures << File.signature(path).to_s signatures << File.signature(path).to_s