Downloader::setOptions method.

ReadBufferSize option.
Version updated to 1.5.1

idp/downloader.cpp

@@ -9,6 +9,7 @@ Downloader::Downloader()
     stopOnError         = true;
     ownMsgLoop          = false;
     preserveFtpDirs     = true;
+    readBufferSize      = DEFAULT_READ_BUFSIZE;
     filesSize           = 0;
     downloadedFilesSize = 0;
     ui                  = NULL;
@@ -43,6 +44,13 @@ void Downloader::setInternetOptions(InternetOptions opt)
     }
 }
 
+void Downloader::setOptions(Downloader *d)
+{
+    stopOnError     = d->stopOnError;
+    preserveFtpDirs = d->preserveFtpDirs;
+    readBufferSize  = d->readBufferSize;
+}
+
 void Downloader::setComponents(tstring comp)
 {
     tstringtoset(components, comp, _T(','));
@@ -489,7 +497,7 @@ bool Downloader::checkMirrors(tstring url, bool download/* or get size */)
 
 bool Downloader::downloadFile(NetFile *netFile)
 {
-    BYTE  buffer[READ_BUFFER_SIZE];
+    BYTE  *buffer = new BYTE[readBufferSize];
     DWORD bytesRead;
     File  file;
 
@@ -506,6 +514,7 @@ bool Downloader::downloadFile(NetFile *netFile)
         setMarquee(false, stopOnError ? (netFile->size == FILE_SIZE_UNKNOWN) : false);
         updateStatus(msg(e.what()));
         storeError(msg(e.what()));
+        delete[] buffer;
         return false;
     }
 
@@ -514,6 +523,7 @@ bool Downloader::downloadFile(NetFile *netFile)
         setMarquee(false, stopOnError ? (netFile->size == FILE_SIZE_UNKNOWN) : false);
         updateStatus(msg("Cannot connect"));
         storeError();
+        delete[] buffer;
         return false;
     }
 
@@ -523,6 +533,7 @@ bool Downloader::downloadFile(NetFile *netFile)
         tstring errstr = msg("Cannot create file") + _T(" ") + netFile->name;
         updateStatus(errstr);
         storeError(errstr);
+        delete[] buffer;
         return false;
     }
 
@@ -542,16 +553,18 @@ bool Downloader::downloadFile(NetFile *netFile)
         {
             file.close();
             netFile->close();
+            delete[] buffer;
             return true;
         }
 
-        if(!netFile->read(buffer, READ_BUFFER_SIZE, &bytesRead))
+        if(!netFile->read(buffer, readBufferSize, &bytesRead))
         {
             setMarquee(false, netFile->size == FILE_SIZE_UNKNOWN);
             updateStatus(msg("Download failed"));
             storeError();
             file.close();
             netFile->close();
+            delete[] buffer;
             return false;
         }
 
@@ -582,6 +595,7 @@ bool Downloader::downloadFile(NetFile *netFile)
     netFile->close();
     netFile->downloaded = true;
 
+    delete[] buffer;
     return true;
 }
 

idp/downloader.h

@@ -13,7 +13,7 @@
 #include "ftpdir.h"
 
 #define DOWNLOAD_CANCEL_TIMEOUT 30000
-#define READ_BUFFER_SIZE        1024
+#define DEFAULT_READ_BUFSIZE    1024
 
 using namespace std;
 
@@ -50,6 +50,7 @@ class Downloader
     void      setComponents(tstring comp);
     void      setUi(Ui *newUi);
     void      setInternetOptions(InternetOptions opt);
+    void      setOptions(Downloader *d);
     void      setFinishedCallback(FinishedCallback callback);
     void      processMessages();
 
@@ -58,6 +59,7 @@ class Downloader
     bool preserveFtpDirs;
     bool downloadCancelled;
     bool downloadPaused;
+    int  readBufferSize;
 
 protected:
     bool openInternet();

idp/idp.cpp

@@ -71,6 +71,7 @@ bool idpGetFileSize(_TCHAR *url, DWORDLONG *size)
 {
     Downloader d;
     d.setInternetOptions(internetOptions);
+    d.setOptions(&downloader);
     d.setMirrorList(&downloader);
     d.addFile(STR(url), _T(""));
     *size = d.getFileSizes();
@@ -90,6 +91,7 @@ bool idpDownloadFile(_TCHAR *url, _TCHAR *filename)
 {
     Downloader d;
     d.setInternetOptions(internetOptions);
+    d.setOptions(&downloader);
     d.setMirrorList(&downloader);
     d.addFile(STR(url), STR(filename));
     return d.downloadFiles();
@@ -313,6 +315,17 @@ DWORD proxyVal(_TCHAR *value)
     return INTERNET_OPEN_TYPE_PRECONFIG;
 }
 
+int bufSizeVal(_TCHAR *value)
+{
+    string val = toansi(tstrlower(STR(value)));
+
+    if(val.compare("default") == 0) return DEFAULT_READ_BUFSIZE;
+    if(val.compare("auto")    == 0) return DEFAULT_READ_BUFSIZE;
+
+    int bufSize = _ttoi(value);
+    return bufSize ? bufSize : DEFAULT_READ_BUFSIZE;
+}
+
 void idpSetInternalOption(_TCHAR *name, _TCHAR *value)
 {
     if(!name)
@@ -329,6 +342,7 @@ void idpSetInternalOption(_TCHAR *name, _TCHAR *value)
     }
     else if(key.compare("stoponerror")      == 0) downloader.stopOnError         = boolVal(value);
     else if(key.compare("preserveftpdirs")  == 0) downloader.preserveFtpDirs     = boolVal(value);
+    else if(key.compare("readbuffersize")   == 0) downloader.readBufferSize      = bufSizeVal(value);
     else if(key.compare("retrybutton")      == 0) ui.hasRetryButton              = boolVal(value);
     else if(key.compare("redrawbackground") == 0) ui.redrawBackground            = boolVal(value);
     else if(key.compare("errordialog")      == 0) ui.errorDlgMode                = dlgVal(value);

idp/idp.rc

@@ -27,8 +27,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,0
- PRODUCTVERSION 1,5,0,0
+ FILEVERSION 1,5,1,0
+ PRODUCTVERSION 1,5,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
             VALUE "Comments", "https://code.google.com/p/inno-download-plugin, http://mitrichsoftware.wordpress.com"
             VALUE "CompanyName", "Mitrich Software"
             VALUE "FileDescription", "Inno Download Plugin"
-            VALUE "FileVersion", "1, 5, 0, 0"
+            VALUE "FileVersion", "1, 5, 1, 0"
             VALUE "InternalName", "idp"
             VALUE "LegalCopyright", "Copyright (C) 2013-2015 Mitrich Software"
             VALUE "OriginalFilename", "idp.dll"
             VALUE "ProductName", "Inno Download Plugin"
-            VALUE "ProductVersion", "1, 5, 0, 0"
+            VALUE "ProductVersion", "1, 5, 1, 0"
         END
     END
     BLOCK "VarFileInfo"