v2.04 intermediate

GrapheneCt · Feb 21, 2023 · 3b42b87 · 3b42b87
1 parent 5753b71
commit 3b42b87
Show file tree

Hide file tree

Showing 57 changed files with 614 additions and 1,564 deletions.
diff --git a/NetStream-DE/download_enabler.c b/NetStream-DE/download_enabler.c
@@ -75,6 +75,7 @@ int module_start(SceSize args, const void * argp)
 		case 0xF476E785: // 3.71 retail
 		case 0x939FFBE9: // 3.72 retail
 		case 0x734D476A: // 3.73 retail
+		case 0x51CB6207: // 3.74 retail
 		{
 			hooks[0] = taiHookFunctionOffset(&GetFileTypeRef, info.modid, 0, 0x11B63C, 1, GetFileTypePatched);
 			break;

diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj b/NetStream-libScePafPreload/libScePafPreload.vcxproj
diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj.filters b/NetStream-libScePafPreload/libScePafPreload.vcxproj.filters
diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj.user b/NetStream-libScePafPreload/libScePafPreload.vcxproj.user
diff --git a/NetStream-libScePafPreload/prx.c b/NetStream-libScePafPreload/prx.c
diff --git a/NetStream.sln b/NetStream.sln
@@ -6,11 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetStream", "NetStream\NetStream.vcxproj", "{CA4F859F-6FE6-413C-A24A-44CF552FCE91}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A6BB4747-BD6A-4DFC-B213-236038A9E766} = {A6BB4747-BD6A-4DFC-B213-236038A9E766}
-		{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D} = {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libScePafPreload", "NetStream-libScePafPreload\libScePafPreload.vcxproj", "{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetStream-DE", "NetStream-DE\NetStream-DE.vcxproj", "{A6BB4747-BD6A-4DFC-B213-236038A9E766}"
 EndProject
 Global
@@ -23,10 +20,6 @@ Global
 		{CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Debug|PSVita.Build.0 = Debug|PSVita
 		{CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Release|PSVita.ActiveCfg = Release|PSVita
 		{CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Release|PSVita.Build.0 = Release|PSVita
-		{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Debug|PSVita.ActiveCfg = Debug|PSVita
-		{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Debug|PSVita.Build.0 = Debug|PSVita
-		{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Release|PSVita.ActiveCfg = Release|PSVita
-		{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Release|PSVita.Build.0 = Release|PSVita
 		{A6BB4747-BD6A-4DFC-B213-236038A9E766}.Debug|PSVita.ActiveCfg = Debug|PSVita
 		{A6BB4747-BD6A-4DFC-B213-236038A9E766}.Debug|PSVita.Build.0 = Debug|PSVita
 		{A6BB4747-BD6A-4DFC-B213-236038A9E766}.Release|PSVita.ActiveCfg = Release|PSVita

diff --git a/NetStream/CONTENTS/module/download_enabler_netstream.suprx b/NetStream/CONTENTS/module/download_enabler_netstream.suprx
diff --git a/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx b/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx
diff --git a/NetStream/CONTENTS/module/libScePafPreload.suprx b/NetStream/CONTENTS/module/libScePafPreload.suprx
diff --git a/NetStream/CONTENTS/netstream_plugin.rcd b/NetStream/CONTENTS/netstream_plugin.rcd
@@ -70,10 +70,11 @@ key:a246c545(0) id:plane_obj2
 key:f808f140(0) id:style_button_option_top
 key:a4f80dc0(0) id:style_button_option_bottom
 key:29d701c3(0) id:style_button_option_middle
+key:9d28f73d(0) id:style_text_option_menu_ruler
+key:a56e4ba2(0) id:text_obj1
 key:aaa827ae(0) id:style_plane_black
 key:44a21a77(0) id:style_busyindicator_big
 key:1bc003d9(0) id:style_text_top_title_bar
-key:a56e4ba2(0) id:text_obj1
 key:fad63dd9(0) id:style_list_view_generic
 key:885879e0(0) id:style_list_view_item_generic
 key:e6cd9335(0) id:style_image_button_list_button
@@ -116,6 +117,7 @@ key:41c21f50(0) id:style_button_yt_comment
 key:ed36b1c7(0) id:template_option_menu_base
 key:655c6a32(0) id:button_option_menu_close
 key:4446ff86(0) id:plane_option_menu_base
+key:c9cdb2cc(0) id:text_option_menu_ruler
 key:ae3d8acd(0) id:box_option_menu
 key:9227a229(0) id:template_option_menu_button_single
 key:242a5612(0) id:button_option_menu_single
@@ -198,6 +200,7 @@ key:a8d8a98c(0) id:tex_fpmenu_icon_ftp
 key:01add48c(0) id:tex_fpmenu_icon_local
 key:5aa46fb7(0) id:tex_file_icon_video
 key:deab6c16(0) id:tex_file_icon_folder
+key:fb08ccb2(0) id:tex_file_icon_playlist
 key:289b9013(0) id:tex_file_icon_unsupported
 key:974eadf7(0) id:tex_black
 key:ff3d36d8(0) id:tex_button_expand

diff --git a/NetStream/CONTENTS/netstream_plugin.rco b/NetStream/CONTENTS/netstream_plugin.rco
diff --git a/NetStream/NetStream.vcxproj b/NetStream/NetStream.vcxproj
@@ -121,7 +121,7 @@
       <AdditionalOptions>--no-standard-libraries </AdditionalOptions>
       <AdditionalLibraryDirectories>$(SCE_PSP2_SDK_DIR)\target\lib\vdsuite;$(ProjectDir)libs\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateSnMapFile>FullMapFile</GenerateSnMapFile>
-      <AdditionalDependencies>-lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceHttp_stub;-lSceSsl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lCurlFile;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>-lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceHttp_stub;-lSceSsl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lPafFileExt;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>"$(SCE_PSP2_SDK_DIR)/host_tools/build/bin/vdsuite-pubprx.exe" --boot-param "$(ProjectDir)ebootparam.bin" "$(LocalDebuggerCommand)" "$(OutDir)eboot.bin"</Command>
@@ -154,7 +154,7 @@
     <Link>
       <DuplicateStripping>true</DuplicateStripping>
       <AdditionalOptions>--no-standard-libraries </AdditionalOptions>
-      <AdditionalDependencies>-lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lCurlFile;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>-lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lPafFileExt;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>call "$(ProjectDir)gen_rco.bat"

diff --git a/NetStream/RES_RCO/file/netstream_settings.xml b/NetStream/RES_RCO/file/netstream_settings.xml
@@ -14,8 +14,16 @@
       <text_field id="ftp_password" title="msg_ftp_password" max_length="255" min_length="0" keyboard_type="alphabet" key="ftp_password" default_value=""/>
       <toggle_switch id="ftp_nlst" title="msg_ftp_nlst" hint="msg_ftp_nlst_hint" key="ftp_nlst" default_value="0" />
     </setting_list>
-    <setting_list id="local_setting" title="msg_settings_local" style="edit" icon="tex_spanner">
+    <setting_list id="local_setting" title="msg_settings_local" icon="tex_spanner">
       <text_field id="local_playlist_prefix" title="msg_local_playlist_prefix" max_length="255" min_length="0" keyboard_type="url" key="local_playlist_prefix" default_value=""/>
+      <list id="list_local_sort_name" title="msg_local_sort_name" key="local_sort_name" default_value="0">
+        <list_item id="list_local_sort_name_00" title="msg_option_local_sort_name_0" value="0" />
+        <list_item id="list_local_sort_name_01" title="msg_option_local_sort_name_1" value="1" />
+      </list>
+      <list id="list_local_sort_type" title="msg_local_sort_type" key="local_sort_type" default_value="0">
+        <list_item id="list_local_sort_type_00" title="msg_option_local_sort_type_0" value="0" />
+        <list_item id="list_local_sort_type_01" title="msg_option_local_sort_type_1" value="1" />
+      </list>
     </setting_list>
     <setting_list id="youtube_search_setting" title="msg_settings_search" icon="tex_spanner">
       <text_field id="youtube_inv_instance" title="msg_youtube_inv_instance" max_length="255" min_length="0" keyboard_type="url" key="inv_instance" default_value="https://invidious.namazso.eu"/>

diff --git a/NetStream/RES_RCO/locale/netstream_locale_en.xml b/NetStream/RES_RCO/locale/netstream_locale_en.xml
@@ -40,6 +40,12 @@
   <string src="Enabling this option will make NetStream send NLST command to FTP server instead of LIST command. This option makes operation faster but may not be supported by some FTP servers." id="msg_ftp_nlst_hint" />
 
   <string src="Prefix For Relative .m3u8 Playlists" id="msg_local_playlist_prefix" />
+  <string src="Sort By Name" id="msg_local_sort_name" />
+  <string src="Sort By Type" id="msg_local_sort_type" />
+  <string src="Ascending" id="msg_option_local_sort_name_0" />
+  <string src="Descending" id="msg_option_local_sort_name_1" />
+  <string src="Folders First" id="msg_option_local_sort_type_0" />
+  <string src="Files First" id="msg_option_local_sort_type_1" />
 
   <string src="Preferred Video Quality" id="msg_youtube_quality" />
   <string src="Preferred Livestream Quality" id="msg_youtube_hls_quality" />

diff --git a/NetStream/RES_RCO/locale/netstream_locale_es.xml b/NetStream/RES_RCO/locale/netstream_locale_es.xml
@@ -40,6 +40,12 @@
   <string src="Si activas esta opción, NetStream enviará el comando NLST al servidor FTP en lugar del comando LIST. Esta opción agiliza el funcionamiento, pero algunos servidores FTP podrían no admitirla." id="msg_ftp_nlst_hint" />
 
   <string src="Prefijo para listas de reproducción .m3u8 relativas" id="msg_local_playlist_prefix" />
+  <string src="Sort By Name" id="msg_local_sort_name" />
+  <string src="Sort By Type" id="msg_local_sort_type" />
+  <string src="Ascending" id="msg_option_local_sort_name_0" />
+  <string src="Descending" id="msg_option_local_sort_name_1" />
+  <string src="Folders First" id="msg_option_local_sort_type_0" />
+  <string src="Files First" id="msg_option_local_sort_type_1" />
 
   <string src="Calidad preferida de videos" id="msg_youtube_quality" />
   <string src="Calidad preferida de directos" id="msg_youtube_hls_quality" />

diff --git a/NetStream/RES_RCO/locale/netstream_locale_it.xml b/NetStream/RES_RCO/locale/netstream_locale_it.xml
@@ -40,6 +40,12 @@
   <string src="Abilitando questa opzione, NetStream invierà il comando NLST al server FTP invece del comando LIST. Questa opzione rende l'operazione più veloce ma potrebbe non essere supportata da alcuni server FTP." id="msg_ftp_nlst_hint" />
 
   <string src="Prefisso per Relativo .m3u8 Playlists" id="msg_local_playlist_prefix" />
+  <string src="Sort By Name" id="msg_local_sort_name" />
+  <string src="Sort By Type" id="msg_local_sort_type" />
+  <string src="Ascending" id="msg_option_local_sort_name_0" />
+  <string src="Descending" id="msg_option_local_sort_name_1" />
+  <string src="Folders First" id="msg_option_local_sort_type_0" />
+  <string src="Files First" id="msg_option_local_sort_type_1" />
 
   <string src="Qualità video preferita" id="msg_youtube_quality" />
   <string src="Qualità livestream preferita" id="msg_youtube_hls_quality" />

diff --git a/NetStream/RES_RCO/locale/netstream_locale_ja.xml b/NetStream/RES_RCO/locale/netstream_locale_ja.xml
@@ -40,6 +40,12 @@
   <string src="このオプションを有効にすると、NetStreamはLISTコマンドの代わりにNLSTコマンドをFTPサーバーに送信するようになります。このオプションは動作を高速化しますが、一部のFTPサーバーではサポートされていない場合があります。" id="msg_ftp_nlst_hint" />
 
   <string src="Prefix For Relative .m3u8 Playlists" id="msg_local_playlist_prefix" />
+  <string src="Sort By Name" id="msg_local_sort_name" />
+  <string src="Sort By Type" id="msg_local_sort_type" />
+  <string src="Ascending" id="msg_option_local_sort_name_0" />
+  <string src="Descending" id="msg_option_local_sort_name_1" />
+  <string src="Folders First" id="msg_option_local_sort_type_0" />
+  <string src="Files First" id="msg_option_local_sort_type_1" />
 
   <string src="優先するビデオの画質" id="msg_youtube_quality" />
   <string src="優先するライブストリームの画質" id="msg_youtube_hls_quality" />