Fixes for titles in NUS format

Exzap · Exzap · commit db53f3b98020 · 2023-10-02T21:24:50.000+02:00
Symlinks were not handled correctly
diff --git a/src/Cafe/Filesystem/FST/FST.cpp b/src/Cafe/Filesystem/FST/FST.cpp
@@ -686,33 +686,33 @@ bool FSTVolume::OpenFile(std::string_view path, FSTFileHandle& fileHandleOut, bo
 	return true;
 }
 
-bool FSTVolume::IsDirectory(FSTFileHandle& fileHandle) const
+bool FSTVolume::IsDirectory(const FSTFileHandle& fileHandle) const
 {
 	cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());
 	return m_entries[fileHandle.m_fstIndex].GetType() == FSTEntry::TYPE::DIRECTORY;
 };
 
-bool FSTVolume::IsFile(FSTFileHandle& fileHandle) const
+bool FSTVolume::IsFile(const FSTFileHandle& fileHandle) const
 {
 	cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());
 	return m_entries[fileHandle.m_fstIndex].GetType() == FSTEntry::TYPE::FILE;
 };
 
-bool FSTVolume::HasLinkFlag(FSTFileHandle& fileHandle) const
+bool FSTVolume::HasLinkFlag(const FSTFileHandle& fileHandle) const
 {
 	cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());
 	return HAS_FLAG(m_entries[fileHandle.m_fstIndex].GetFlags(), FSTEntry::FLAGS::FLAG_LINK);
 };
 
-std::string_view FSTVolume::GetName(FSTFileHandle& fileHandle) const
+std::string_view FSTVolume::GetName(const FSTFileHandle& fileHandle) const
 {
 	if (fileHandle.m_fstIndex > m_entries.size())
 		return "";
 	const char* entryName = m_nameStringTable.data() + m_entries[fileHandle.m_fstIndex].nameOffset;
 	return entryName;
 }
 
-std::string FSTVolume::GetPath(FSTFileHandle& fileHandle) const
+std::string FSTVolume::GetPath(const FSTFileHandle& fileHandle) const
 {
 	std::string path;
 	auto& entry = m_entries[fileHandle.m_fstIndex];
@@ -743,7 +743,7 @@ std::string FSTVolume::GetPath(FSTFileHandle& fileHandle) const
 	return path;
 }
 
