Bugfixes

GrapheneCt · GrapheneCt · commit f812de87f739 · 2025-10-11T00:27:55.000+02:00
- Added offline mode
- Native language (original) audio track is now used by default for YouTube videos
- Fixed YouTube History tab
diff --git a/NetStream-DE/download_enabler.cpp b/NetStream-DE/download_enabler.cpp
@@ -42,15 +42,15 @@ static int ExportFilePatched(uint32_t *data)
 		bgdl_path = paf::common::FormatString("ux0:bgdl/t/%08x/d0.pdb", num);
 
 		int ret = 0;
-		paf::common::SharedPtr<paf::LocalFile> fd = paf::LocalFile::Open(bgdl_path.c_str(), SCE_O_RDONLY, 0, &ret);
+		paf::common::SharedPtr<paf::LocalFile> fd = paf::LocalFile::Open(bgdl_path.c_str(), paf::File::RDONLY, 0, &ret);
 		if (ret != SCE_PAF_OK)
 		{
 			return ret;
 		}
 
-		fd->Seek(0xD6, SCE_SEEK_SET);
+		fd->Seek(0xD6, paf::File::SET);
 		fd->Read(&url_length, sizeof(uint16_t));
-		fd->Seek(0xF7 + url_length, SCE_SEEK_SET);
+		fd->Seek(0xF7 + url_length, paf::File::SET);
 		fd->Read(file_name, sizeof(file_name));
 		fd->Close();
 
diff --git a/NetStream/CONTENTS/module/download_enabler_netstream.suprx b/NetStream/CONTENTS/module/download_enabler_netstream.suprx
diff --git a/NetStream/CONTENTS/module/libFourthTube.suprx b/NetStream/CONTENTS/module/libFourthTube.suprx
diff --git a/NetStream/include/dialog.h b/NetStream/include/dialog.h
@@ -60,6 +60,8 @@ namespace dialog
 	void Close();
 
 	void WaitEnd();
+
+	bool IsActive();
 };
 
 #endif
diff --git a/NetStream/include/main.h b/NetStream/include/main.h
@@ -31,6 +31,8 @@ namespace menu {
 
 		private:
 
+			void OnDialogUserCancelEvent(int32_t type);
+
 			Type m_type;
 		};
 
