- Add Release 1.1.1-1:

- Fix Rx3 archive renaming bug...

ReadMe.txt

@@ -1,7 +1,7 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 1.2 $
+# $Revision: 1.4 $
 # $Name:  $
-# $Date: 2009/04/12 01:20:14 $
+# $Date: 2009/04/26 00:14:32 $
 # $Author: agibert $
 
 
@@ -29,16 +29,16 @@ There is three modes available
 Repository structure
 --------------------
     The repository is minimally composed by two directory: roms and misc.
-    The rom directory is full of rom files. These file can be uncompressed (.nds) or compressed. Three compressors are supported: zip, rar and 7zip. Next to a nds2rm run, the rom file names and rom archive file names follow the RRNF format. Before a nds2rn run, the rom file names must start with a number followed by a space.
+    The rom directory is full of rom files. These file can be uncompressed (.nds) or compressed. Three compressors are supported: zip, rar and 7zip. Next to a nds2rm run, the rom file names and rom archive file names follow the RRFNFS 1.1 format. Before a nds2rn run, the rom file names must start with a number followed by a space.
 
     In the misc directory, nds2rm is looking for the dat file: dsrom.xml. This file is comming from http://www.advanscene.com/offline/datas/ADVANsCEne_NDS.zip
     
 
 
-RRFNFS: Rx3 Rom File Name Format Standard
------------------------------------------
+RRFNFS 1.1: Rx3 Rom File Name Format Standard version 1.1
+---------------------------------------------------------
       nds2rm stores ROMs in a .nds file with a  standardized file name format:
-	     XXXX - NNNNNNNNNN (R:L1-...-Ln) [SS].nds
+	     XXXX - NNNNNNNNNN (R=L1-...-Ln) [SS].nds
       with
 	     XXXX:      id
 	     NNNNNNNNN: name
@@ -47,7 +47,7 @@ RRFNFS: Rx3 Rom File Name Format Standard
 	     SS:        Status (OK,KO)
 
       nds2rm compresses each ROM file in an archive file with a standardized file name format:
-	     XXXX - NNNNNNNNNN (R:L1-...-Ln) [SS] {CCCCCCCC} <FFFF>.ccc
+	     XXXX - NNNNNNNNNN (R=L1-...-Ln) [SS] {CCCCCCCC} <FFFF>.ccc
      with:
 	     XXXX:      id
 	     NNNNNNNNN: name

ReleaseNotes.txt

@@ -1,13 +1,32 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 1.2 $
+# $Revision: 1.6 $
 # $Name:  $
-# $Date: 2009/04/12 01:20:14 $
+# $Date: 2009/10/27 18:28:44 $
 # $Author: agibert $
 
 
 
 
 
+--------------------------------------------------------------------------------
+nds2rm V 1.1.1-1 - A. Gibert - 2009/10/27
+--------------------------------------------------------------------------------
+
+- Fix Rx3 archive renaming bug (during renumbering pass)...
+
+
+
+--------------------------------------------------------------------------------
+nds2rm V 1.1.0-1 - A. Gibert - 2009/05/09
+--------------------------------------------------------------------------------
+
+- Change the RRFNFS: Region and Language list are separated by an '=' and not a ':' in order to be FAT friendly !
+- Add a work around in dsrom.lst generator: remove the rom name... NinjaPass bug ?! Help Me !
+- Fix a bug in fp reading (visible in rom listing),
+- Add support for non sorted dsrom.xml file...
+
+
+
 --------------------------------------------------------------------------------
 nds2rm V 1.0.0-1 - A. Gibert - 2009/04/12
 --------------------------------------------------------------------------------

nds2rm

@@ -5,9 +5,9 @@
 # (C) 2009 Arnaud G. Gibert
 #-----------------------------------------------------------------------------------------------------------------------------------
 # $RCSfile: nds2rm,v $
-# $Revision: 1.16 $
+# $Revision: 1.20 $
 # $Name:  $
-# $Date: 2009/04/12 01:20:14 $
+# $Date: 2009/10/26 01:35:08 $
 # $Author: agibert $
 #-----------------------------------------------------------------------------------------------------------------------------------
 
@@ -251,7 +251,7 @@ function env_setup()
         ;;
     esac
 
-    rrfnfs_regex=".... - .* \(.*:.*\) \[..\] \{........} <....>[-]*[0-9]*\.${csfx}$"
+    rrfnfs_regex=".... - .* \(.*=.*\) \[..\] \{........} <....>[-]*[0-9]*\.${csfx}$"
 }
 
 
@@ -373,27 +373,23 @@ function xml_load()
 
 		  if [[ "${idx}" != "xxxx" ]]
                   then
-
-		      count_print ${idx}
-
-	                     dat_rn[${idx}]="${rn}"
-                             dat_id[${idx}]="${id}"
-                          dat_title[${idx}]="${title}"
-                         dat_region[${idx}]="${reg_tab[${location}]}"
-                           dat_lang[${idx}]="${lang}"
-                      dat_save_type[${idx}]="${save_type}"
-                            dat_crc[${idx}]="${crc}"
-
-                             dat_fp[${idx}]="????"
-                         dat_status[${idx}]="?"
-                            dat_dup[${idx}]="0"
-
-                      loaded_cnt=$((${loaded_cnt} + 1))
-
-		      if [[ ${loaded_cnt} -ge ${max_idx} ]]
+		      if [[ ${idx} -le ${max_idx} ]]
 		      then