-uint32 FSTVolume::GetFileSize(FSTFileHandle& fileHandle) const
+uint32 FSTVolume::GetFileSize(const FSTFileHandle& fileHandle) const
 {
 	if (m_entries[fileHandle.m_fstIndex].GetType() != FSTEntry::TYPE::FILE)
 		return 0;
@@ -994,6 +994,7 @@ bool FSTVolume::OpenDirectoryIterator(std::string_view path, FSTDirectoryIterato
 	if (!IsDirectory(fileHandle))
 		return false;
 	auto const& fstEntry = m_entries[fileHandle.m_fstIndex];
+	directoryIteratorOut.dirHandle = fileHandle;
 	directoryIteratorOut.startIndex = fileHandle.m_fstIndex + 1;
 	directoryIteratorOut.endIndex = fstEntry.dirInfo.endIndex;
 	directoryIteratorOut.currentIndex = directoryIteratorOut.startIndex;
diff --git a/src/Cafe/Filesystem/FST/FST.h b/src/Cafe/Filesystem/FST/FST.h
@@ -11,7 +11,13 @@ struct FSTFileHandle
 struct FSTDirectoryIterator
 {
 	friend class FSTVolume;
+
+	const FSTFileHandle& GetDirHandle() const
+	{
+		return dirHandle;
+	}
 private:
+    FSTFileHandle dirHandle;
 	uint32 startIndex;
 	uint32 endIndex;
 	uint32 currentIndex;
@@ -43,15 +49,15 @@ class FSTVolume
 	bool OpenFile(std::string_view path, FSTFileHandle& fileHandleOut, bool openOnlyFiles = false);
 
 	// file and directory functions
-	bool IsDirectory(FSTFileHandle& fileHandle) const;
-	bool IsFile(FSTFileHandle& fileHandle) const;
-	bool HasLinkFlag(FSTFileHandle& fileHandle) const;
+	bool IsDirectory(const FSTFileHandle& fileHandle) const;
+	bool IsFile(const FSTFileHandle& fileHandle) const;
+	bool HasLinkFlag(const FSTFileHandle& fileHandle) const;
 
-	std::string_view GetName(FSTFileHandle& fileHandle) const;
-	std::string GetPath(FSTFileHandle& fileHandle) const;
+	std::string_view GetName(const FSTFileHandle& fileHandle) const;
+	std::string GetPath(const FSTFileHandle& fileHandle) const;
 
 	// file functions
-	uint32 GetFileSize(FSTFileHandle& fileHandle) const;
+	uint32 GetFileSize(const FSTFileHandle& fileHandle) const;
 	uint32 ReadFile(FSTFileHandle& fileHandle, uint32 offset, uint32 size, void* dataOut);
 
 	// directory iterator
diff --git a/src/Cafe/Filesystem/fscDeviceWud.cpp b/src/Cafe/Filesystem/fscDeviceWud.cpp
@@ -128,7 +128,7 @@ class fscDeviceWUDC : public fscDeviceC
 		if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_FILE))
 		{
 			FSTFileHandle fstFileHandle;
-			if (mountedVolume->OpenFile(path, fstFileHandle, true))
+			if (mountedVolume->OpenFile(path, fstFileHandle, true) && !mountedVolume->HasLinkFlag(fstFileHandle))
 			{
 				*fscStatus = FSC_STATUS_OK;
 				return new FSCDeviceWudFileCtx(mountedVolume, fstFileHandle);
@@ -137,7 +137,7 @@ class fscDeviceWUDC : public fscDeviceC
 		if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_DIR))
 		{
 			FSTDirectoryIterator dirIterator;
-			if (mountedVolume->OpenDirectoryIterator(path, dirIterator))
+			if (mountedVolume->OpenDirectoryIterator(path, dirIterator) && !mountedVolume->HasLinkFlag(dirIterator.GetDirHandle()))
 			{
 				*fscStatus = FSC_STATUS_OK;
 				return new FSCDeviceWudFileCtx(mountedVolume, dirIterator);
diff --git a/src/Cafe/TitleList/GameInfo.h b/src/Cafe/TitleList/GameInfo.h
@@ -136,8 +136,8 @@ class GameInfo2
 		// this is to stay consistent with previous Cemu versions which did not support NUS format at all
 		TitleInfo::TitleDataFormat currentFormat = currentTitle.GetFormat();
 		TitleInfo::TitleDataFormat newFormat = newTitle.GetFormat();
-		if (currentFormat != newFormat && currentFormat == TitleInfo::TitleDataFormat::NUS)
-			return true;
+		if (currentFormat != TitleInfo::TitleDataFormat::NUS && newFormat == TitleInfo::TitleDataFormat::NUS)
+			return false;
 		return true;
 	};
 
diff --git a/src/Cemu/Tools/DownloadManager/DownloadManager.cpp b/src/Cemu/Tools/DownloadManager/DownloadManager.cpp
@@ -1286,7 +1286,11 @@ bool DownloadManager::asyncPackageInstallRecursiveExtractFiles(Package* package,
 		setPackageError(package, "Internal error");
 		return false;
 	}
-
+	if (fstVolume->HasLinkFlag(dirItr.GetDirHandle()))
+	{
+		cemu_assert_suspicious();
+		return true;
+	}
 	FSTFileHandle itr;
 	while (fstVolume->Next(dirItr, itr))
 	{

Original file line number	Diff line number	Diff line change
`@@ -686,33 +686,33 @@ bool FSTVolume::OpenFile(std::string_view path, FSTFileHandle& fileHandleOut, bo`
`686`	`686`	`return true;`
`687`	`687`	`}`
`688`	`688`
`689`		`-bool FSTVolume::IsDirectory(FSTFileHandle& fileHandle) const`
	`689`	`+bool FSTVolume::IsDirectory(const FSTFileHandle& fileHandle) const`
`690`	`690`	`{`
`691`	`691`	`cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());`
`692`	`692`	`return m_entries[fileHandle.m_fstIndex].GetType() == FSTEntry::TYPE::DIRECTORY;`
`693`	`693`	`};`
`694`	`694`
`695`		`-bool FSTVolume::IsFile(FSTFileHandle& fileHandle) const`
	`695`	`+bool FSTVolume::IsFile(const FSTFileHandle& fileHandle) const`
`696`	`696`	`{`
`697`	`697`	`cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());`
`698`	`698`	`return m_entries[fileHandle.m_fstIndex].GetType() == FSTEntry::TYPE::FILE;`
`699`	`699`	`};`
`700`	`700`
`701`		`-bool FSTVolume::HasLinkFlag(FSTFileHandle& fileHandle) const`
	`701`	`+bool FSTVolume::HasLinkFlag(const FSTFileHandle& fileHandle) const`
`702`	`702`	`{`
`703`	`703`	`cemu_assert_debug(fileHandle.m_fstIndex < m_entries.size());`
`704`	`704`	`return HAS_FLAG(m_entries[fileHandle.m_fstIndex].GetFlags(), FSTEntry::FLAGS::FLAG_LINK);`
`705`	`705`	`};`
`706`	`706`
`707`		`-std::string_view FSTVolume::GetName(FSTFileHandle& fileHandle) const`
	`707`	`+std::string_view FSTVolume::GetName(const FSTFileHandle& fileHandle) const`
`708`	`708`	`{`
`709`	`709`	`if (fileHandle.m_fstIndex > m_entries.size())`
`710`	`710`	`return "";`
`711`	`711`	`const char* entryName = m_nameStringTable.data() + m_entries[fileHandle.m_fstIndex].nameOffset;`
`712`	`712`	`return entryName;`
`713`	`713`	`}`
`714`	`714`
`715`		`-std::string FSTVolume::GetPath(FSTFileHandle& fileHandle) const`
	`715`	`+std::string FSTVolume::GetPath(const FSTFileHandle& fileHandle) const`
`716`	`716`	`{`
`717`	`717`	`std::string path;`
`718`	`718`	`auto& entry = m_entries[fileHandle.m_fstIndex];`
`@@ -743,7 +743,7 @@ std::string FSTVolume::GetPath(FSTFileHandle& fileHandle) const`
`743`	`743`	`return path;`
`744`	`744`	`}`
`745`	`745`
`746`		`-uint32 FSTVolume::GetFileSize(FSTFileHandle& fileHandle) const`
	`746`	`+uint32 FSTVolume::GetFileSize(const FSTFileHandle& fileHandle) const`
`747`	`747`	`{`
`748`	`748`	`if (m_entries[fileHandle.m_fstIndex].GetType() != FSTEntry::TYPE::FILE)`
`749`	`749`	`return 0;`
`@@ -994,6 +994,7 @@ bool FSTVolume::OpenDirectoryIterator(std::string_view path, FSTDirectoryIterato`
`994`	`994`	`if (!IsDirectory(fileHandle))`
`995`	`995`	`return false;`
`996`	`996`	`auto const& fstEntry = m_entries[fileHandle.m_fstIndex];`
	`997`	`+ directoryIteratorOut.dirHandle = fileHandle;`
`997`	`998`	`directoryIteratorOut.startIndex = fileHandle.m_fstIndex + 1;`
`998`	`999`	`directoryIteratorOut.endIndex = fstEntry.dirInfo.endIndex;`
`999`	`1000`	`directoryIteratorOut.currentIndex = directoryIteratorOut.startIndex;`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ class fscDeviceWUDC : public fscDeviceC`
`128`	`128`	`if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_FILE))`
`129`	`129`	`{`
`130`	`130`	`FSTFileHandle fstFileHandle;`
`131`		`- if (mountedVolume->OpenFile(path, fstFileHandle, true))`
	`131`	`+ if (mountedVolume->OpenFile(path, fstFileHandle, true) && !mountedVolume->HasLinkFlag(fstFileHandle))`
`132`	`132`	`{`
`133`	`133`	`*fscStatus = FSC_STATUS_OK;`
`134`	`134`	`return new FSCDeviceWudFileCtx(mountedVolume, fstFileHandle);`
`@@ -137,7 +137,7 @@ class fscDeviceWUDC : public fscDeviceC`
`137`	`137`	`if (HAS_FLAG(accessFlags, FSC_ACCESS_FLAG::OPEN_DIR))`
`138`	`138`	`{`
`139`	`139`	`FSTDirectoryIterator dirIterator;`
`140`		`- if (mountedVolume->OpenDirectoryIterator(path, dirIterator))`
	`140`	`+ if (mountedVolume->OpenDirectoryIterator(path, dirIterator) && !mountedVolume->HasLinkFlag(dirIterator.GetDirHandle()))`
`141`	`141`	`{`
`142`	`142`	`*fscStatus = FSC_STATUS_OK;`
`143`	`143`	`return new FSCDeviceWudFileCtx(mountedVolume, dirIterator);`
Original file line number	Diff line number	Diff line change
`@@ -1286,7 +1286,11 @@ bool DownloadManager::asyncPackageInstallRecursiveExtractFiles(Package* package,`
`1286`	`1286`	`setPackageError(package, "Internal error");`
`1287`	`1287`	`return false;`
`1288`	`1288`	`}`
`1289`		`-`
	`1289`	`+ if (fstVolume->HasLinkFlag(dirItr.GetDirHandle()))`
	`1290`	`+ {`
	`1291`	`+ cemu_assert_suspicious();`
	`1292`	`+ return true;`
	`1293`	`+ }`
`1290`	`1294`	`FSTFileHandle itr;`
`1291`	`1295`	`while (fstVolume->Next(dirItr, itr))`
`1292`	`1296`	`{`