inode,device via python

Author: scivision

+stdlib/device.m

@@ -8,29 +8,10 @@
 
 i = [];
 
-if ispc() && stdlib.has_dotnet()
-  h = NET.addAssembly('System.Management');
-
-  r = stdlib.root_name(path);
-  queryLogicalDisk = sprintf('SELECT VolumeSerialNumber FROM Win32_LogicalDisk WHERE Caption = ''%s''', r);
-
-  % Create a ManagementObjectSearcher instance
-  searcher = System.Management.ManagementObjectSearcher(queryLogicalDisk);
-
-  % Get the collection of ManagementObject instances
-  logicalDisks = searcher.Get();
-
-  % Get the first result (should be at most one for a drive letter)
-  logicalDiskEnumerator = logicalDisks.GetEnumerator();
-  if logicalDiskEnumerator.MoveNext()
-    logicalDisk = logicalDiskEnumerator.Current;
-
-    % Get the VolumeSerialNumber property
-    % This property is a string in WMI, representing a 32-bit hexadecimal integer.
-    i = hex2dec(char(logicalDisk.GetPropertyValue('VolumeSerialNumber')));
-  end
-
-  delete(h)
+if stdlib.has_python()
+  i = uint64(py.pathlib.Path(path).stat().st_dev);
+elseif ispc() && stdlib.has_dotnet()
+  i = device_dotnet(path);
 elseif stdlib.isoctave()
   [s, err] = stat(path);
   if err == 0

+stdlib/has_python.m

@@ -0,0 +1,16 @@
+function y = has_python()
+
+try
+  pe = pyenv();
+catch e
+  if strcmp(e.identifier, 'Octave:undefined-function')
+    y = false;
+    return
+  else
+    rethrow(e);
+  end
+end
+
+y = ~isempty(pe.Version);
+
+end

+stdlib/inode.m

@@ -9,15 +9,17 @@
 
 i = [];
 
-if stdlib.isoctave()
+if stdlib.has_python()
+  i = uint64(py.pathlib.Path(path).stat().st_ino);
+elseif isunix() && stdlib.has_java() && stdlib.java_api() >= 11
+  % Java 1.8 is buggy in some corner cases, so we require at least 11.
+  opt = javaMethod("values", "java.nio.file.LinkOption");
+  i = javaMethod("getAttribute", "java.nio.file.Files", javaPathObject(path), "unix:ino", opt);
+elseif stdlib.isoctave()
   [s, err] = stat(path);
   if err == 0
     i = s.ino;
   end
-elseif isunix() && stdlib.java_api() >= 11
-  % Java 1.8 is buggy in some corner cases, so we require at least 11.
-  opt = javaMethod("values", "java.nio.file.LinkOption");
-  i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:ino", opt);
 end
 
 end

+stdlib/java_api.m

@@ -3,15 +3,15 @@
 
 function api = java_api()
 
+api = [];
+
 v = stdlib.java_version();
+if strempty(v), return, end
 
 % major version is first number before "."
 
 a = strsplit(v, '.');
-if(isempty(a))
-  api = [];
-  return
-end
+if(isempty(a)), return, end
 
 if a{1} == "1"
   api = str2double(a{2});

+stdlib/java_version.m

@@ -12,8 +12,10 @@
 
 v = javaMethod("getProperty", "java.lang.System", "java.version");
 
-try  %#ok<*TRYNC>
+try %#ok<*TRYNC>
   v = string(v);
 end
 
+end
+
 %!assert(!isempty(java_version()))

+stdlib/private/device_dotnet.m

@@ -0,0 +1,27 @@
+function i = device_dotnet(path)
+
+
+h = NET.addAssembly('System.Management');
+
+r = stdlib.root_name(path);
+queryLogicalDisk = sprintf('SELECT VolumeSerialNumber FROM Win32_LogicalDisk WHERE Caption = ''%s''', r);
+
+% Create a ManagementObjectSearcher instance
+searcher = System.Management.ManagementObjectSearcher(queryLogicalDisk);
+
+% Get the collection of ManagementObject instances
+logicalDisks = searcher.Get();
+
+% Get the first result (should be at most one for a drive letter)
+logicalDiskEnumerator = logicalDisks.GetEnumerator();
+if logicalDiskEnumerator.MoveNext()
+  logicalDisk = logicalDiskEnumerator.Current;
+
+  % Get the VolumeSerialNumber property
+  % This property is a string in WMI, representing a 32-bit hexadecimal integer.
+  i = hex2dec(char(logicalDisk.GetPropertyValue('VolumeSerialNumber')));
+end
+
+delete(h)
+
+end

+stdlib/python_version.m

@@ -1,6 +1,8 @@
+%% PYTHON_VERSION get the Python version used by MATLAB
+
 function v = python_version()
 
 pe = pyenv();
 v = pe.Version;
- 
+
 end

test/TestDisk.m

@@ -52,16 +52,21 @@ function test_filesystem_type(tc, Ps)
 
 function test_device(tc)
 
-tc.assumeTrue(ispc() || stdlib.has_java())
+tc.assumeTrue(stdlib.has_python() || (isunix() && stdlib.has_java() && stdlib.java_api() >= 11))
 
 if ispc()
   tc.verifyGreaterThan(stdlib.device(pwd()), 0)
 else
-  tc.assumeGreaterThanOrEqual(stdlib.java_api(), 11)
-
   tc.verifyEqual(stdlib.device("."), stdlib.device(pwd()))
 end
 end
 
+
+function test_inode(tc)
+tc.assumeTrue(stdlib.has_python() || (~ispc() && stdlib.has_java() && stdlib.java_api() >= 11))
+
+tc.verifyEqual(stdlib.inode("."), stdlib.inode(pwd()))
+end
+
 end
 end

test/TestJava.m

@@ -7,13 +7,6 @@
 
 methods (Test, TestTags=["java", "unix"])
 
-function test_inode(tc)
-tc.assumeFalse(ispc(), "not for Windows")
-tc.assumeGreaterThanOrEqual(stdlib.java_api(), 11)
-
-tc.verifyEqual(stdlib.inode("."), stdlib.inode(pwd()))
-end
-
 
 function test_owner(tc, Ps)