-			  echo "max rom id reached: skipping loading !" 1>&2
-			  break;
+		          count_print ${idx}
+
+	                         dat_rn[${idx}]="${rn}"
+                                 dat_id[${idx}]="${id}"
+                              dat_title[${idx}]="${title}"
+                             dat_region[${idx}]="${reg_tab[${location}]}"
+                               dat_lang[${idx}]="${lang}"
+                          dat_save_type[${idx}]="${save_type}"
+                                dat_crc[${idx}]="${crc}"
+
+                                 dat_fp[${idx}]="????"
+                             dat_status[${idx}]="?"
+                                dat_dup[${idx}]="0"
+
+                          loaded_cnt=$((${loaded_cnt} + 1))
 		      fi
 		  fi
 	      ;;
@@ -531,7 +527,7 @@ function rom_list_dump()
 	do
 	  if [[ ${dat_status[${i}]} == "${status}" ]]
           then
-	      echo "${dat_id[${i}]} - ${dat_title[${i}]} (${dat_region[${i}]}:${dat_lang[${i}]}) {${dat_crc[${i}]}} <${dat_fp[${i}]}>"
+	      echo "${dat_id[${i}]} - ${dat_title[${i}]} (${dat_region[${i}]}=${dat_lang[${i}]}) {${dat_crc[${i}]}} <${dat_fp[${i}]}>"
 	  fi
 
 	  i=$(( ${i} + 1 ))
@@ -574,6 +570,8 @@ function dsrom_dump()
 {
     echo "dumping ds rom list..." 1>&2
 
+    echo "${dat_id[${loaded_cnt}]}"
+
     i=1
 
     while [[ ${i} -le ${loaded_cnt} ]]
@@ -582,7 +580,10 @@ function dsrom_dump()
       then
 	  mask=$(mask_get "${dat_save_type[${i}]}")
 
-	  echo "${dat_id[${i}]} ${dat_fp[${i}]}-0 $mask ${dat_title[${i}]} (${dat_region[${i}]}:${dat_lang[${i}]}) [${dat_status[${i}]}] {${dat_crc[${i}]}}"
+#	  echo "${dat_id[${i}]} ${dat_fp[${i}]}-0 $mask ${dat_title[${i}]} (${dat_region[${i}]}:${dat_lang[${i}]}) [${dat_status[${i}]}] {${dat_crc[${i}]}}"
+
+# Try to fix non working dsrom.lst by removing rom name... :^(
+	  echo "${dat_id[${i}]} ${dat_fp[${i}]}-0 $mask"
       fi
 
       i=$(( ${i} + 1 ))
@@ -657,7 +658,7 @@ function arc_mkfn()
            dup_id=${9}
 
 
-    file_prefix="${id} - ${title} (${reg}:${lang}) [${status}] {${crc}} <${fp}>"
+    file_prefix="${id} - ${title} (${reg}=${lang}) [${status}] {${crc}} <${fp}>"
 
     if [[ ${dup_id} == "" ]]
     then
@@ -933,7 +934,7 @@ function arc_proceed()
 
     if [[ "${extract}" == "yes" ]]
     then
-	rom="${id} - ${title} (${reg}:${lang}).nds"
+	rom="${id} - ${title} (${reg}=${lang}).nds"
 
 	rom_extract "${rom}" "${file}"
 
@@ -999,13 +1000,13 @@ function arc_proceed()
                 crc=${dat_crc[${idx}]}
             status2="OK"
 
-	     # Rename the ROM file
-	     rom2="${id} - ${title} (${reg}:${lang}) [${status2}].nds"
+	     # Extract ROM file if not yet done
+	    if [[ "${rom}" == "" ]]
+	    then
+		rom="${id} - ${title} (${reg}=${lang}).nds"
 
-	     print_verbose "moving ${rom} to ${rom2}"
-
-	     mv "${rom}" "${rom2}"
-	     rom=${rom2}
+		rom_extract "${rom}" "${file}"
+	    fi
 
 	    if [[ "${arc_type}" == "rx3" ]]
 	    then
@@ -1029,9 +1030,9 @@ function arc_proceed()
 
     # Rename ROM if needed
 
-    if [[ ( "${renumed}" != "yes") && ( ( "${arc_type}" != "rx3" ) || ( "${rebuild}" == "yes" ) ) ]]
+    if [[ ( "${renumed}" == "yes") || ( "${arc_type}" != "rx3" ) || ( "${rebuild}" == "yes" ) ]]
     then
-	rom2="${id} - ${title} (${reg}:${lang}) [${status}].nds"
+	rom2="${id} - ${title} (${reg}=${lang}) [${status}].nds"
 
 	print_verbose "moving ${rom} to ${rom2}"
 
@@ -1049,7 +1050,7 @@ function arc_proceed()
 
     # Make / Rename Archive
 
-    if [[ ( "${arc_type}" != "rx3" ) || ( ${rebuild} == "yes" ) ]]
+    if [[  ( "${renumed}" == "yes") || ( "${arc_type}" != "rx3" ) || ( ${rebuild} == "yes" ) ]]
     then
 	arc_build  "${file_name}" "${rom}"  "${file}"   "${mode}" "${idx}"
     else
@@ -1162,7 +1163,7 @@ function suffix_mng()
       else
           status=${file/* \[/};   status=${status/\] \{*/}
              crc=${file/*\] \{/};    crc=${crc/\} \<*/}
-              fp=${file/*\} \</};     fp=${fp/\>-*/}
+              fp=${file/*\} \</};     fp=${fp/\>*/}
 
           dat_dup[${idx}]="${dup_id}"