@photostructure/fs-metadata 1.3.0 → 1.4.1

package/dist/index.d.cts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */

package/dist/index.d.mts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */

package/dist/index.d.ts

@@ -79,7 +79,7 @@ interface MountPoint {
      * verifyVolume`.
      *
      * If there are non-critical errors while extracting metadata, those error
-     * messages may be added to this field (say, from blkid or gio).
+     * messages may be added to this field (say, from blkid).
      *
      * @see {@link VolumeHealthStatuses} for values returned by Windows.
      */

package/dist/index.mjs

@@ -649,11 +649,6 @@ async function* readLinks(directory) {
 // src/linux/mount_points.ts
 import { readFile } from "fs/promises";
 
-// src/mount_point.ts
-function isMountPoint(obj) {
-  return isObject(obj) && "mountPoint" in obj && isNotBlank(obj.mountPoint);
-}
-
 // src/options.ts
 import { availableParallelism as availableParallelism2 } from "os";
 import { env as env2 } from "process";
@@ -1135,49 +1130,25 @@ function parseMtab(content) {
 }
 
 // src/linux/mount_points.ts
-async function getLinuxMountPoints(native, opts) {
+async function getLinuxMountPoints(opts) {
   const o = optionsWithDefaults(opts);
-  const raw = [];
-  try {
-    const arr = await (await native()).getGioMountPoints?.();
-    debug("[getLinuxMountPoints] GIO mount points: %o", arr);
-    if (arr != null) raw.push(...arr);
-  } catch (error) {
-    debug("Failed to get GIO mount points: %s", error);
-  }
   let cause;
   for (const input of o.linuxMountTablePaths) {
     try {
       const mtabContent = await readFile(input, "utf8");
-      const arr = parseMtab(mtabContent).map((ea) => mountEntryToMountPoint(ea)).filter((ea) => ea != null);
-      debug("[getLinuxMountPoints] %s mount points: %o", input, arr);
-      if (arr.length > 0) {
-        raw.push(...arr);
-        break;
+      const results = parseMtab(mtabContent).map((ea) => mountEntryToMountPoint(ea)).filter((ea) => ea != null);
+      debug("[getLinuxMountPoints] %s mount points: %o", input, results);
+      if (results.length > 0) {
+        return results;
       }
     } catch (error) {
       cause ??= toError(error);
     }
   }
-  const byMountPoint = /* @__PURE__ */ new Map();
-  for (const ea of raw) {
-    const prior = byMountPoint.get(ea.mountPoint);
-    const merged = { ...compactValues(prior), ...compactValues(ea) };
-    if (isMountPoint(merged)) {
-      byMountPoint.set(merged.mountPoint, merged);
-    }
-  }
-  if (byMountPoint.size === 0) {
-    throw new WrappedError(
-      `Failed to find any mount points (tried: ${JSON.stringify(o.linuxMountTablePaths)})`,
-      { cause }
-    );
-  }
-  const results = [...byMountPoint.values()];
-  debug("[getLinuxMountPoints] %o", {
-    results: results.map((ea) => ea.mountPoint)
-  });
-  return results;
+  throw new WrappedError(
+    `Failed to find any mount points (tried: ${JSON.stringify(o.linuxMountTablePaths)})`,
+    { cause }
+  );
 }
 async function getLinuxMtabMetadata(mountPoint, opts) {
   let caughtError;
@@ -1304,7 +1275,7 @@ async function _getVolumeMountPoints(o, nativeFn2) {
       points.length
     );
     return points;
-  })() : getLinuxMountPoints(nativeFn2, o));
+  })() : getLinuxMountPoints(o));
   debug("[getVolumeMountPoints] raw mount points: %o", raw);
   const compacted = raw.map((ea) => compactValues(ea)).filter((ea) => isNotBlank(ea.mountPoint));
   for (const ea of compacted) {