Merge pull request #5720 from JosJuice/file-metadata

FileUtil: Redesign Exists/IsDirectory/GetSize

Source/Core/Core/Boot/Boot.cpp

@@ -466,8 +466,8 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> boot)
 
 BootExecutableReader::BootExecutableReader(const std::string& file_name)
 {
-  m_bytes.resize(File::GetSize(file_name));
   File::IOFile file{file_name, "rb"};
+  m_bytes.resize(file.GetSize());
   file.ReadBytes(m_bytes.data(), m_bytes.size());
 }
 

Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp

@@ -52,9 +52,6 @@ void AXUCode::LoadResamplingCoefficients()
   for (fidx = 0; fidx < ArraySize(filenames); ++fidx)
   {
     filename = filenames[fidx];
-    if (!File::Exists(filename))
-      continue;
-
     if (File::GetSize(filename) != 0x1000)
       continue;
 

Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp

@@ -204,30 +204,26 @@ void CEXIIPL::LoadFontFile(const std::string& filename, u32 offset)
   if (ipl_rom_path.empty())
     ipl_rom_path = FindIPLDump(File::GetSysDirectory() + GC_SYS_DIR);
 
-  if (File::Exists(ipl_rom_path))
-  {
-    // The user has an IPL dump, load the font from it
-    File::IOFile stream(ipl_rom_path, "rb");
-    if (!stream)
-      return;
-
-    // Official Windows-1252 and Shift JIS fonts present on the IPL dumps are 0x2575 and 0x4a24d
-    // bytes long respectively, so, determine the size of the font being loaded based on the offset
-    u64 fontsize = (offset == 0x1aff00) ? 0x4a24d : 0x2575;
-
-    INFO_LOG(BOOT, "Found IPL dump, loading %s font from %s",
-             ((offset == 0x1aff00) ? "Shift JIS" : "Windows-1252"), (ipl_rom_path).c_str());
-
-    stream.Seek(offset, 0);
-    stream.ReadBytes(m_pIPL + offset, fontsize);
-
-    m_FontsLoaded = true;
-  }
-  else
+  // If the user has an IPL dump, load the font from it
+  File::IOFile stream(ipl_rom_path, "rb");
+  if (!stream)
   {
     // No IPL dump available, load bundled font instead
     LoadFileToIPL(filename, offset);
+    return;
   }
+
+  // Official Windows-1252 and Shift JIS fonts present on the IPL dumps are 0x2575 and 0x4a24d
+  // bytes long respectively, so, determine the size of the font being loaded based on the offset
+  u64 fontsize = (offset == 0x1aff00) ? 0x4a24d : 0x2575;
+
+  INFO_LOG(BOOT, "Found IPL dump, loading %s font from %s",
+           ((offset == 0x1aff00) ? "Shift JIS" : "Windows-1252"), (ipl_rom_path).c_str());
+
+  stream.Seek(offset, 0);
+  stream.ReadBytes(m_pIPL + offset, fontsize);
+
+  m_FontsLoaded = true;
 }
 
 void CEXIIPL::SetCS(int _iCS)

Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp

@@ -176,11 +176,12 @@ void CEXIMemoryCard::SetupGciFolder(u16 sizeMb)
   strDirectoryName = strDirectoryName + SConfig::GetDirectoryForRegion(region) + DIR_SEP +
                      StringFromFormat("Card %c", 'A' + card_index);
 
-  if (!File::Exists(strDirectoryName))  // first use of memcard folder, migrate automatically
+  const File::FileInfo file_info(strDirectoryName);
+  if (!file_info.Exists())  // first use of memcard folder, migrate automatically
   {
     MigrateFromMemcardFile(strDirectoryName + DIR_SEP, card_index);
   }
