Fix #799

Author: hzqst

Build/svencoop/scmodeldownloader/SCModelDownloaderSettingsPage.res

@@ -95,19 +95,59 @@
 		"unicode"		"0"
 	}
 
+	"Label_MaxRetry"
+	{
+		"ControlName"		"Label"
+		"fieldName"		"Label_MaxRetry"
+		"xpos"		"24"
+		"ypos"		"114"
+		"wide"		"80"
+		"tall"		"24"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#GameUI_SCModelDownloader_MaxRetry"
+		"textAlignment"		"west"
+		"associate"		"MaxRetry"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"		"0"
+	}
+
+	"MaxRetry"
+	{
+		"ControlName"		"TextEntry"
+		"fieldName"		"MaxRetry"
+		"xpos"		"110"
+		"ypos"		"114"
+		"wide"		"40"
+		"tall"		"24"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"4"
+		"textHidden"		"0"
+		"editable"		"1"
+		"maxchars"		"3"
+		"NumericInputOnly"		"1"
+		"unicode"		"0"
+	}
+
 	"ForceUpdateDatabases"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"ForceUpdateDatabases"
 		"xpos"		"24"
-		"ypos"		"112"
+		"ypos"		"144"
 		"wide"		"180"
 		"tall"		"24"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"		"4"
+		"tabPosition"		"5"
 		"labelText"			"#GameUI_SCModelDownloader_ForceUpdateDatabases"
 		"textAlignment"		"center"
 		"command"			"ForceUpdateDatabases"

Build/svencoop/scmodeldownloader/gameui_english.txt

@@ -17,6 +17,7 @@
 
 bool SCModel_ShouldDownloadLatest();
 int SCModel_CDN();
+int SCModel_MaxRetry();
 void SCModel_ReloadModel(const char* name);
 
 static unsigned int g_uiAllocatedTaskId = 0;
@@ -173,6 +174,7 @@ class CSCModelQueryBase : public ISCModelQueryInternal
 	bool m_bFinished{};
 	bool m_bFailed{};
 	float m_flNextRetryTime{};
+	int m_iRetryCount{};
 	unsigned int m_uiTaskId{};
 
 protected:
@@ -267,7 +269,19 @@ class CSCModelQueryBase : public ISCModelQueryInternal
 	{
 		m_bResponding = false;
 		m_bFailed = true;
-		m_flNextRetryTime = (float)gEngfuncs.GetAbsoluteTime() + 5.0f;
+		m_iRetryCount++;
+
+		auto iMaxRetry = SCModel_MaxRetry();
+
+		if (iMaxRetry <= 0 || m_iRetryCount < iMaxRetry)
+		{
+			m_flNextRetryTime = (float)gEngfuncs.GetAbsoluteTime() + 5.0f;
+		}
+		else
+		{
+			m_flNextRetryTime = 0;
+			gEngfuncs.Con_Printf("[SCModelDownloader] Max retry (%d) reached for \"%s\", giving up.\n", iMaxRetry, m_Url.c_str());
+		}
 
 		SCModelDatabaseInternal()->DispatchQueryStateChangeCallback(this, GetState());
 	}

Build/svencoop/scmodeldownloader/gameui_schinese.txt

@@ -20,6 +20,8 @@ CSCModelDownloaderSettingsPage::CSCModelDownloaderSettingsPage(vgui::Panel* pare
 	m_pCDN->AddItem("none", NULL);
 	m_pCDN->AddItem("jsdelivr", NULL);
 
+	m_pMaxRetry = new CCvarTextEntry(this, "MaxRetry", "scmodel_max_retry");
+
 	LoadControlSettings("scmodeldownloader/SCModelDownloaderSettingsPage.res", "GAME");
 
 	vgui::ivgui()->AddTickSignal(GetVPanel());
@@ -46,6 +48,8 @@ void CSCModelDownloaderSettingsPage::ApplyChanges(void)
 
 	ApplyChangesToConVar(m_pAutoDownload->GetCvarName(), m_pAutoDownload->IsSelected());
 	ApplyChangesToConVar(m_pDownloadLatest->GetCvarName(), m_pDownloadLatest->IsSelected());
+
+	m_pMaxRetry->ApplyChanges();
 }
 
 void CSCModelDownloaderSettingsPage::OnApplyChanges(void)
@@ -57,6 +61,7 @@ void CSCModelDownloaderSettingsPage::OnResetData(void)
 {
 	m_pAutoDownload->Reset();
 	m_pDownloadLatest->Reset();
+	m_pMaxRetry->Reset();
 
 	auto scmodel_cdn = gEngfuncs.pfnGetCvarPointer("scmodel_cdn");
 

Plugins/SCModelDownloader/SCModelDatabase.cpp

@@ -39,4 +39,5 @@ class CSCModelDownloaderSettingsPage : public vgui::PropertyPage
 	DEFINE_CVAR_CHECK_BUTTON(DownloadLatest);
 #undef DEFINE_CVAR_CHECK_BUTTON
 
+	CCvarTextEntry* m_pMaxRetry{};
 };

Plugins/SCModelDownloader/SCModelDownloaderSettingsPage.cpp

@@ -19,6 +19,7 @@
 cvar_t *scmodel_autodownload = NULL;
 cvar_t *scmodel_downloadlatest = NULL;
 cvar_t* scmodel_cdn = NULL;
+cvar_t* scmodel_max_retry = NULL;
 
 cl_enginefunc_t gEngfuncs = {0};
 engine_studio_api_t IEngineStudio = { 0 };
@@ -39,6 +40,11 @@ int SCModel_CDN()
 	return (int)scmodel_cdn->value;
 }
 
+int SCModel_MaxRetry()
+{
+	return (int)scmodel_max_retry->value;
+}
+
 /*
 	Purpose: Reload model for players that are using the specified model
 */
@@ -113,6 +119,8 @@ void HUD_Init(void)
 
 	scmodel_cdn = gEngfuncs.pfnRegisterVariable("scmodel_cdn", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
 
+	scmodel_max_retry = gEngfuncs.pfnRegisterVariable("scmodel_max_retry", "3", FCVAR_CLIENTDLL | FCVAR_ARCHIVE);
+
 	gEngfuncs.pfnAddCommand("scmodel_reload", SCModel_Reload_f);
 
 	SCModelDatabase()->Init();