Merge pull request #4342 from corentin-soriano/speedup_keepass_import

Speedup keepass import by adding batch processing and sql transactions.

Author: nilsteampassnet

pages/import.js.php

@@ -495,7 +495,7 @@ function(data) {
         runtimes: "gears,html5,flash,silverlight,browserplus",
         browse_button: "import-keepass-attach-pickfile-keepass",
         container: "import-keepass-upload-zone",
-        max_file_size: "10mb",
+        max_file_size: "20mb",
         chunk_size: "0",
         unique_names: true,
         dragdrop: true,
@@ -731,7 +731,7 @@ function callRecurive(itemsList, foldersList, counter, itemsNumber) {
                                         data = {
                                             'edit-all': $('#import-keepass-edit-all-checkbox').prop('checked') === true ? 1 : 0,
                                             'edit-role': $('#import-keepass-edit-role-checkbox').prop('checked') === true ? 1 : 0,
-                                            'items': itemsToAdd[0],
+                                            'items': itemsToAdd.slice(0, 500),
                                             'folders': foldersList,
                                         }
                                         if (debugJavascript === true) {
@@ -771,7 +771,7 @@ function(data) {
                                                     $('#import-feedback-result').append(data.info+"<br>");
 
                                                     // Remove item from list
-                                                    itemsToAdd.shift();
+                                                    itemsToAdd.splice(0, 500);
 
                                                     // Do recursive call until step = finished
                                                     counter++

sources/import.queries.php

@@ -767,13 +767,17 @@ function handleGroups($groups, string $previousFolder, array $newItemsToAdd, int
             $receivedParameters['folders'],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
         );
-        $item = filter_var_array(
+        $post_items = filter_var_array(
             $receivedParameters['items'],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
         );
         $ret = '';
 
-        //foreach($post_items as $item) {
+        // Start transaction for better performance
+        DB::startTransaction();
+
+        // Import all items
+        foreach($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -871,8 +875,10 @@ function handleGroups($groups, string $previousFolder, array $newItemsToAdd, int
 
             // prepare return
             $ret .= "<li>".substr(stripslashes($item['Title']), 0, 500)." [".$destinationFolderMore['title']."]</li>";
-        //}
+        }
 
+        // Commit transaction.
+        DB::commit();
 
         echo prepareExchangedData(
             array(