From 451d10aed5697571014a9e09f9eaa7ec672532d3 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 3 Sep 2008 05:08:42 +0000
Subject: [PATCH] =?UTF-8?q?(=E4=BD=90=E3=80=85=E6=9C=A8@PSEG1)=20CSU?=
 =?UTF-8?q?=E3=81=AB=E5=90=AB=E3=81=BE=E3=82=8C=E3=82=8B=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E4=B8=80=E8=A6=A7=E5=87=BA=E5=8A=9B?=
 =?UTF-8?q?=E3=81=AB=E3=80=81=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=B5?=
 =?UTF-8?q?=E3=82=A4=E3=82=BA=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2382 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/tests/CustomSystemUpdater/romchecker.rb | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/build/tests/CustomSystemUpdater/romchecker.rb b/build/tests/CustomSystemUpdater/romchecker.rb
index ce724bd8..18da809c 100755
--- a/build/tests/CustomSystemUpdater/romchecker.rb
+++ b/build/tests/CustomSystemUpdater/romchecker.rb
@@ -80,14 +80,14 @@ def check_pickuped(path, print_success)
     ret
 end
 
-def add_rom_list(rom_list, code, region, version)
-    rom_list << [code, region, version]
+def add_rom_list(rom_list, code, region, version, size)
+    rom_list << [code, region, version, size]
 end
 
 def make_rom_list(target_dir, region)
     region_dir = REGION_DIRS[region][0]
     region_codes = (REGION_DIRS[region][1] + "A").unpack("A" * (REGION_DIRS[region][1].size + 1))
-    p region_codes
+    #p region_codes
     # 出力用リスト
     rom_list = []
     
@@ -96,7 +96,7 @@ def make_rom_list(target_dir, region)
             search_path = File.join(target_dir, region_dir, "#{HEADER}#{app_code}#{region_code}*.tad")
             files = Dir.glob(search_path)
             files.each{|tad|
-                add_rom_list(rom_list, "#{HEADER}#{app_code}", region_code, get_rom_version(tad))
+                add_rom_list(rom_list, "#{HEADER}#{app_code}", region_code, get_rom_version(tad), File.stat(tad).size)
             }
         }
     }
@@ -108,20 +108,21 @@ def write_rom_list(rom_list, file_name)
         "A" => "ALL", "E" => "USA", "U" => "AUS", "J" => "JPN", "P" => "EUR"
     }
     out = ""
-    sp = [8, 20, 10, 17, 10]
+    sp = [8, 20, 10, 17, 10, 14]
     line = ""
     sp.each{|s|
         line += "+#{"-" * s}"
     }
     line += "+\n"
     out += line
-    out += sprintf("|%#{sp[0]}s|%-#{sp[1]}s|%#{sp[2]}s|%-#{sp[3]}s|%#{sp[4]}s|\n", 
-                        "コード", "名前", "リージョン", "タイトルID", "バージョン") 
+    out += sprintf("|%#{sp[0]}s|%-#{sp[1]}s|%#{sp[2]}s|%-#{sp[3]}s|%#{sp[4]}s|%#{sp[5]}s|\n", 
+                        "コード", "名前", "リージョン", "タイトルID", "バージョン", "ファイルサイズ") 
     out += line
     rom_list.each{|rom|
         rom_data = ROM_DATA[rom[0]]
-        out += sprintf("|%#{sp[0]}s|%-#{sp[1]}s|%-#{sp[2]}s|%8s %8x|%#{sp[4]}s|\n", 
-            rom[0] + rom[1], rom_data[0],region_name[rom[1]], rom_data[1], (rom[0] + rom[1]).unpack("N")[0], rom[2]);
+        size = (rom[3].to_s).reverse.scan(/.{1,3}/).join(",").reverse
+        out += sprintf("|%#{sp[0]}s|%-#{sp[1]}s|%-#{sp[2]}s|%8s %8x|%#{sp[4]}s|%#{sp[5]}s|\n", 
+            rom[0] + rom[1], rom_data[0],region_name[rom[1]], rom_data[1], (rom[0] + rom[1]).unpack("N")[0], rom[2], size);
     }
     out += line
     File.open(file_name, "w") {|file|
@@ -149,16 +150,18 @@ def check(target_dir, region)
     ALL_REGION.each{|app_code|
         # オールリージョンのロムが含まれているかのチェック
         search_path = File.join(target_dir, region_dir, "#{HEADER}#{app_code}A*.tad")
-        if ret &= check_pickuped(search_path, false)
-            add_rom_list(rom_list, "#{HEADER}#{app_code}", "A", get_rom_version(search_path))
-        end
+        #if ret &= check_pickuped(search_path, false)
+            #add_rom_list(rom_list, "#{HEADER}#{app_code}", "A", get_rom_version(search_path))
+        #end
+        check_pickuped(search_path, false)
     }
     FIX_REGION.each{|app_code|
         # 各リージョン固有のロムが含まれているかのチェック
         search_path = File.join(target_dir, region_dir, "#{HEADER}#{app_code}#{region_code}*.tad")
-        if ret &= check_pickuped(search_path, false)
-            add_rom_list(rom_list, "#{HEADER}#{app_code}", region_code, get_rom_version(search_path))
-        end
+        #if ret &= check_pickuped(search_path, false)
+            #add_rom_list(rom_list, "#{HEADER}#{app_code}", region_code, get_rom_version(search_path))
+        #end
+        ret &= check_pickuped(search_path, false)
     }
     (ALL_REGION + FIX_REGION).each{|app_code|
         # HNxy が 各リージョンごと1つだけ存在するかのチェック