IRISMAN 4.87.1

aldostools · aldostools · commit 950f43482852 · 2021-05-10T21:08:14.000-04:00
Dump bluray disc now includes game title in the output folder name #34
diff --git a/include/utils.h b/include/utils.h
@@ -226,6 +226,8 @@ void call_webman(const char *cmd);
 
 void urldec(char *url);
 u64 string_to_ull( char *string );
+void fixpath(char *p);
+void fixtitle(char *p);
 
 unsigned int get_vsh_plugin_slot_by_name(const char *name);
 unsigned int get_vsh_plugin_free_slot(void);
diff --git a/source/iso.c b/source/iso.c
@@ -2366,7 +2366,7 @@ static int build_file_iso(int *fd, char *path1, char *path2, int level)
 
 }
 
-static void fixpath(char *p)
+void fixpath(char *p)
 {
     u8 * pp = (u8 *) p;
 
@@ -2397,7 +2397,7 @@ static void fixpath(char *p)
 
 }
 
-static void fixtitle(char *p)
+void fixtitle(char *p)
 {
     while(*p)
     {
@@ -2457,26 +2457,29 @@ int makeps3iso(char *g_path, char *f_iso, int split)
     strcpy(path2, path1);
     strcat(path2, "/PS3_GAME/PARAM.SFO");
 
-    if(strstr(path1, "/GAME") == NULL)
-    {
-        path2[64] = 0;
-        strcpy(path2, strrchr(path1, '/') + 1);
-        path2[40] = 0;
-    }
-    else
     if(iso_parse_param_sfo(path2, title_id, output_name) < 0)
     {
-        DPrintf("ERROR: PARAM.SFO not found!\n");
-        press_button_to_continue();
-        return FAILED;
+        if(strstr(path1, "/GAME") == NULL)
+        {
+            path2[64] = 0;
+            strcpy(path2, strrchr(path1, '/') + 1);
+            path2[40] = 0;
+        }
+        else
+        {
+            DPrintf("ERROR: PARAM.SFO not found!\n");
+            press_button_to_continue();
+            return FAILED;
+        }
     }
     else
     {
         utf8_to_ansiname(output_name, path2, 32);
         path2[32]= 0;
         fixtitle(path2);
-        strcat(path2, "-");
+        strcat(path2, " [");
         strcat(path2, title_id);
+        strcat(path2, "]");
     }
 
     if(f_iso) strcpy(output_name, f_iso); else output_name[0] = 0;
@@ -2496,12 +2499,10 @@ int makeps3iso(char *g_path, char *f_iso, int split)
     if(nlen < 1) {strcpy(output_name, path2);/*DPrintf("ISO name too short!\n"); press_button_to_continue(); return FAILED;*/}
     else
     {
-
          if(stat(output_name, &s) == 0 && (S_ISDIR(s.st_mode)))
          {
             strcat(output_name, "/"); strcat(output_name, path2);
          }
-
     }
 
     nlen = strlen(output_name);
diff --git a/source/main.c b/source/main.c
@@ -6150,7 +6150,7 @@ int gui_control()
             DrawDialogOKTimer(language[DRAWSCREEN_PARCONTROL], 2000.0f);
         else
         {
-           // if(old_pad & BUTTON_SELECT) {bShowVersion = 1; bShowPIC1 = 1;} // SELECT + /\ = force show version / pic1 on ISO
+            if(old_pad & BUTTON_SELECT) {bShowVersion = 1; bShowPIC1 = 1;} // SELECT + /\ = force show version / pic1 on ISO
 
             i = selected;
             app_ver[0] = 0;
diff --git a/source/utils.c b/source/utils.c
@@ -1924,14 +1924,24 @@ void copy_from_bluray()
                 {
                     sprintf(name, "/%s/" __MKDEF_GAMES_DIR, hdd_folder);
                     mkdir_secure(name);
-                    sprintf(name, "/%s/" __MKDEF_GAMES_DIR "/%s", hdd_folder, id);
+                    char game_title[64];
+                    strcpy(game_title, bluray_game); fixtitle(game_title);
+                    if(*game_title)
+                        sprintf(name, "/%s/" __MKDEF_GAMES_DIR "/%s [%s]", hdd_folder, game_title, id);
+                    else
+                        sprintf(name, "/%s/" __MKDEF_GAMES_DIR "/%s", hdd_folder, id);
                     mkdir_secure(name);
                 }
                 else if (!memcmp(hdd_folder, "GAMES", 6) || !memcmp(hdd_folder, "dev_hdd0_2", 11))
                 {
                     sprintf(name, "/%s/GAMES", "dev_hdd0");
                     mkdir_secure(name);
-                    sprintf(name, "/%s/GAMES/%s", "dev_hdd0", id);
+                    char game_title[64];
+                    strcpy(game_title, bluray_game); fixtitle(game_title);
+                    if(*game_title)
+                        sprintf(name, "/%s/GAMES/%s [%s]", "dev_hdd0", game_title, id);
+                    else
+                        sprintf(name, "/%s/GAMES/%s", "dev_hdd0", id);
                     mkdir_secure(name);
                 }
                 else
@@ -1948,12 +1958,24 @@ void copy_from_bluray()
             {
                 sprintf(name, "/dev_usb00%c/" __MKDEF_GAMES_DIR, 47 + curr_device);
                 mkdir_secure(name);
-                sprintf(name, "/dev_usb00%c/" __MKDEF_GAMES_DIR, 47 + curr_device);
-                mkdir_secure(name);
-                sprintf(name, "/dev_usb00%c/" __MKDEF_GAMES_DIR "/%s", 47 + curr_device, id);
+                char game_title[64];
+                strcpy(game_title, bluray_game); fixtitle(game_title);
+                if(*game_title)
+                    sprintf(name, "/dev_usb00%c/" __MKDEF_GAMES_DIR "/%s [%s]", 47 + curr_device, game_title, id);
+                else
+                    sprintf(name, "/dev_usb00%c/" __MKDEF_GAMES_DIR "/%s", 47 + curr_device, id);
                 mkdir_secure(name);
             }
 
+            if(*bluray_game)
+            {
+                 strcat(progress_bar_title, "\n");
+                 strcat(progress_bar_title, bluray_game);
+                 strcat(progress_bar_title, "[");
+                 strcat(progress_bar_title, id);
+                 strcat(progress_bar_title, "]");
+            }
+
             time_start = time(NULL);
             abort_copy = 0;
             DCls();
@@ -2029,15 +2051,14 @@ void copy_from_bluray()
                    new_pad = 0;
                    break;
                 }
-
             }
 
             if(abort_copy)
             {
                 if(curr_device == 0)
-                    sprintf(filename, "%s\n\n%s HDD0?", id, language[GAMECPYSL_FAILDELDUMP]);
+                    sprintf(filename, "%s [%s]\n\n%s HDD0?", bluray_game, id, language[GAMECPYSL_FAILDELDUMP]);
                 else
-                    sprintf(filename, "%s\n\n%s USB00%c?", id, language[GAMECPYSL_FAILDELDUMP], 47 + curr_device);
+                    sprintf(filename, "%s [%s]\n\n%s USB00%c?", bluray_game, id, language[GAMECPYSL_FAILDELDUMP], 47 + curr_device);
 
                 dialog_action = 0;
                 msgDialogOpen2(mdialogyesno, filename, my_dialog, (void*) 0x0000aaaa, NULL );
@@ -2052,7 +2073,6 @@ void copy_from_bluray()
                     my_game_delete((char *) name);
 
                     rmdir_secure((char *) name); // delete this folder
-
                 }
                 else
                 {
@@ -2072,7 +2092,6 @@ void copy_from_bluray()
                     ret =
                     #endif
                     sysLv2FsRename(name, filename);
-
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2366,7 +2366,7 @@ static int build_file_iso(int fd, char path1, char *path2, int level)`
`2366`	`2366`
`2367`	`2367`	`}`
`2368`	`2368`
`2369`		`-static void fixpath(char *p)`
	`2369`	`+void fixpath(char *p)`
`2370`	`2370`	`{`
`2371`	`2371`	`u8 * pp = (u8 *) p;`
`2372`	`2372`
`@@ -2397,7 +2397,7 @@ static void fixpath(char *p)`
`2397`	`2397`
`2398`	`2398`	`}`
`2399`	`2399`
`2400`		`-static void fixtitle(char *p)`
	`2400`	`+void fixtitle(char *p)`
`2401`	`2401`	`{`
`2402`	`2402`	`while(*p)`
`2403`	`2403`	`{`
`@@ -2457,26 +2457,29 @@ int makeps3iso(char g_path, char f_iso, int split)`
`2457`	`2457`	`strcpy(path2, path1);`
`2458`	`2458`	`strcat(path2, "/PS3_GAME/PARAM.SFO");`
`2459`	`2459`
`2460`		`- if(strstr(path1, "/GAME") == NULL)`
`2461`		`- {`
`2462`		`- path2[64] = 0;`
`2463`		`- strcpy(path2, strrchr(path1, '/') + 1);`
`2464`		`- path2[40] = 0;`
`2465`		`- }`
`2466`		`- else`
`2467`	`2460`	`if(iso_parse_param_sfo(path2, title_id, output_name) < 0)`
`2468`	`2461`	`{`
`2469`		`- DPrintf("ERROR: PARAM.SFO not found!\n");`
`2470`		`- press_button_to_continue();`
`2471`		`- return FAILED;`
	`2462`	`+ if(strstr(path1, "/GAME") == NULL)`
	`2463`	`+ {`
	`2464`	`+ path2[64] = 0;`
	`2465`	`+ strcpy(path2, strrchr(path1, '/') + 1);`
	`2466`	`+ path2[40] = 0;`
	`2467`	`+ }`
	`2468`	`+ else`
	`2469`	`+ {`
	`2470`	`+ DPrintf("ERROR: PARAM.SFO not found!\n");`
	`2471`	`+ press_button_to_continue();`
	`2472`	`+ return FAILED;`
	`2473`	`+ }`
`2472`	`2474`	`}`
`2473`	`2475`	`else`
`2474`	`2476`	`{`
`2475`	`2477`	`utf8_to_ansiname(output_name, path2, 32);`
`2476`	`2478`	`path2[32]= 0;`
`2477`	`2479`	`fixtitle(path2);`
`2478`		`- strcat(path2, "-");`
	`2480`	`+ strcat(path2, " [");`
`2479`	`2481`	`strcat(path2, title_id);`
	`2482`	`+ strcat(path2, "]");`
`2480`	`2483`	`}`
`2481`	`2484`
`2482`	`2485`	`if(f_iso) strcpy(output_name, f_iso); else output_name[0] = 0;`
`@@ -2496,12 +2499,10 @@ int makeps3iso(char g_path, char f_iso, int split)`
`2496`	`2499`	`if(nlen < 1) {strcpy(output_name, path2);/DPrintf("ISO name too short!\n"); press_button_to_continue(); return FAILED;/}`
`2497`	`2500`	`else`
`2498`	`2501`	`{`
`2499`		`-`
`2500`	`2502`	`if(stat(output_name, &s) == 0 && (S_ISDIR(s.st_mode)))`
`2501`	`2503`	`{`
`2502`	`2504`	`strcat(output_name, "/"); strcat(output_name, path2);`
`2503`	`2505`	`}`
`2504`		`-`
`2505`	`2506`	`}`
`2506`	`2507`
`2507`	`2508`	`nlen = strlen(output_name);`
Original file line number	Diff line number	Diff line change
`@@ -6150,7 +6150,7 @@ int gui_control()`
`6150`	`6150`	`DrawDialogOKTimer(language[DRAWSCREEN_PARCONTROL], 2000.0f);`
`6151`	`6151`	`else`
`6152`	`6152`	`{`
`6153`		`- // if(old_pad & BUTTON_SELECT) {bShowVersion = 1; bShowPIC1 = 1;} // SELECT + /\ = force show version / pic1 on ISO`
	`6153`	`+ if(old_pad & BUTTON_SELECT) {bShowVersion = 1; bShowPIC1 = 1;} // SELECT + /\ = force show version / pic1 on ISO`
`6154`	`6154`
`6155`	`6155`	`i = selected;`
`6156`	`6156`	`app_ver[0] = 0;`