From dfca5652dc49943fb3afacc55db974864ebab974 Mon Sep 17 00:00:00 2001 From: h-osawa Date: Thu, 22 Jun 2023 14:33:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?r=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04.ls/ls.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/04.ls/ls.rb b/04.ls/ls.rb index 1611d61491..b1b3e4f771 100755 --- a/04.ls/ls.rb +++ b/04.ls/ls.rb @@ -43,6 +43,7 @@ def output(files, option, max_filename_length, files_status, total_block) def make_files option = parse_option files = create_file_list(make_absolute_path).compact.sort + files = files.reverse if option[:r] if option[:l] files_stat = create_files_stat(files) total_block = calc_total_block(files_stat) @@ -60,6 +61,7 @@ def parse_option option = {} opt = OptionParser.new opt.on('-l') + opt.on('-r') opt.parse!(ARGV, into: option) option end From 868b5211d56b574ebb0a914f3bfbc256f9a51175 Mon Sep 17 00:00:00 2001 From: h-osawa Date: Thu, 22 Jun 2023 14:35:43 +0900 Subject: [PATCH 2/4] =?UTF-8?q?a=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04.ls/ls.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/04.ls/ls.rb b/04.ls/ls.rb index b1b3e4f771..2c7ec6d162 100755 --- a/04.ls/ls.rb +++ b/04.ls/ls.rb @@ -42,7 +42,7 @@ def output(files, option, max_filename_length, files_status, total_block) def make_files option = parse_option - files = create_file_list(make_absolute_path).compact.sort + files = create_file_list(option, make_absolute_path).compact.sort files = files.reverse if option[:r] if option[:l] files_stat = create_files_stat(files) @@ -62,6 +62,7 @@ def parse_option opt = OptionParser.new opt.on('-l') opt.on('-r') + opt.on('-a') opt.parse!(ARGV, into: option) option end @@ -70,9 +71,9 @@ def make_absolute_path File.expand_path(ARGV[0] || '.') end -def create_file_list(absolute_path) +def create_file_list(option, absolute_path) Dir.chdir(absolute_path) - Dir.glob('*').map.to_a + option[:a] ? Dir.glob('*', File::FNM_DOTMATCH).map.to_a : Dir.glob('*').map.to_a end def align_files(sorted_files) From 2304ca9416b5076a51c1201e7a73352d903292aa Mon Sep 17 00:00:00 2001 From: h-osawa Date: Wed, 28 Jun 2023 11:19:57 +0900 Subject: [PATCH 3/4] =?UTF-8?q?create=5Ffile=5Flist=E3=81=AE=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=ABr=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04.ls/ls.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/04.ls/ls.rb b/04.ls/ls.rb index 2c7ec6d162..b45cc7b226 100755 --- a/04.ls/ls.rb +++ b/04.ls/ls.rb @@ -42,8 +42,7 @@ def output(files, option, max_filename_length, files_status, total_block) def make_files option = parse_option - files = create_file_list(option, make_absolute_path).compact.sort - files = files.reverse if option[:r] + files = create_file_list(option, make_absolute_path) if option[:l] files_stat = create_files_stat(files) total_block = calc_total_block(files_stat) @@ -73,7 +72,9 @@ def make_absolute_path def create_file_list(option, absolute_path) Dir.chdir(absolute_path) - option[:a] ? Dir.glob('*', File::FNM_DOTMATCH).map.to_a : Dir.glob('*').map.to_a + file_list = option[:a] ? Dir.glob('*', File::FNM_DOTMATCH).map.to_a : Dir.glob('*').map.to_a + file_list = file_list.reverse if option[:r] + file_list end def align_files(sorted_files) From 01ee727c927a7693d38e7b57f48011e7619dfc31 Mon Sep 17 00:00:00 2001 From: h-osawa Date: Fri, 30 Jun 2023 09:19:38 +0900 Subject: [PATCH 4/4] =?UTF-8?q?map=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E3=81=A8to=5Fa=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04.ls/ls.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04.ls/ls.rb b/04.ls/ls.rb index b45cc7b226..1b7d756801 100755 --- a/04.ls/ls.rb +++ b/04.ls/ls.rb @@ -72,7 +72,7 @@ def make_absolute_path def create_file_list(option, absolute_path) Dir.chdir(absolute_path) - file_list = option[:a] ? Dir.glob('*', File::FNM_DOTMATCH).map.to_a : Dir.glob('*').map.to_a + file_list = option[:a] ? Dir.glob('*', File::FNM_DOTMATCH) : Dir.glob('*') file_list = file_list.reverse if option[:r] file_list end