salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

File metadata for CPMFS works.

Browse Source
This commit is contained in:
David Given
2022-08-31 21:58:11 +02:00
parent c375b73db9
commit 4c0971800d
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vfs/acorndfs.cc
View File

@@ -133,7 +133,7 @@ public:
Bytes getFile(const Path& path)
{
AcornDfsDirectory dir(this);
AcornDfsDirectory dir(this);
auto dirent = dir.findFile(path);
int sectors = (dirent->length + 255) / 256;
@@ -153,7 +153,7 @@ public:
{
std::map<std::string, std::string> attributes;
AcornDfsDirectory dir(this);
AcornDfsDirectory dir(this);
auto dirent = dir.findFile(path);
attributes[FILENAME] = dirent->filename;
attributes[LENGTH] = fmt::format("{}", dirent->length);
@@ -172,7 +172,6 @@ public:
}
private:
private:
const AcornDfsProto& _config;
};

14
lib/vfs/brother120fs.cc
View File

@@ -54,7 +54,7 @@ class BrotherDirectory
public:
BrotherDirectory(Filesystem* fs)
{
/* Read directory. */
/* Read directory. */
int inode = 0;
for (int block = 0; block < DIRECTORY_SECTORS; block++)
@@ -68,11 +68,11 @@ public:
auto de = std::make_unique<Brother120Dirent>(inode, buffer);
usedSectors += de->sector_length;
//dirents.push_back(std::move(de));
// dirents.push_back(std::move(de));
}
}
/* Read FAT. */
/* Read FAT. */
Bytes bytes = fs->getLogicalSector(FAT_START_SECTOR, FAT_SECTORS);
ByteReader br(bytes);
@@ -97,7 +97,7 @@ public:
}
public:
std::vector<uint16_t> fat;
std::vector<uint16_t> fat;
std::vector<std::unique_ptr<Brother120Dirent>> dirents;
uint32_t usedSectors = 0;
};
@@ -134,7 +134,7 @@ public:
if (!path.empty())
throw FileNotFoundException();
BrotherDirectory dir(this);
BrotherDirectory dir(this);
std::vector<std::shared_ptr<Dirent>> result;
for (auto& dirent : dir.dirents)
@@ -145,7 +145,7 @@ public:
Bytes getFile(const Path& path)
{
BrotherDirectory dir(this);
BrotherDirectory dir(this);
auto dirent = dir.findFile(path);
int sector = dirent->start_sector;
@@ -164,7 +164,7 @@ public:
{
std::map<std::string, std::string> attributes;
BrotherDirectory dir(this);
BrotherDirectory dir(this);
auto dirent = dir.findFile(path);
attributes[FILENAME] = dirent->filename;
attributes[LENGTH] = fmt::format("{}", dirent->length);

26
lib/vfs/cpmfs.cc
View File

@@ -82,6 +82,32 @@ public:
{
}
std::map<std::string, std::string> getMetadata()
{
mount();
unsigned usedBlocks = _dirBlocks;
for (int d = 0; d < _config.dir_entries(); d++)
{
auto entry = getEntry(d);
if (!entry)
continue;
for (unsigned block : entry->allocation_map)
{
if (block)
usedBlocks++;
}
}
std::map<std::string, std::string> attributes;
attributes[VOLUME_NAME] = "";
attributes[TOTAL_BLOCKS] = fmt::format("{}", _filesystemBlocks);
attributes[USED_BLOCKS] = fmt::format("{}", usedBlocks);
attributes[BLOCK_SIZE] = fmt::format("{}", _config.block_size());
return attributes;
}
FilesystemStatus check()
{
return FS_OK;