Skip to content

Commit 6c416a8

Browse files
committed
disk_avail corrections and test
1 parent 7960ee4 commit 6c416a8

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

+stdlib/+python/disk_available.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
try
88
di = py.shutil.disk_usage(p);
9-
f = int64(di.free);
9+
f = uint64(int64(di.free));
1010
% int64 first is for Matlab <= R2022a
1111
catch e
1212
warning(e.identifier, "disk_available(%s) failed: %s", p, e.message);
13-
f = [];
1413
end
1514

1615
end

+stdlib/+sys/disk_available.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
[s, t] = system(cmd);
1717
if s == 0
18-
t = strip(t);
19-
else
20-
t = "";
18+
t = uint64(str2double(t));
2119
end
2220

2321
end

+stdlib/cpu_arch.m

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
function a = cpu_arch()
44

5-
if stdlib.has_dotnet()
6-
a = stdlib.dotnet.cpu_arch();
7-
elseif stdlib.has_java()
5+
if stdlib.has_java()
86
a = stdlib.java.cpu_arch();
7+
elseif stdlib.has_dotnet()
8+
a = stdlib.dotnet.cpu_arch();
99
else
10-
a = computer('arch');
11-
end
12-
13-
try %#ok<*TRYNC>
14-
a = string(a);
10+
a = string(computer('arch'));
1511
end
1612

1713
end

+stdlib/disk_available.m

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
d {mustBeTextScalar}
1010
end
1111

12-
f = uint64(0);
13-
if ~stdlib.exists(d), return, end
14-
15-
if stdlib.has_dotnet()
16-
f = stdlib.dotnet.disk_available(d);
17-
elseif stdlib.has_java()
12+
if stdlib.has_java()
1813
f = stdlib.java.disk_available(d);
14+
elseif stdlib.has_dotnet()
15+
f = stdlib.dotnet.disk_available(d);
1916
elseif stdlib.has_python()
2017
f = stdlib.python.disk_available(d);
2118
else

test/TestDisk.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ function test_disk_available(tc, Ps, disk_available_fun)
3030

3131
zero = uint64(0);
3232

33+
da = disk_available_fun(Ps);
34+
35+
tc.verifyClass(da, 'uint64')
36+
3337
if stdlib.exists(Ps)
34-
tc.verifyGreaterThan(disk_available_fun(Ps), zero)
38+
tc.verifyGreaterThan(da, zero)
3539
else
36-
tc.verifyEqual(disk_available_fun(Ps), zero)
40+
tc.verifyEqual(da, zero)
3741
end
3842
end
3943

0 commit comments

Comments
 (0)