MahmoudEmad/herolib
1
0
Fork 0
Code Issues 55 Pull Requests 1 Actions Packages Projects Releases 26 Wiki Activity

refactor: Keep file extensions when getting files

Browse Source 
- Use `name_fix_keepext` instead of `name_fix`
- Update calls to `image_get`, `file_get`, and `file_or_image_get`
- Update checks in `image_exists`, `file_exists`, and `file_or_image_exists`
This commit is contained in:
Mahmoud-Emad
2025-11-17 13:39:25 +02:00
parent 49e48e7aca
commit 8dc2b360ba
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/data/atlas/atlas_save_test.v
View File

@@ -188,7 +188,7 @@ fn test_save_and_load_with_images() {
col := a.get_collection('docs')! col := a.get_collection('docs')!
// assert col.images.len == 1 // assert col.images.len == 1
assert col.image_exists('test')! assert col.image_exists('test.png')!
// // Save // // Save
// a.save(destination_meta: '/tmp/atlas_meta')! // a.save(destination_meta: '/tmp/atlas_meta')!
@@ -199,9 +199,9 @@ fn test_save_and_load_with_images() {
// loaded_col := a2.get_collection('docs')! // loaded_col := a2.get_collection('docs')!
// assert loaded_col.images.len == 1 // assert loaded_col.images.len == 1
// assert loaded_col.image_exists('test')! // assert loaded_col.image_exists('test.png')!
img_file := col.image_get('test')! img_file := col.image_get('test.png')!
assert img_file.name == 'test.png' assert img_file.name == 'test.png'
assert img_file.is_image() assert img_file.is_image()
} }

12
lib/data/atlas/collection.v
View File

@@ -104,7 +104,7 @@ pub fn (c Collection) page_get(name_ string) !&Page {
// Get an image by name // Get an image by name
pub fn (c Collection) image_get(name_ string) !&File { pub fn (c Collection) image_get(name_ string) !&File {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
mut img := c.files[name] or { return FileNotFound{ mut img := c.files[name] or { return FileNotFound{
collection: c.name collection: c.name
file: name file: name
@@ -117,7 +117,7 @@ pub fn (c Collection) image_get(name_ string) !&File {
// Get a file by name // Get a file by name
pub fn (c Collection) file_get(name_ string) !&File { pub fn (c Collection) file_get(name_ string) !&File {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
mut f := c.files[name] or { return FileNotFound{ mut f := c.files[name] or { return FileNotFound{
collection: c.name collection: c.name
file: name file: name
@@ -129,7 +129,7 @@ pub fn (c Collection) file_get(name_ string) !&File {
} }
pub fn (c Collection) file_or_image_get(name_ string) !&File { pub fn (c Collection) file_or_image_get(name_ string) !&File {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
mut f := c.files[name] or { return FileNotFound{ mut f := c.files[name] or { return FileNotFound{
collection: c.name collection: c.name
file: name file: name
@@ -145,20 +145,20 @@ pub fn (c Collection) page_exists(name_ string) !bool {
// Check if image exists // Check if image exists
pub fn (c Collection) image_exists(name_ string) !bool { pub fn (c Collection) image_exists(name_ string) !bool {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
f := c.files[name] or { return false } f := c.files[name] or { return false }
return f.ftype == .image return f.ftype == .image
} }
// Check if file exists // Check if file exists
pub fn (c Collection) file_exists(name_ string) !bool { pub fn (c Collection) file_exists(name_ string) !bool {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
f := c.files[name] or { return false } f := c.files[name] or { return false }
return f.ftype == .file return f.ftype == .file
} }
pub fn (c Collection) file_or_image_exists(name_ string) !bool { pub fn (c Collection) file_or_image_exists(name_ string) !bool {
name := texttools.name_fix(name_) name := texttools.name_fix_keepext(name_)
_ := c.files[name] or { return false } _ := c.files[name] or { return false }
return true return true
} }