Skip to content

Commit 06420ed

Browse files
committed
Use OS default timeout in Plugin Installer
Handle dependency return codes properly
1 parent 5706680 commit 06420ed

File tree

1 file changed

+25
-4
lines changed

1 file changed

+25
-4
lines changed

Source/UI/PluginInstaller.cpp

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -990,12 +990,12 @@ void PluginInfoComponent::setDownloadURL(const String& url)
990990

991991
void PluginInfoComponent::run()
992992
{
993-
LOGD("\nDownloading Plugin: ", pInfo.pluginName, "... ");
994993

995994
// If a plugin has depencies outside its zip, download them
996995
for (int i = 0; i < pInfo.dependencies.size(); i++)
997996
{
998997
setStatusMessage("Downloading dependency: " + pInfo.dependencies[i]);
998+
LOGD("Downloading dependency: ", pInfo.dependencies[i], "... ");
999999

10001000
int retCode = downloadPlugin(pInfo.dependencies[i], pInfo.dependencyVersions[i], true);
10011001

@@ -1009,9 +1009,30 @@ void PluginInfoComponent::run()
10091009
LOGE("Download Failed!!");
10101010
return;
10111011
}
1012+
else if (retCode == ZIP_NOTFOUND)
1013+
{
1014+
AlertWindow::showMessageBoxAsync(AlertWindow::WarningIcon,
1015+
"[Plugin Installer] " + pInfo.dependencies[i],
1016+
"Could not find the ZIP file for " + pInfo.dependencies[i]
1017+
+ ". Please contact the developers.");
1018+
1019+
LOGE("Download Failed!!");
1020+
return;
1021+
}
1022+
else if(retCode == HTTP_ERR)
1023+
{
1024+
AlertWindow::showMessageBoxAsync(AlertWindow::WarningIcon,
1025+
"[Plugin Installer] " + pInfo.dependencies[i],
1026+
"HTTP request failed!!\nPlease check your internet connection...");
1027+
1028+
LOGE("HTTP request failed!! Please check your internet connection...");
1029+
return;
1030+
}
1031+
10121032
}
10131033

10141034
setStatusMessage("Downloading " + pInfo.displayName + " ...");
1035+
LOGD("Downloading Plugin: ", pInfo.pluginName, "... ");
10151036

10161037
// download the plugin
10171038
int dlReturnCode = downloadPlugin(pInfo.pluginName, pInfo.selectedVersion, false);
@@ -1296,7 +1317,7 @@ bool PluginInfoComponent::uninstallPlugin(const String& plugin)
12961317
AccessClass::getProcessorList()->fillItemList();
12971318
AccessClass::getProcessorList()->repaint();
12981319

1299-
if(pInfo.type == "Record Engine")
1320+
if(pInfo.type == "RecordEngine")
13001321
AccessClass::getControlPanel()->updateRecordEngineList();
13011322

13021323
uninstallButton.setVisible(false);
@@ -1320,7 +1341,7 @@ int PluginInfoComponent::downloadPlugin(const String& plugin, const String& vers
13201341

13211342
//Create input stream from the plugin's zip file URL
13221343
std::unique_ptr<InputStream> fileStream = fileUrl.createInputStream(URL::InputStreamOptions (URL::ParameterHandling::inAddress)
1323-
.withConnectionTimeoutMs (1000)
1344+
.withConnectionTimeoutMs (0)
13241345
.withNumRedirectsToFollow (5));
13251346

13261347
// Could not retrieve data
@@ -1505,7 +1526,7 @@ int PluginInfoComponent::downloadPlugin(const String& plugin, const String& vers
15051526
AccessClass::getProcessorList()->fillItemList();
15061527
AccessClass::getProcessorList()->repaint();
15071528

1508-
if(pInfo.type == "Record Engine")
1529+
if(pInfo.type == "RecordEngine")
15091530
AccessClass::getControlPanel()->updateRecordEngineList();
15101531

15111532
}

0 commit comments

Comments
 (0)