fixes in volume support

setup.py

@@ -42,7 +42,7 @@
             "text-fabric-make = tf.client.make.build:main",
         ]
     },
-    version='10.2.2',
+    version='10.2.3',
     description="""Processor and browser for Text Fabric Data""",
     author="Dirk Roorda",
     author_email="text.annotation@icloud.com",

text_fabric.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: text-fabric
-Version: 10.2.2
+Version: 10.2.3
 Summary: Processor and browser for Text Fabric Data
 Home-page: https://github.com/annotation/text-fabric
 Author: Dirk Roorda

tf/docs/about/releases.md

@@ -10,7 +10,7 @@ See the app-specific tutorials via `tf.about.corpora`.
 
 ## 10
 
-## 10.2.2
+## 10.2.2-3
 
 2022-09-08
 
@@ -19,6 +19,8 @@ It is detected whether it runs in interactive mode (e.g. Jupyter notebook) or no
 If not, the display methods of the Jupyter notebook are suppressed, 
 and many outputs are done in plain text instead of HTML.
 
+Fixes in volume support.
+
 ## 10.2.1
 
 2022-08-23

tf/parameters.py

@@ -9,7 +9,7 @@
 from zipfile import ZIP_DEFLATED
 
 
-VERSION = '10.2.2'
+VERSION = '10.2.3'
 """Program version.
 
 This value is under control of the update process, as run by

tf/volumes/collect.py

@@ -68,7 +68,7 @@ def collect(
     silent=SILENT_D,
     overwrite=False,
 ):
-    """Creates a work out of a number of volumes.
+    """Creates a collection out of a number of volumes.
 
     The volumes are individual TF data sets, the work is a new TF data set.
 

tf/volumes/extract.py

@@ -75,7 +75,7 @@ def getVolumes(volumesLocation):
                     if triggered:
                         volumes.append(vol)
 
-    return volumes
+    return sorted(volumes)
 
 
 def extract(
@@ -284,8 +284,9 @@ def checkVolumeLocs():
         good = True
 
         removable = set()
-        for name in volumeData:
+        for (name, v) in volumeData.items():
             loc = f"{volumesLocation}/{name}"
+            v["location"] = loc
             if not dirEmpty(loc):
                 if overwrite is None:
                     info(
@@ -539,7 +540,7 @@ def remapFeatures():
             metaData = {}
             v["metaData"] = metaData
             headStr = "-".join(str(head) for head in v["heads"])
-            volumeMeta = name if headStr == name else f"{name}:{headStr}"
+            volumeMeta = name if headStr == str(name) else f"{name}:{headStr}"
 
             for (feat, meta) in metaDataTotal.items():
                 metaData[feat] = {k: m for (k, m) in meta.items()}
@@ -662,7 +663,7 @@ def writeTf():
             nodeFeatures = v["nodeFeatures"]
             edgeFeatures = v["edgeFeatures"]
             loc = f"{volumesLocation}/{name}"
-            v["loc"] = loc
+            v["location"] = loc
             TF = FabricCore(locations=loc, silent=DEEP)
             if not TF.save(
                 metaData=metaData,
@@ -682,26 +683,29 @@ def process():
         if not checkVolumes():
             return None if show else False
         if checkOnly:
-            if not volumeData:
-                result = {name: v["heads"] for (name, v) in volumeData.items()}
+            if volumeData:
+                if show:
+                    for (name, v) in volumeData.items():
+                        location = ux(v['location'])
+                        print(f"{name:<20} @ {location}")
+                else:
+                    return volumeData
+            else:
                 if show:
-                    for (name, v) in result.items():
-                        location = ux(f"{v['name']}/{name}")
-                        print(f"{name:<20}")
+                    print("No volumes")
                 else:
-                    return result
+                    return {}
         if not getTopLevels():
             return None if show else False
         if not checkVolumes2():
             return None if show else False
         if checkOnly:
-            result = {name: v["heads"] for (name, v) in volumeData.items()}
             if show:
-                for (name, v) in result.items():
-                    location = ux(f"{v['name']}/{name}")
-                    print(f"{name:<20}")
+                for (name, v) in volumeData.items():
+                    location = ux(v['location'])
+                    print(f"{name:<20} @ {location}")
             else:
-                return result
+                return volumeData
         if not distributeNodes():
             return None if show else False
         if not remapFeatures():
@@ -711,12 +715,12 @@ def process():
         info("All done")
         result = {
             name: dict(location=f"{volumesLocation}/{name}", new=name in volumeData)
-            for name in givenVolumes
+            for name in sorted(givenVolumes | set(volumeData))
         }
         if show:
             for (name, v) in result.items():
                 new = " (new)" if v["new"] else " " * 6
-                location = ux(f"{v['location']}/{name}")
+                location = ux(v['location'])
                 print(f"{name:<20}{new} @ {location}")
         else:
             return result