diff --git a/NetStream/include/menus/menu_first.h b/NetStream/include/menus/menu_first.h
@@ -46,6 +46,8 @@ namespace menu {
 
 		void OnListButton(ui::Widget *self);
 
+		void SetOfflineMode();
+
 		MenuType GetMenuType() override
 		{
 			return MenuType_First;
@@ -60,6 +62,7 @@ namespace menu {
 	private:
 
 		bool m_showHvdb;
+		ui::ListView *m_rootList;
 	};
 }
 
diff --git a/NetStream/param.sfx b/NetStream/param.sfx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <paramsfo>
-	<param key="APP_VER">03.32</param>
+	<param key="APP_VER">03.33</param>
 	<param key="ATTRIBUTE">33408</param>
 	<param key="ATTRIBUTE_MINOR">16</param>
 	<param key="ATTRIBUTE2">0</param>
diff --git a/NetStream/source/browsers/local_server_browser.cpp b/NetStream/source/browsers/local_server_browser.cpp
@@ -187,7 +187,7 @@ vector<LocalServerBrowser::Entry *> *LocalServerBrowser::GoTo(const char *ref, i
 			char *begin = NULL;
 			char *end = NULL;
 
-			fres = LocalFile::Open(GetPath().c_str(), SCE_O_RDONLY, 0, &res);
+			fres = LocalFile::Open(GetPath().c_str(), File::RDONLY, 0, &res);
 			if (res < 0)
 			{
 				*result = res;
diff --git a/NetStream/source/dialog.cpp b/NetStream/source/dialog.cpp
@@ -256,4 +256,12 @@ void dialog::WaitEnd()
 	while (s_currentDialog != CURRENT_DIALOG_NONE) {
 		thread::Sleep(100);
 	}
+}
+
+bool dialog::IsActive()
+{
+	if (s_currentDialog == CURRENT_DIALOG_NONE)
+		return false;
+
+	return true;
 }
diff --git a/NetStream/source/main.cpp b/NetStream/source/main.cpp
@@ -69,6 +69,7 @@ int32_t menu::main::NetcheckJob::Run()
 	int32_t ret = SCE_OK;
 	int32_t sync = 0;
 	SceUID shellPid = SCE_UID_INVALID_UID;
+	bool dialogAborted = false;
 	char titleid[12];
 	SceNetInitParam param;
 
@@ -91,37 +92,59 @@ int32_t menu::main::NetcheckJob::Run()
 	param.memory = sce_paf_malloc(SCE_KERNEL_32KiB);
 	param.size = SCE_KERNEL_32KiB;
 	param.flags = 0;
+
 	ret = sceNetInit(&param);
 	while (ret != SCE_OK)
 	{
+		if (!dialog::IsActive() || dialogAborted)
+		{
+			dialog::OpenError(g_appPlugin, SCE_ERROR_ERRNO_ECANCELED, Framework::Instance()->GetCommonString("msg_error_network_connection"));
+			dialogAborted = true;
+			break;
+		}
 		ret = sceNetInit(&param);
 		thread::Sleep(100);
 	}
 
 	ret = sceNetCtlInit();
 	while (ret != SCE_OK)
 	{
+		if (!dialog::IsActive() || dialogAborted)
+		{
+			dialog::OpenError(g_appPlugin, SCE_ERROR_ERRNO_ECANCELED, Framework::Instance()->GetCommonString("msg_error_network_connection"));
+			dialogAborted = true;
+			break;
+		}
 		ret = sceNetCtlInit();
 		thread::Sleep(100);
 	}
 
 	sceNetCtlInetGetState(&ret);
 	while (ret != SCE_NET_CTL_STATE_IPOBTAINED)
 	{
+		if (!dialog::IsActive() || dialogAborted)
+		{
+			dialog::OpenError(g_appPlugin, SCE_ERROR_ERRNO_ECANCELED, Framework::Instance()->GetCommonString("msg_error_network_connection"));
+			dialogAborted = true;
+			break;
+		}
 		sceNetCtlInetGetState(&ret);
 		thread::Sleep(100);
 	}
 
 	menu::Settings::Init();
 
-	ytutils::Init(NP_TUS_HIST_LOG_SLOT, NP_TUS_FAV_LOG_SLOT);
-	hvdbutils::Init();
+	if (!dialogAborted)
+	{
+		ytutils::Init(NP_TUS_HIST_LOG_SLOT, NP_TUS_FAV_LOG_SLOT);
+		hvdbutils::Init();
 
-	dialog::Close();
+		dialog::Close();
+	}
 
 	sce::AppSettings *settings = menu::Settings::GetAppSetInstance();
 	settings->GetInt("cloud_sync", static_cast<int32_t *>(&sync), 0);
-	if (sync)
+	if (sync && !dialogAborted)
 	{
 		nputils::PreInit(OnNpDialogComplete);
 	}
@@ -133,6 +156,14 @@ int32_t menu::main::NetcheckJob::Run()
 		taiLoadStartModuleForPid(shellPid, pluginPath.c_str(), 0, NULL, 0);
 	}
 
+	if (dialogAborted)
+	{
+		menu::First *fmenu = static_cast<menu::First *>(menu::GetTopMenu());
+		thread::RMutex::MainThreadMutex()->Lock();
+		fmenu->SetOfflineMode();
+		thread::RMutex::MainThreadMutex()->Unlock();
+	}
+
 	return SCE_PAF_OK;
 }
 
@@ -148,7 +179,7 @@ void pluginLoadCB(Plugin *plugin)
 
 	Framework *fw = Framework::Instance();
 
-	dialog::OpenPleaseWait(g_appPlugin, NULL, fw->GetCommonString("msg_wait"));
+	dialog::OpenPleaseWait(g_appPlugin, NULL, fw->GetCommonString("msg_connecting_wait"), true);
 
 	menu::main::NetcheckJob *ncJob = new menu::main::NetcheckJob(menu::main::NetcheckJob::Type_Initial);
 	common::SharedPtr<job::JobItem> itemParam(ncJob);
diff --git a/NetStream/source/menus/menu_first.cpp b/NetStream/source/menus/menu_first.cpp
@@ -30,18 +30,18 @@ menu::First::First() : GenericMenu("page_first", MenuOpenParam(true), MenuCloseP
 	wstring title = g_appPlugin->GetString(msg_title_menu_first);
 	topText->SetString(title);
 
-	auto listView = static_cast<ui::ListView *>(m_root->FindChild(list_view_generic));
-	listView->SetItemFactory(new ListViewFactory(this));
-	listView->InsertSegment(0, 1);
-	listView->SetCellSizeDefault(0, { 960.0f, 80.0f });
-	listView->SetSegmentLayoutType(0, ui::ListView::LAYOUT_TYPE_LIST);
+	m_rootList = static_cast<ui::ListView *>(m_root->FindChild(list_view_generic));
+	m_rootList->SetItemFactory(new ListViewFactory(this));
+	m_rootList->InsertSegment(0, 1);
+	m_rootList->SetCellSizeDefault(0, { 960.0f, 80.0f });
+	m_rootList->SetSegmentLayoutType(0, ui::ListView::LAYOUT_TYPE_LIST);
 	if (m_showHvdb)
 	{
-		listView->InsertCell(0, 0, 5);
+		m_rootList->InsertCell(0, 0, 5);
 	}
 	else
 	{
-		listView->InsertCell(0, 0, 4);
+		m_rootList->InsertCell(0, 0, 4);
 	}
 }
 
