sys.filesystem_type faster

Author: scivision

+stdlib/+sys/disk_available.m

@@ -1,22 +1,22 @@
-function [t, cmd] = disk_available(p)
+function [t, cmd] = disk_available(file)
 
 t = [];
 
 if ispc()
-  cmd = sprintf('pwsh -c ([System.IO.DriveInfo]''%s'').AvailableFreeSpace', stdlib.absolute(p));
-  % r = stdlib.root_name(stdlib.absolute(p));
+  cmd = sprintf('pwsh -c ([System.IO.DriveInfo][System.IO.Path]::GetFullPath(''%s'')).AvailableFreeSpace', file);
+  % r = stdlib.root_name(stdlib.absolute(file));
   % cmd = sprintf('pwsh -c (Get-CimInstance -ClassName Win32_LogicalDisk -Filter \"DeviceID=''%s''\").FreeSpace', r);
   % slower
-  % dl = extractBefore(stdlib.absolute(p), 2);
+  % dl = extractBefore(stdlib.absolute(file), 2);
   % cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').SizeRemaining"', dl);
   % slowest
 elseif ismac()
-  cmd = sprintf('df -k "%s" | awk ''NR==2 {print $4*1024}''', p);
+  cmd = sprintf('df -k "%s" | awk ''NR==2 {print $4*1024}''', file);
 else
-  cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $4}''', p);
+  cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $4}''', file);
 end
 
-if stdlib.exists(p)
+if stdlib.exists(file)
   [s, t] = system(cmd);
   if s == 0
     t = str2double(t);

+stdlib/+sys/disk_capacity.m

@@ -1,19 +1,19 @@
-function [t, cmd] = disk_capacity(p)
+function [t, cmd] = disk_capacity(file)
 
 t = [];
 
 if ispc()
-  cmd = sprintf('pwsh -c ([System.IO.DriveInfo]''%s'').TotalSize', stdlib.absolute(p));
-  % dl = extractBefore(stdlib.absolute(p), 2);
+  cmd = sprintf('pwsh -c ([System.IO.DriveInfo][System.IO.Path]::GetFullPath(''%s'')).TotalSize', file);
+  % dl = extractBefore(stdlib.absolute(file), 2);
   % cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').Size"', dl);
   % slower
 elseif ismac()
-  cmd = sprintf('df -k "%s" | awk ''NR==2 {print $2*1024}''', p);
+  cmd = sprintf('df -k "%s" | awk ''NR==2 {print $2*1024}''', file);
 else
-  cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $2}''', p);
+  cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $2}''', file);
 end
 
-if stdlib.exists(p)
+if stdlib.exists(file)
   [s, t] = system(cmd);
   if s == 0
     t = str2double(t);

+stdlib/+sys/filesystem_type.m

@@ -6,8 +6,10 @@
 t = '';
 
 if ispc()
-  dl = extractBefore(stdlib.absolute(file), 2);
-  cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').FileSystem"', dl);
+  cmd = sprintf('pwsh -c ([System.IO.DriveInfo][System.IO.Path]::GetFullPath(''%s'')).DriveFormat', file);
+  % dl = extractBefore(stdlib.absolute(file), 2);
+  % cmd = sprintf('pwsh -c "(Get-Volume -DriveLetter ''%s'').FileSystem"', dl);
+  % slower
 elseif ismac()
   cmd = sprintf('df -aHY "%s" | awk ''NR==2 {print $2}''', file);
 else