Merge pull request #460 from datalad/runprov-render

Small tweaks to rendering of runprov records
datalad · May 23, 2024 · 76bb8d9 · 76bb8d9
2 parents 68b7665 + 55ef5e5
commit 76bb8d9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/datalad_catalog/catalog/templates/dataset-template.html b/datalad_catalog/catalog/templates/dataset-template.html
@@ -461,7 +461,7 @@ <h5><span v-if="fund.name">{{fund.name}}</span><span v-else><em>(fund name not s
               <span v-else v-for="record in selectedDataset.provenance">
                 <b-container>
                   <b-row>
-                    <b-col>
+                    <b-col cols="3">
                       <b-card header-bg-variant="transparent" >
                         <template v-slot:header>
                           <b-row no-gutters>
@@ -486,8 +486,7 @@ <h5><span v-if="fund.name">{{fund.name}}</span><span v-else><em>(fund name not s
                         </b-card-text>
                       </b-card>
                     </b-col>
-                    <b-col cols="1"></b-col>
-                    <b-col cols="5">
+                    <b-col cols="6">
                       <b-card border-variant="dark">
                         <template v-slot:header class="text-center">
                             <b-card-title class="text-center"><i class="fas fa-terminal"></i>&nbsp;&nbsp;run-record</strong></b-card-title>
@@ -497,8 +496,11 @@ <h5><span v-if="fund.name">{{fund.name}}</span><span v-else><em>(fund name not s
                             <span class="text-muted"><i class="fas fa-code-commit"></i> {{record.dataset_version}}</span>
                           </small>
                         </b-card-text>
-                        <b-card-text class="border rounded p-2">
-                          {{record.description}}
+                        <small>
+                          <strong>&nbsp;Run command message: </strong><br>
+                        </small>
+                        <b-card-text class="shadow p-3 mb-3 bg-white rounded">
+                          <span style="white-space: pre-wrap;">{{record.description.replace('[DATALAD RUNCMD] ', '')}}</span>
                         </b-card-text>
                         <b-card-text >
                           <small>
@@ -523,14 +525,13 @@ <h5><span v-if="fund.name">{{fund.name}}</span><span v-else><em>(fund name not s
                               <span class="lfont"><i class="fas fa-user-check"></i></span>&nbsp;&nbsp;{{record.author.name}}
                             </b-col>
                             <b-col align-h="right">
-                              <small>{{record.datetime}}</small>
+                              <small>{{record.datetime.replace('T', ' ')}}</small>
                             </b-col>
                           </b-row>
                         </template>
                       </b-card>
                     </b-col>
-                    <b-col cols="1"></b-col>
-                    <b-col>
+                    <b-col cols="3">
                       <b-card header-bg-variant="transparent" >
                         <template v-slot:header>
                           <b-row no-gutters>

diff --git a/datalad_catalog/extractors/catalog_core.py b/datalad_catalog/extractors/catalog_core.py
@@ -201,11 +201,15 @@ def ri2url(ri):
             f["hostname"],
             ":" if f["port"] else "",
             f["port"],
-            f["path"]
-            if op.isabs(f["path"])
-            else "/{}".format(f["path"])
-            if f["path"].startswith("~")
-            else "/~/{}".format(f["path"]),
+            (
+                f["path"]
+                if op.isabs(f["path"])
+                else (
+                    "/{}".format(f["path"])
+                    if f["path"].startswith("~")
+                    else "/~/{}".format(f["path"])
+                )
+            ),
         )
     elif isinstance(ri, dsn.PathRI):
         # this has no chance of being resolved outside this machine

diff --git a/datalad_catalog/extractors/catalog_runprov.py b/datalad_catalog/extractors/catalog_runprov.py
@@ -54,14 +54,20 @@ def get_file_id(rec):
         rec["key"]
         if "key" in rec
         else "SHA1-s{}--{}".format(
-            rec["bytesize"]
-            if "bytesize" in rec
-            else 0
-            if rec["type"] == "symlink"
-            else os.stat(rec["path"]).st_size,
-            rec["gitshasum"]
-            if "gitshasum" in rec
-            else Digester(digests=["sha1"])(rec["path"])["sha1"],
+            (
+                rec["bytesize"]
+                if "bytesize" in rec
+                else (
+                    0
+                    if rec["type"] == "symlink"
+                    else os.stat(rec["path"]).st_size
+                )
+            ),
+            (
+                rec["gitshasum"]
+                if "gitshasum" in rec
+                else Digester(digests=["sha1"])(rec["path"])["sha1"]
+            ),
         )
     )
     return "datalad:{}".format(id_)