add is_file(), is_folder()

Author: scivision

+stdlib/exists.m

@@ -11,16 +11,8 @@
 
 function y = exists(fpath)
 
-try
-  y = isfile(fpath) || isfolder(fpath);
-catch e
-  if strcmp(e.identifier, 'MATLAB:UndefinedFunction')
-    y = exist(fpath,'file') == 2 || exist(fpath, 'dir') == 7;
-  else
-    rethrow(e)
-  end
-end
+y = stdlib.is_file(fpath) || stdlib.is_folder(fpath);
 
 end
 
-%!assert (stdlib.exists('.'))
+%!assert (stdlib.exists('.'))

+stdlib/is_file.m

@@ -0,0 +1,18 @@
+%% IS_FILE Determine if path is a file
+%
+% for Matlab < R2017b that doesn't have isfile(), note that exist() also looks
+% on the Matlab path.
+
+function y = is_file(fpath)
+
+try
+  y = isfile(fpath);
+catch e
+  if strcmp(e.identifier, 'MATLAB:UndefinedFunction')
+    y = exist(fpath,'file') == 2;
+  else
+    rethrow(e)
+  end
+end
+
+end

+stdlib/is_folder.m

@@ -0,0 +1,18 @@
+%% IS_FOLDER Determine if path is a folder
+%
+% for Matlab < R2017b that doesn't have isfolder(), note that exist() also looks
+% on the Matlab path.
+
+function y = is_folder(fpath)
+
+try
+  y = isfolder(fpath);
+catch e
+  if strcmp(e.identifier, 'MATLAB:UndefinedFunction')
+    y = exist(fpath, 'dir') == 7;
+  else
+    rethrow(e)
+  end
+end
+
+end

test/TestDisk.m

@@ -1,14 +1,13 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2017b'}) ...
+          TestTags = {'R2017a'}) ...
   TestDisk < matlab.unittest.TestCase
 
 properties
 CI = is_ci()
 end
 
 properties (TestParameter)
-Ps = {".", "", "/", getenv('SystemDrive'), "not-exist"}
-Po = {mfilename("fullpath") + ".m", pwd(), ".", "", "not-exist"}
+Ps = {'.', '', '/', pwd(), getenv('SystemDrive'), 'not-exist'}
 B_ps = {'python', 'sys'}
 B_jps = {'java', 'python', 'sys'}
 B_jdps = {'java', 'dotnet', 'python', 'sys'}
@@ -147,13 +146,13 @@ function test_remove_file(tc)
 end
 
 
-function test_device(tc, Po, B_jps)
-[i, b] = stdlib.device(Po, B_jps);
+function test_device(tc, Ps, B_jps)
+[i, b] = stdlib.device(Ps, B_jps);
 tc.verifyClass(i, 'uint64')
 tc.assertEqual(char(b), B_jps)
 
 if ismember(B_jps, stdlib.Backend().select('device'))
-  if ~stdlib.exists(Po)
+  if ~stdlib.exists(Ps)
     tc.verifyEmpty(i)
   else
     tc.assertNotEmpty(i)
@@ -165,14 +164,14 @@ function test_device(tc, Po, B_jps)
 end
 
 
-function test_inode(tc, Po, B_jps)
+function test_inode(tc, Ps, B_jps)
 
-[i, b] = stdlib.inode(Po, B_jps);
+[i, b] = stdlib.inode(Ps, B_jps);
 tc.verifyClass(i, 'uint64')
 tc.assertEqual(char(b), B_jps)
 
 if ismember(B_jps, stdlib.Backend().select('inode'))
-  if ~stdlib.exists(Po)
+  if ~stdlib.exists(Ps)
     tc.verifyEmpty(i)
   else
     tc.assertNotEmpty(i)
@@ -185,13 +184,13 @@ function test_inode(tc, Po, B_jps)
 end
 
 
-function test_owner(tc, Po, B_jdps)
-[o, b] = stdlib.get_owner(Po, B_jdps);
+function test_owner(tc, Ps, B_jdps)
+[o, b] = stdlib.get_owner(Ps, B_jdps);
 tc.assertEqual(char(b), B_jdps)
 tc.verifyClass(o, 'char')
 
 if ismember(B_jdps, stdlib.Backend().select('get_owner'))
-  if ~stdlib.exists(Po)
+  if ~stdlib.exists(Ps)
     tc.verifyEqual(o, '')
   else
     tc.verifyGreaterThan(strlength(o), 0)

test/TestPlatform.m

@@ -16,7 +16,7 @@ function test_all_toolboxes(tc)
 end
 
 
-methods (Test, TestTags={'R2017b', 'toolbox'})
+methods (Test, TestTags={'R2017a', 'toolbox'})
 
 function test_has_parallel_toolbox(tc)
 y = stdlib.has_parallel_toolbox();
@@ -54,7 +54,7 @@ function test_perl(tc)
 end
 
 
-methods (Test, TestTags={'R2017b'})
+methods (Test, TestTags={'R2017a'})
 
 function test_platform_tell(tc)
 r = stdlib.platform_tell();