FileOps.mkdir(): make return values indicate when a directory already exists

true: created, false: already exists, nil: failure

Author: line0

modules/DependencyControl.moon

@@ -67,7 +67,7 @@ class DependencyControl
     }
 
     dlm = DownloadManager!
-    platform, configDirExists, logsHaveBeenTrimmed, scheduledRemovalHasRun = "#{ffi.os}-#{ffi.arch}"
+    platform, logsHaveBeenTrimmed, scheduledRemovalHasRun = "#{ffi.os}-#{ffi.arch}"
     cumInitTime = 0
     fileOps.mkdir depConf.file, true
 
@@ -168,7 +168,7 @@ class DependencyControl
         @configDir = @@config.c.configDir
         @writeConfig shouldWriteConfig and saveRecordToConfig, false, false
 
-        configDirExists or= fileOps.mkdir aegisub.decode_path @configDir
+        fileOps.mkdir aegisub.decode_path @configDir
         logsHaveBeenTrimmed or= @@logger\trimFiles!
         scheduledRemovalHasRun or= fileOps.runScheduledRemoval @configDir
 

modules/DependencyControl/FileOps.moon

@@ -165,10 +165,11 @@ class FileOps
             return false, msgs.move.genericError\format source, target, err
 
         else -- target file not found, check directory
-            dir, err = FileOps.mkdir target, true
-            unless dir
+            res, dir = FileOps.mkdir target, true
+            if res == nil
                 return false, msgs.move.createDirError\format source, target, err
-            FileOps.logger\trace msgs.move.createdDir, dir
+            elseif res
+                FileOps.logger\trace msgs.move.createdDir, dir
 
         -- at this point the target directory exists and the target file doesn't, move the file
         res, err = os.rename source, target
@@ -199,19 +200,20 @@ class FileOps
     mkdir: (path, isFile) ->
         path, dev, dir, file = FileOps.validateFullPath path
         unless path
-            return false, msgs.attributes.badPath\format dev
+            return nil, msgs.attributes.badPath\format dev
         dir = isFile and table.concat({dev,dir or file}) or path
 
         mode, err = lfs.attributes dir, "mode"
         if err
-            return false, msgs.attributes.genericError\format err
+            return nil, msgs.attributes.genericError\format err
         elseif not mode
             res, err = lfs.mkdir dir
             if err -- can't create directory (possibly a permission error)
-                return false, msgs.mkdir.createError\format err
+                return nil, msgs.mkdir.createError\format err
+            return true, dir
         elseif mode != "directory" -- a file of the same name as the target directory is already present
-            return false, msgs.mkdir.otherExists\format mode
-        return dir
+            return nil, msgs.mkdir.otherExists\format mode
+        return false, dir
 
     attributes: (path, key) ->
         fullPath, dev, dir, file = FileOps.validateFullPath path

modules/DependencyControl/Updater.moon

@@ -276,8 +276,8 @@ class UpdateTask extends UpdaterBase
         -- check hashes before download, only update changed files
 
         tmpDir = aegisub.decode_path "?temp/l0.#{DependencyControl.__name}_#{'%04X'\format math.random 0, 16^4-1}"
-        res, err = fileOps.mkdir tmpDir
-        return finish -30, "#{tmpDir} (#{err})" unless res
+        res, dir = fileOps.mkdir tmpDir
+        return finish -30, "#{tmpDir} (#{err})" if res == nil
 
         @@logger\log msgs.performUpdate.updateReady, tmpDir