Upload progress

.gitignore

@@ -258,3 +258,4 @@ ModelManifest.xml
 /SiaDrive_Packager_Release.iss
 /3rd_party/Sia-v1.2.1-windows-amd64.zip
 /src/siadrive_api/siadrivever.cpp
+/3rd_party/Sia-v1.2.2-windows-amd64.zip

CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.3)
 
 #Common Configuration Pre-setup
 set(SIADRIVE_VERSION 0.1_Alpha4)
-set(SIA_VERSION 1.2.1)
+set(SIA_VERSION 1.2.2)
 string(REPLACE "\\" "/" SIADRIVE_INSTALL_FOLDER ${SIADRIVE_INSTALL_FOLDER})
 set(EXTERNAL_BUILD_ROOT ${CMAKE_BINARY_DIR}/external)
 set(EXTERNAL_BUILD_TYPE ${CMAKE_BUILD_TYPE})

htdocs/index.html

@@ -218,8 +218,8 @@
       <div style="display: flex; flex-direction: column; height: inherit;">
         <div class="box" style="flex-grow: 1; display: flex; flex-direction: column;">
           <h1 style="flex-grow: 0;">Upload Progress <a href="javascript:void(0)" id="ID_RenterUploadsOk">back</a></h1>
-          <div style="padding: 0; margin: 0; flex-grow: 1; display: flex; overflow-x: hidden; overflow-y: scroll;">
-            <table style="flex-grow: 1;white-space: nowrap;" class="display" id="ID_UploadProgressTable"></table>
+          <div id="ID_UploadProgressTableContainer" style="padding: 0; margin: 0; flex-grow: 1;">
+            <table class="display" id="ID_UploadProgressTable"></table>
           </div>
         </div>
       </div>

htdocs/js/index.js

@@ -1,13 +1,5 @@
 // Main
 (() => {
-  $.fn.dataTableExt.oApi.fnStandingRedraw = (settings) => {
-    const before = settings._iDisplayStart;
-    settings.oApi._fnReDraw(settings);
-    settings._iDisplayStart = before;
-    settings.oApi._fnCalculateEnd(settings);
-    settings.oApi._fnDraw(settings);
-  };
-
   function copyToClipboard(text) {
     const clip = document.createElement('input');
     clip.id = 'clipper';
@@ -124,10 +116,12 @@
         },
         setUploadProgress: (items) => {
           items = items || "[]";
-          const table = $('#ID_UploadProgressTable').dataTable();
-          table.clear();
-          table.rows.add(JSON.parse(items));
-          table.draw();
+
+          const table = $('#ID_UploadProgressTable');
+          const dataTable = table.DataTable();
+          dataTable.clear();
+          dataTable.rows.add(JSON.parse(items));
+          dataTable.draw(false);
         }
       };
     })();
@@ -700,6 +694,7 @@
   window.addEventListener('load', ()=> {
     console.log('Main window load');
     document.getElementById('ID_ServerVersion').innerText = '...';
+
     $('#ID_UploadProgressTable').DataTable( {
       data: [],
       columns: [
@@ -707,10 +702,11 @@
         { title: "Progress" }
       ],
       deferRender:    true,
-      scrollY:        200,
-      scrollCollapse: true,
+      scrollY:        300,
+      scrollCollapse: false,
       scroller:       true
     } );
+
     reloadApplication(true);
   });
 })();

package.cmd

@@ -3,7 +3,7 @@
 set ROOT=%~dp0%
 set PATH=%ROOT%bin;%PATH%
 set MODE=%1
-set SIA_VERSION=v1.2.1
+set SIA_VERSION=v1.2.2
 set INNO_COMPILER=C:\Program Files (x86)\Inno Setup 5\Compil32.exe
 pushd "%ROOT%"
 

src/siadrive/main.cpp

@@ -58,7 +58,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
       CefSettings settings;
       settings.no_sandbox = true;
 #ifdef _DEBUG
-      settings.remote_debugging_port = 8080;
+      settings.remote_debugging_port = 18080;
       settings.single_process = true;
       settings.command_line_args_disabled = true;
       settings.log_severity = LOGSEVERITY_VERBOSE;

src/siadrive_api/siadriveconfig.cpp

@@ -134,7 +134,7 @@ bool CSiaDriveConfig::LoadDefaults()
 
   if (!CheckLockWalletOnExit())
   {
-    SetLockWalletOnExit(true);
+    SetLockWalletOnExit(false);
     changed = true;
   }