@@ -143,4 +143,14 @@ void menu::First::OnListButton(ui::Widget *self)
 		}
 		break;
 	}
+}
+
+void menu::First::SetOfflineMode()
+{
+	if (!m_rootList)
+	{
+		return;
+	}
+
+	m_rootList->DeleteCell(0, 0, m_rootList->GetCellNum(0) - 1);
 }
diff --git a/NetStream/source/menus/menu_player_simple.cpp b/NetStream/source/menus/menu_player_simple.cpp
@@ -555,6 +555,7 @@ menu::PlayerSimple::PlayerSimple(const char *url, GenericPlayer::Option *opt, Ge
 		else if (BEAVPlayer::IsSupported(url) == GenericPlayer::SupportType_Supported)
 		{
 			m_player = new BEAVPlayer(m_videoPlane, url, NULL);
+			m_subSettings.enable = false; // BEAV is currently used only for livestreams, no subs here
 		}
 		else if (AVPlayer::IsSupported(url) == GenericPlayer::SupportType_Supported)
 		{
@@ -570,6 +571,7 @@ menu::PlayerSimple::PlayerSimple(const char *url, GenericPlayer::Option *opt, Ge
 			break;
 		case GenericPlayer::PlayerType_BEAV:
 			m_player = new BEAVPlayer(m_videoPlane, url, static_cast<BEAVPlayer::Option *>(opt));
+			m_subSettings.enable = false; // BEAV is currently used only for livestreams, no subs here
 			break;
 		case GenericPlayer::PlayerType_AV:
 			m_player = new AVPlayer(m_videoPlane, url, static_cast<AVPlayer::Option *>(opt));
diff --git a/NetStream/source/menus/menu_player_youtube.cpp b/NetStream/source/menus/menu_player_youtube.cpp
@@ -113,7 +113,7 @@ void menu::PlayerYoutube::Load()
 				common::SharedPtr<LocalFile> lmanifest;
 				int32_t res = -1;
 
-				lmanifest = LocalFile::Open("savedata0:lmanifest.mpd", SCE_O_WRONLY | SCE_O_CREAT | SCE_O_TRUNC, 0666, &res);
+				lmanifest = LocalFile::Open("savedata0:lmanifest.mpd", File::WRONLY | File::CREAT | File::TRUNC, File::RWU, &res);
 				if (res == SCE_OK)
 				{
 					lmanifest->Write(ftItem->videoItem->dashManifest, sce_paf_strlen(ftItem->videoItem->dashManifest));
diff --git a/NetStream/source/menus/menu_settings.cpp b/NetStream/source/menus/menu_settings.cpp
@@ -80,7 +80,7 @@ void menu::Settings::Init()
 	verinfo8 = "RELEASE ";
 #endif
 	verinfo8 += __DATE__;
-	verinfo8 += " v 3.32";
+	verinfo8 += " v 3.33";
 	verinfo8 += "\n\n-- libcurl --\n\n";
 	verinfo8 += "Version: ";
 	verinfo8 += curlInfo->version;
diff --git a/NetStream/source/menus/menu_youtube.cpp b/NetStream/source/menus/menu_youtube.cpp
@@ -466,15 +466,15 @@ void menu::YouTube::HistorySubmenu::Parse()
 		ytutils::GetHistLog()->GetNext(entryData + (i * SCE_INI_FILE_PROCESSOR_KEY_BUFFER_SIZE));
 	}
 
-	for (int32_t i = totalNum; i > -1; i--)
+	for (int32_t i = totalNum - 1; i >= 0; i--)
 	{
 		if (m_interrupted)
 		{
 			break;
 		}
 
 		ret = ftParseVideo(&ftCtx, entryData + (i * SCE_INI_FILE_PROCESSOR_KEY_BUFFER_SIZE), FT_VIDEO_VOD_QUALITY_NONE, FT_AUDIO_VOD_QUALITY_NONE, &ftItem);
-		if (ret == true)
+		if (ret == SCE_OK)
 		{
 			if (ftItem->videoItem->id)
 			{
diff --git a/NetStream/source/np_utils.cpp b/NetStream/source/np_utils.cpp
@@ -125,7 +125,7 @@ int32_t nputils::TUS::UploadFile(uint32_t slot, const char *path)
 	}
 	request = ret;
 
-	common::SharedPtr<LocalFile> file = LocalFile::Open(path, SCE_O_RDONLY, 0, &ret);
+	common::SharedPtr<LocalFile> file = LocalFile::Open(path, File::RDONLY, 0, &ret);
 	if (ret < 0)
 	{
 		sceNpTusDeleteRequest(request);
@@ -170,7 +170,7 @@ int32_t nputils::TUS::DownloadFile(uint32_t slot, const char *path)
 	}
 	request = ret;
 
-	common::SharedPtr<LocalFile> file = LocalFile::Open(path, SCE_O_WRONLY | SCE_O_CREAT, 0666, &ret);
+	common::SharedPtr<LocalFile> file = LocalFile::Open(path, File::WRONLY | File::CREAT, File::RWU, &ret);
 	if (ret < 0)
 	{
 		sceNpTusDeleteRequest(request);
diff --git a/NetStream/source/players/player_fmod.cpp b/NetStream/source/players/player_fmod.cpp
@@ -45,13 +45,13 @@ FMOD_RESULT FMODPlayer::HybridInterface::Open(const char *name, unsigned int *fi
 	{
 
 		common::SharedPtr<LocalFile> *lfile = new common::SharedPtr<LocalFile>;
-		*lfile = LocalFile::Open(name, SCE_O_RDONLY, 0, &ret);
+		*lfile = LocalFile::Open(name, File::RDONLY, 0, &ret);
 		file = reinterpret_cast<common::SharedPtr<File> *>(lfile);
 	}
 	else
 	{
 		common::SharedPtr<CurlFile> *rfile = new common::SharedPtr<CurlFile>;
-		*rfile = CurlFile::Open(name, SCE_O_RDONLY, 0, &ret, NULL, utils::GetGlobalProxy());
+		*rfile = CurlFile::Open(name, File::RDONLY, 0, &ret, NULL, utils::GetGlobalProxy());
 		file = reinterpret_cast<common::SharedPtr<File> *>(rfile);
 	}
 
@@ -94,7 +94,7 @@ FMOD_RESULT FMODPlayer::HybridInterface::Seek(void *handle, unsigned int pos, vo
 {
 	off_t seekres = 0;
 	common::SharedPtr<File> *file = reinterpret_cast<common::SharedPtr<File> *>(handle);
-	seekres = file->get()->Seek(pos, SCE_SEEK_SET);
+	seekres = file->get()->Seek(pos, File::SET);
 	if (seekres == pos)
 	{
 		return FMOD_OK;
diff --git a/NetStream/source/tex_pool.cpp b/NetStream/source/tex_pool.cpp
@@ -322,7 +322,7 @@ bool TexPool::AddLocal(IDParam const& id, const char *path)
 		return false;
 	}
 	int32_t res = -1;
-	common::SharedPtr<LocalFile> lfile = LocalFile::Open(path, SCE_O_RDONLY, 0, &res);
+	common::SharedPtr<LocalFile> lfile = LocalFile::Open(path, File::RDONLY, 0, &res);
 	if (res != SCE_PAF_OK)
 	{
 		Remove(id);

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ namespace menu {`
`46`	`46`
`47`	`47`	`void OnListButton(ui::Widget *self);`
`48`	`48`
	`49`	`+ void SetOfflineMode();`
	`50`	`+`
`49`	`51`	`MenuType GetMenuType() override`
`50`	`52`	`{`
`51`	`53`	`return MenuType_First;`
`@@ -60,6 +62,7 @@ namespace menu {`
`60`	`62`	`private:`
`61`	`63`
`62`	`64`	`bool m_showHvdb;`
	`65`	`+ ui::ListView *m_rootList;`
`63`	`66`	`};`
`64`	`67`	`}`
`65`	`68`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ vector<LocalServerBrowser::Entry > LocalServerBrowser::GoTo(const char *ref, i`
`187`	`187`	`char *begin = NULL;`
`188`	`188`	`char *end = NULL;`
`189`	`189`
`190`		`- fres = LocalFile::Open(GetPath().c_str(), SCE_O_RDONLY, 0, &res);`
	`190`	`+ fres = LocalFile::Open(GetPath().c_str(), File::RDONLY, 0, &res);`
`191`	`191`	`if (res < 0)`
`192`	`192`	`{`
`193`	`193`	`*result = res;`
Original file line number	Diff line number	Diff line change
`@@ -256,4 +256,12 @@ void dialog::WaitEnd()`
`256`	`256`	`while (s_currentDialog != CURRENT_DIALOG_NONE) {`
`257`	`257`	`thread::Sleep(100);`
`258`	`258`	`}`
	`259`	`+}`
	`260`	`+`
	`261`	`+bool dialog::IsActive()`
	`262`	`+{`
	`263`	`+ if (s_currentDialog == CURRENT_DIALOG_NONE)`
	`264`	`+ return false;`
	`265`	`+`
	`266`	`+ return true;`
`259`	`267`	`}`