-  else if (!File::IsDirectory(strDirectoryName))
+  else if (!file_info.IsDirectory())
   {
     if (File::Rename(strDirectoryName, strDirectoryName + ".original"))
     {

Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp

@@ -142,10 +142,8 @@ GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, int slot, u
       m_save_directory(directory), m_exiting(false)
 {
   // Use existing header data if available
-  if (File::Exists(m_save_directory + MC_HDR))
   {
-    File::IOFile hdr_file((m_save_directory + MC_HDR), "rb");
-    hdr_file.ReadBytes(&m_hdr, BLOCK_SIZE);
+    File::IOFile((m_save_directory + MC_HDR), "rb").ReadBytes(&m_hdr, BLOCK_SIZE);
   }
 
   std::vector<std::string> filenames = Common::DoFileSearch({m_save_directory}, {".gci"});

Source/Core/Core/HW/WiiSaveCrypted.cpp

@@ -343,6 +343,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
 
       std::string file_path_full = m_wii_title_path + file_path;
       File::CreateFullPath(file_path_full);
+      const File::FileInfo file_info(file_path_full);
       if (file_hdr_tmp.type == 1)
       {
         file_size = Common::swap32(file_hdr_tmp.size);
@@ -361,7 +362,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
         mbedtls_aes_crypt_cbc(&m_aes_ctx, MBEDTLS_AES_DECRYPT, file_size_rounded, m_iv,
                               static_cast<const u8*>(file_data_enc.data()), file_data.data());
 
-        if (!File::Exists(file_path_full) ||
+        if (!file_info.Exists() ||
             AskYesNoT("%s already exists, overwrite?", file_path_full.c_str()))
         {
           INFO_LOG(CONSOLE, "Creating file %s", file_path_full.c_str());
@@ -372,12 +373,12 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
       }
       else if (file_hdr_tmp.type == 2)
       {
-        if (!File::Exists(file_path_full))
+        if (!file_info.Exists())
         {
           if (!File::CreateDir(file_path_full))
             ERROR_LOG(CONSOLE, "Failed to create directory %s", file_path_full.c_str());
         }
-        else if (!File::IsDirectory(file_path_full))
+        else if (!file_info.IsDirectory())
         {
           ERROR_LOG(CONSOLE,
                     "Failed to create directory %s because a file with the same name exists",
@@ -399,13 +400,14 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
     memset(&file_hdr_tmp, 0, FILE_HDR_SZ);
 
     u32 file_size = 0;
-    if (File::IsDirectory(m_files_list[i]))
+    const File::FileInfo file_info(m_files_list[i]);
+    if (file_info.IsDirectory())
     {
       file_hdr_tmp.type = 2;
     }
     else
     {
-      file_size = static_cast<u32>(File::GetSize(m_files_list[i]));
+      file_size = static_cast<u32>(file_info.GetSize());
       file_hdr_tmp.type = 1;
     }
 

Source/Core/Core/IOS/FS/FS.cpp

@@ -524,13 +524,15 @@ IPCCommandResult FS::ReadDirectory(const IOCtlVRequest& request)
 
   INFO_LOG(IOS_FILEIO, "FS: IOCTL_READ_DIR %s", DirName.c_str());
 
-  if (!File::Exists(DirName))
+  const File::FileInfo file_info(DirName);
+
+  if (!file_info.Exists())
   {
     WARN_LOG(IOS_FILEIO, "FS: Search not found: %s", DirName.c_str());
     return GetFSReply(FS_ENOENT);
   }
 
-  if (!File::IsDirectory(DirName))
+  if (!file_info.IsDirectory())
   {
     // It's not a directory, so error.
     // Games don't usually seem to care WHICH error they get, as long as it's <

Source/Core/Core/IOS/FS/FileIO.cpp

@@ -102,7 +102,7 @@ ReturnCode FileIO::Open(const OpenRequest& request)
 
   // The file must exist before we can open it
   // It should be created by ISFS_CreateFile, not here
-  if (!File::Exists(m_filepath) || File::IsDirectory(m_filepath))
+  if (!File::IsFile(m_filepath))
   {
     WARN_LOG(IOS_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[m_Mode],
              m_filepath.c_str());

Source/Core/Core/IOS/Network/KD/NWC24Config.cpp

@@ -27,22 +27,15 @@ NWC24Config::NWC24Config()
 
 void NWC24Config::ReadConfig()
 {
-  if (File::Exists(m_path))
+  if (!File::IOFile(m_path, "rb").ReadBytes(&m_data, sizeof(m_data)))
   {
-    if (!File::IOFile(m_path, "rb").ReadBytes(&m_data, sizeof(m_data)))
-    {
-      ResetConfig();
-    }
-    else
-    {
-      const s32 config_error = CheckNwc24Config();
-      if (config_error)
-        ERROR_LOG(IOS_WC24, "There is an error in the config for for WC24: %d", config_error);
-    }
+    ResetConfig();
   }
   else
   {
-    ResetConfig();
+    const s32 config_error = CheckNwc24Config();
+    if (config_error)
+      ERROR_LOG(IOS_WC24, "There is an error in the config for for WC24: %d", config_error);
   }
 }
 

Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp

@@ -27,15 +27,8 @@ WiiNetConfig::WiiNetConfig()
 
 void WiiNetConfig::ReadConfig()
 {
-  if (File::Exists(m_path))
-  {
-    if (!File::IOFile(m_path, "rb").ReadBytes(&m_data, sizeof(m_data)))
-      ResetConfig();
-  }
-  else
-  {
+  if (!File::IOFile(m_path, "rb").ReadBytes(&m_data, sizeof(m_data)))
     ResetConfig();
-  }
 }
 
 void WiiNetConfig::WriteConfig() const

Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp

@@ -40,9 +40,9 @@ void BackUpBTInfoSection(const SysConf* sysconf)
 void RestoreBTInfoSection(SysConf* sysconf)
 {
   const std::string filename = File::GetUserPath(D_SESSION_WIIROOT_IDX) + DIR_SEP WII_BTDINF_BACKUP;
-  if (!File::Exists(filename))
-    return;
   File::IOFile backup(filename, "rb");
+  if (!backup)
+    return;
   std::vector<u8> section(BT_INFO_SECTION_LENGTH);
   if (!backup.ReadBytes(section.data(), section.size()))
   {

Source/Core/Core/Movie.cpp

@@ -960,20 +960,13 @@ bool PlayInput(const std::string& filename)
   if (s_playMode != MODE_NONE)
     return false;
 
-  if (!File::Exists(filename))
+  File::IOFile recording_file(filename, "rb");
+  if (!recording_file.ReadArray(&tmpHeader, 1))
     return false;
 
-  File::IOFile g_recordfd;
-
-  if (!g_recordfd.Open(filename, "rb"))
-    return false;
-
-  g_recordfd.ReadArray(&tmpHeader, 1);
-
   if (!IsMovieHeader(tmpHeader.filetype))
   {
     PanicAlertT("Invalid recording file");
-    g_recordfd.Close();
     return false;
   }
 
@@ -993,11 +986,11 @@ bool PlayInput(const std::string& filename)
 
   Core::UpdateWantDeterminism();
 
-  s_totalBytes = g_recordfd.GetSize() - 256;
+  s_totalBytes = recording_file.GetSize() - 256;
   EnsureTmpInputSize((size_t)s_totalBytes);
-  g_recordfd.ReadArray(tmpInput, (size_t)s_totalBytes);
+  recording_file.ReadArray(tmpInput, (size_t)s_totalBytes);
   s_currentByte = 0;
-  g_recordfd.Close();
+  recording_file.Close();
 
   // Load savestate (and skip to frame data)
   if (tmpHeader.bFromSaveState)