psdi-data-conversion 0.0.33__tar.gz → 0.0.35__tar.gz

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/.github/workflows/ci-cron.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   update-assets:
     name: Update common assets
-    runs-on: ubuntu-latest
+    runs-on: psdi-uk-runners
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/.github/workflows/ci-release.yml

@@ -56,7 +56,7 @@ jobs:
   build:
     needs: [tag]
     name: Build distribution 📦
-    runs-on: ubuntu-latest
+    runs-on: psdi-uk-runners
 
     steps:
       - uses: actions/checkout@v4

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/.github/workflows/job-anchore-scan.yml

@@ -32,7 +32,7 @@ jobs:
       contents: read # for actions/checkout to fetch code
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
       actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
-    runs-on: ubuntu-latest
+    runs-on: psdi-uk-runners
     steps:
     - name: Check out the code
       uses: actions/checkout@v4

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/.github/workflows/job-publish-doc.yml

@@ -26,7 +26,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: psdi-uk-runners
     steps:
       - name: Checkout
         uses: actions/checkout@v4

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psdi_data_conversion
-Version: 0.0.33
+Version: 0.0.35
 Summary: Chemistry file format conversion service, provided by PSDI
 Project-URL: Homepage, https://data-conversion.psdi.ac.uk/
 Project-URL: Documentation, https://psdi-uk.github.io/psdi-data-conversion/

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/psdi_data_conversion/static/content/convert.htm

@@ -10,11 +10,19 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>PSDI Data Conversion Service</title>
   <link rel="icon" type="image/x-icon" href="../img/psdi-icon-dark.svg">
+
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
+
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -99,16 +107,19 @@
       <p id="fileChecking">
       </p>
       <p id="convertFile">
-        <input type="checkbox" checked id="extCheck">Enforce file naming checking to ensure uploaded files (and files
+        <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
         contained in archives) all have the correct extension<br>
-        <input type="checkbox" id="requestLog">Also download log file for the conversion<br>
+        <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
         Select file to convert:
         <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
         If you have sensitive data you might prefer to use
         <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
         our service.<br>
-        <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
-          disabled=true>
+        <span class="convert-button-and-spinner">
+          <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
+            disabled=true>
+          <span class="loading-spinner spinner-border"></span>
+        </span>
       </p>
       <div class="medGap"></div>
     </div>

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/psdi_data_conversion/static/content/convertato.htm

@@ -10,11 +10,19 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>PSDI Data Conversion Service</title>
   <link rel="icon" type="image/x-icon" href="../img/psdi-icon-dark.svg">
+
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
+
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -43,16 +51,19 @@
       </p>
       <h6 id="heading"></h6>
       <p id="convertFile">
-        <input type="checkbox" checked id="extCheck">Enforce file naming checking to ensure uploaded files (and files
+        <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
         contained in archives) all have the correct extension<br>
-        <input type="checkbox" id="requestLog">Also download log file for the conversion<br>
+        <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
         Select file to convert:
         <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
         If you have sensitive data you might prefer to use
         <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
         our service.<br>
-        <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
-          disabled=true>
+        <span class="convert-button-and-spinner">
+          <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
+            disabled=true>
+          <span class="loading-spinner spinner-border"></span>
+        </span>
       </p>
     </div>
     <div class="largeGap"></div>

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/psdi_data_conversion/static/content/convertc2x.htm

@@ -7,14 +7,23 @@
 <html>
 
 <head>
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>PSDI Data Conversion Service</title>
   <link rel="icon" type="image/x-icon" href="../img/psdi-icon-dark.svg">
+
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
+
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -43,16 +52,19 @@
       </p>
       <h6 id="heading"></h6>
       <p id="convertFile">
-        <input type="checkbox" checked id="extCheck">Enforce file naming checking to ensure uploaded files (and files
+        <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
         contained in archives) all have the correct extension<br>
-        <input type="checkbox" id="requestLog">Also download log file for the conversion<br>
+        <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
         Select file to convert:
         <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
         If you have sensitive data you might prefer to use
         <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
         our service.<br>
-        <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
-          disabled=true>
+        <span class="convert-button-and-spinner">
+          <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
+            disabled=true>
+          <span class="loading-spinner spinner-border"></span>
+        </span>
       </p>
     </div>
     <div class="largeGap"></div>

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/psdi_data_conversion/static/javascript/convert_common.js

@@ -58,6 +58,8 @@ export function commonConvertReady(converter) {
 // Converts user-supplied file to another format and downloads the resulting file
 export function convertFile(form_data, download_fname, fname) {
 
+    showSpinner();
+
     let convertTimedOut = false;
 
     var jqXHR = $.ajax({
@@ -68,6 +70,7 @@ export function convertFile(form_data, download_fname, fname) {
         contentType: false,
         timeout: CONVERT_TIMEOUT,
         success: async function () {
+            hideSpinner();
             if (!convertTimedOut) {
                 await downloadFile(`../downloads/${download_fname}`, download_fname)
 
@@ -105,6 +108,7 @@ export function convertFile(form_data, download_fname, fname) {
                 })
         },
         error: function (xmlhttprequest, textstatus, message) {
+            hideSpinner();
             if (textstatus === "timeout") {
                 convertTimedOut = true;
                 alert("ERROR: Conversion attempt timed out. This may be because the conversion is too complicated, " +
@@ -216,7 +220,8 @@ function checkFile(event) {
         if (message !== "")
             message += "\n\n";
         message += "The file exceeds the maximum size limit of " + (max_file_size / MEGABYTE).toFixed(2) +
-            " MB; its size is " + (file.size / MEGABYTE).toFixed(2) + " MB.";
+            " MB; its size is " + (file.size / MEGABYTE).toFixed(2) + " MB. Please either log in for an increased " +
+            "file size limit, or see the Downloads page to run the app locally with no limit.";
         allGood = false;
     }
 
@@ -249,4 +254,19 @@ async function downloadFile(path, filename) {
             a.click();
             a.remove();
         });
+}
+
+
+/**
+ * Show the loading spinner
+ */
+function showSpinner() {
+    $(".loading-spinner").css({ display: "inherit" });
+}
+
+/**
+ * Hide the loading spinner
+ */
+function hideSpinner() {
+    $(".loading-spinner").css({ display: "none" });
 }

{psdi_data_conversion-0.0.33 → psdi_data_conversion-0.0.35}/psdi_data_conversion/static/styles/format.css

@@ -144,4 +144,23 @@ select#dark-background option {
 
 [production-mode=False] .dev-only {
   display: none;
+}
+
+.footer__hline hr {
+  border-top-style   : none;
+  border-bottom-style: inset;
+  border-bottom-width: 1px;
+}
+
+/* Convert button and loading spinner */
+.convert-button-and-spinner {
+  display       : flex;
+  flex-direction: row;
+  align-items   : center;
+}
+
+.loading-spinner {
+  display: none;
+  color  : var(--ifm-color-primary);
+  scale  : 75%;
 }