This is VirtualC64 5.0b2

dirkwhoffmann · Jun 8, 2024 · 5c96285 · 5c96285
1 parent 8bd6757
commit 5c96285
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/Emulator/FileSystems/FileSystem.cpp b/Emulator/FileSystems/FileSystem.cpp
@@ -94,6 +94,12 @@ FileSystem::init(const D64File &d64)
     for (Block b = 0; b < (Block)blocks.size(); b++) {
         setErrorCode(b, d64.getErrorCode(b));
     }
+
+    // Update the cached directory information
+    scanDirectory();
+
+    // Print some debug information
+    if (FS_DEBUG) printDirectory();
 }
 
 void
@@ -120,6 +126,12 @@ FileSystem::init(class Disk &disk)
 
     // Import file system
     importVolume(buffer, len);
+
+    // Update the cached directory information
+    scanDirectory();
+
+    // Print some debug information
+    if (FS_DEBUG) printDirectory();
 }
 
 void
@@ -146,6 +158,7 @@ FileSystem::init(AnyCollection &collection)
         delete[] buffer;
     }
 
+    // Update the cached directory information
     scanDirectory();
 
     // Print some debug information
@@ -167,6 +180,9 @@ FileSystem::init(const string &path)
         // Import the folder
         importDirectory(path);
 
+        // Update the cached directory information
+        scanDirectory();
+
         // Print some debug information
         if (FS_DEBUG) printDirectory();
 

diff --git a/Emulator/FileSystems/FileSystem.h b/Emulator/FileSystems/FileSystem.h
@@ -229,16 +229,16 @@ class FileSystem : CoreObject {
     // Writing files
     //
 
-    // Returns the next free directory entry or creates one
-    FSDirEntry *getOrCreateNextFreeDirEntry();
-
     // Creates a new file
     bool makeFile(PETName<16> name, const u8 *buf, isize cnt);
 
 private:
 
     bool makeFile(PETName<16> name, FSDirEntry *entry, const u8 *buf, isize cnt);
 
+    // Returns the next free directory entry or creates one
+    FSDirEntry *getOrCreateNextFreeDirEntry();
+
 
     //
     // Integrity checking

diff --git a/Emulator/Media/Folder.cpp b/Emulator/Media/Folder.cpp
@@ -28,6 +28,11 @@ Folder::init(const string &path)
     if (!isCompatiblePath(path)) throw Error(ERROR_FILE_TYPE_MISMATCH);
 
     fs = new FileSystem(path);
+
+    // REMOVE ASAP
+    fs->scanDirectory();
+    fs->printDirectory();
+    printf("NumFiles: %ld\n", fs->numFiles());
 }
 
 PETName<16>
@@ -39,6 +44,7 @@ Folder::collectionName()
 isize
 Folder::collectionCount() const
 {
+    printf("collectionCount: %ld\n", fs->numFiles());
     return (isize)fs->numFiles();
 }
 

diff --git a/Emulator/Peripherals/Drive/Drive.cpp b/Emulator/Peripherals/Drive/Drive.cpp
@@ -423,7 +423,7 @@ Drive::insertMediaFile(class MediaFile &file, bool wp)
 
         AnyCollection &collection = dynamic_cast<AnyCollection &>(file);
         insertDisk(std::make_unique<Disk>(collection, wp));
-        
+
     } catch (...) {
 
         throw Error(ERROR_FILE_TYPE_MISMATCH);

diff --git a/Emulator/config.h b/Emulator/config.h
@@ -26,7 +26,7 @@
 #define SNP_MAJOR 5
 #define SNP_MINOR 0
 #define SNP_SUBMINOR 0
-#define SNP_BETA 1
+#define SNP_BETA 2
 
 // Uncomment these settings in a release build
 // #define RELEASEBUILD

diff --git a/VirtualC64.xcodeproj/project.pbxproj b/VirtualC64.xcodeproj/project.pbxproj
@@ -2802,7 +2802,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 240530;
+				CURRENT_PROJECT_VERSION = 240608;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
@@ -2823,7 +2823,7 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				LLVM_LTO = NO;
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 5.0b1;
+				MARKETING_VERSION = 5.0b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				OTHER_LDFLAGS = "-Wl,-rpath,@loader_path/../Frameworks";
@@ -2847,7 +2847,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 240530;
+				CURRENT_PROJECT_VERSION = 240608;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
@@ -2869,7 +2869,7 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 5.0b1;
+				MARKETING_VERSION = 5.0b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				OTHER_LDFLAGS = "-Wl,-rpath,@loader_path/../Frameworks";