Merge pull request #153 from p2000t/150-retroforum-basic-demo-cassett…

…e-files-keep-being-added Replaced al_filename_exists by al_open_directory to check if dir exists
p2000t · Apr 20, 2024 · cb79087 · cb79087
2 parents 47ce6a3 + 0c97505
commit cb79087
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,21 +4,21 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Make",
+            "label": "Make Allegro",
             "type": "shell",
-            "command": "make",
+            "command": "make allegro",
             "group": "build",
             "problemMatcher": []
         },
         {
-            "label": "Build and Run",
+            "label": "Build and Run Allegro",
             "type": "shell",
             "command": "./M2000",
             "args": [
                 //"test/SAA5050.cas"
             ],
             "dependsOn": [
-                "Make"
+                "Make Allegro"
             ],
             "group": {
                 "kind": "build",

diff --git a/src/allegro/Main.c b/src/allegro/Main.c
@@ -186,6 +186,14 @@ int CopyFile(ALLEGRO_PATH *sourceFolder, const char * filename, ALLEGRO_PATH *de
   return ret;
 }
 
+bool al_directory_exists(const char * dir)
+{
+  ALLEGRO_FS_ENTRY *fsDir = al_create_fs_entry(dir);
+  bool exists = al_open_directory(fsDir);
+  al_destroy_fs_entry(fsDir);
+  return exists;
+}
+
 void InitDocumentFolders() 
 {
   int i;
@@ -197,11 +205,11 @@ void InitDocumentFolders()
   CopyFile(resourcePath, "README.md", docPath);
   al_set_path_filename(docPath, NULL);
 
-  if (!al_filename_exists(al_path_cstr(userCassettesPath, PATH_SEPARATOR)))
+  if (!al_directory_exists(al_path_cstr(userCassettesPath, PATH_SEPARATOR)))
     for (i=0; installCassettes[i]; i++)
       CopyFile(resourcePath, installCassettes[i], userCassettesPath);
 
-  if (!al_filename_exists(al_path_cstr(userCartridgesPath, PATH_SEPARATOR)))
+  if (!al_directory_exists(al_path_cstr(userCartridgesPath, PATH_SEPARATOR)))
     for (i=0; installCartridges[i]; i++)
       CopyFile(resourcePath, installCartridges[i], userCartridgesPath);