display in-progress message for large transfers, preserve top level folder name

axfelix · axfelix · commit 8f9f1640ec12 · 2020-09-24T14:19:17.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 build
 moveit.spec
+__pycache__/
 .DS_Store
 gui/node_modules
 gui/package-lock.json
 gui/install
+gui/sfu-moveit-win32-x64/
diff --git a/gui/inProgress.html b/gui/inProgress.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>MoveIt</title>
+  <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+  <script>window.jQuery = window.$ = require('jquery');</script>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+</head>
+
+<body>
+  <h3 align="center">Bagging...<div class="version"></div></h3><br/>
+</body>
+
+</html>
diff --git a/gui/makePackage.js b/gui/makePackage.js
@@ -34,7 +34,27 @@ function package() {
     packageFolder = dialog.showOpenDialogSync({properties: ["openDirectory"]});
     if (packageFolder){
       notifier.notify({"title" : "MoveIt", "message" : "Creating transfer package..."});
+      var window = remote.getCurrentWindow();
+        var childWindow = new remote.BrowserWindow({ 
+          parent: window, 
+          modal: true, 
+          show: false, 
+          width: 300, 
+          height: 100, 
+          webPreferences: {
+            nodeIntegration: true
+          }
+        });
+        childWindow.loadURL(require('url').format({
+          pathname: path.join(__dirname, 'inProgress.html'),
+          protocol: 'file:',
+          slashes: true
+        }));
+        childWindow.once('ready-to-show', () => {
+          childWindow.show()
+        });
       client.invoke("bag_package", contactname, jobtitle, department, email, phone, creator, rrsda, title, datefrom, dateto, description, metadata, JSON.stringify(packageFolder[0]), function(error, res, more) {
+        childWindow.close();
         if (res === true){
           notifier.notify({"title" : "MoveIt", "message" : "Transfer package has been created on desktop."});
           var configblock = {"contactname": contactname, "jobtitle": jobtitle, "department": department, "email": email, "phone": phone};
diff --git a/moveit.py b/moveit.py
@@ -18,8 +18,8 @@ def bag_package(self, contactname, jobtitle, department, email, phone, creator,
         if os.path.isdir(bag_dir_parent):
             shutil.rmtree(bag_dir_parent)
         bag_dir = os.path.join(bag_dir_parent, 'bag')
-        os.makedirs(bag_dir)
-        copy_tree(os.path.normpath(package_folder.strip('"')), bag_dir)
+        os.makedirs(os.path.join(bag_dir, os.path.basename(package_folder.strip('"'))))
+        copy_tree(os.path.normpath(package_folder.strip('"')), os.path.join(bag_dir, os.path.basename(package_folder.strip('"'))))
 
         for root, sub, files in os.walk(bag_dir):
             for file in files:
