completed diskio file lister

compiler/res/prog8lib/diskio.p8

@@ -59,69 +59,51 @@ io_error:
     }
 
 
-    sub listfiles(ubyte drivenumber, uword pattern, ubyte prefixOrSuffix,
+    sub listfiles(ubyte drivenumber, uword pattern, ubyte matchSuffix,
                   uword filenamesbufferptr, uword blocksizesptr, ubyte max_files) -> ubyte {
-        ; -- returns a list of files in the directory matching the given pattern (optional)
+        ; -- returns a list of files in the directory matching the given prefix or suffix (optional)
         ;    their blocksizes will be put into the uword array given by blocksizesptr
         ;    their names will be concatenated into the filenamesbuffer, separated by a 0-byte
-        ;    The buffer should be at least 17 times max_files and the block sizes array should be big enough too.
+        ;    The buffer should be at least 17 * max_files and the block sizes array should be that large as well.
         if max_files==0  return 0
-        if pattern!=0 and strlen(pattern)==0  pattern=0
-
-;        @(blocksizesptr) = lsb(333)
-;        @(blocksizesptr+1) = msb(333)
-;        @(blocksizesptr+2) = lsb(444)
-;        @(blocksizesptr+3) = msb(444)
-;        @(blocksizesptr+4) = lsb(555)
-;        @(blocksizesptr+5) = msb(555)
-;        str name1 = "filename1.txt"
-;        str name2 = "filename2.txt"
-;        str name3 = "filename3.txt"
-;        memcopy(name1, filenamesbufferptr, len(name1)+1)
-;        filenamesbufferptr += len(name1) + 1
-;        memcopy(name2, filenamesbufferptr, len(name2)+1)
-;        filenamesbufferptr += len(name2) + 1
-;        memcopy(name3, filenamesbufferptr, len(name3)+1)
-;        filenamesbufferptr += len(name3) + 1
 
         ubyte num_files = 0
+        ubyte pattern_size = 0
+        if pattern!=0
+            pattern_size = strlen(pattern)
 
         c64.SETNAM(1, "$")
         c64.SETLFS(1, drivenumber, 0)
         void c64.OPEN()          ; open 1,8,0,"$"
         if_cs
-            goto io_error
+            goto close_end
         void c64.CHKIN(1)        ; use #1 as input channel
         if_cs
-            goto io_error
+            goto close_end
 
         repeat 4 {
             void c64.CHRIN()     ; skip the 4 prologue bytes
         }
 
         ubyte disk_name = true
+        uword last_filename_ptr = filenamesbufferptr
 
         while not c64.READST() {
-            if disk_name {
-                void c64.CHRIN()
-                void c64.CHRIN()
-            }
-            else {
             @(blocksizesptr) = c64.CHRIN()
             @(blocksizesptr+1) = c64.CHRIN()
-                blocksizesptr += 2
-            }
 
             ; read until the filename starts after the first "
             while c64.CHRIN()!='\"'  {
                 if c64.READST()
-                    goto io_error
+                    goto close_end
             }
 
             repeat {
                 ubyte char = c64.CHRIN()
-                ;if_z
+                if char==0
-                ;    break      ; TODO fix assembly code generation for this
+                    break
+                ; if_z
+                ;    break              ; TODO fix generated code for this jump
                 if char=='\"'
                     break
                 if not disk_name {
@@ -133,7 +115,23 @@ io_error:
             if not disk_name {
                 @(filenamesbufferptr) = 0
                 filenamesbufferptr++
+                ubyte matches = true
+                if pattern_size {
+                    if matchSuffix
+                        rightstr(last_filename_ptr, filename, pattern_size)
+                    else
+                        leftstr(last_filename_ptr, filename, pattern_size)
+                    matches = strcmp(filename, pattern)==0
+                }
+                if matches {
+                    blocksizesptr += 2
                     num_files++
+                    last_filename_ptr = filenamesbufferptr
+                    if num_files>=max_files
+                        goto close_end
+                } else {
+                    filenamesbufferptr = last_filename_ptr
+                }
             }
 
             ; read the rest of the entry until the end
@@ -147,7 +145,7 @@ io_error:
             disk_name = false
         }
 
-io_error:
+close_end:
         c64.CLRCHN()        ; restore default i/o devices
         c64.CLOSE(1)
         return num_files

docs/source/libraries.rst

@@ -54,7 +54,8 @@ diskio
 ------
 Provides several routines that deal with disk drive I/O, such as:
 
-- show directory
+- list files on disk, optionally filtering by prefix or suffix
+- show disk directory as-is
 - display disk drive status
 - load and save data from and to the disk
 - delete and rename files on the disk

examples/test.p8

@@ -39,46 +39,48 @@ errors {
 main {
     sub start() {
 
-        ubyte result = diskio.directory(8)
+;        ubyte result = diskio.directory(8)
-
+;        txt.print("result: ")
-        txt.print("result: ")
+;        txt.print_ub(result)
-        txt.print_ub(result)
+;        txt.chrout('\n')
-        txt.chrout('\n')
+;        test_stack.test()
-        test_stack.test()
+;
-
+;        diskio.status(8)
-        diskio.status(8)
+;        txt.chrout('\n')
-        txt.chrout('\n')
+;        txt.chrout('\n')
-        txt.chrout('\n')
+;        txt.chrout('\n')
-        txt.chrout('\n')
+;        test_stack.test()
-        test_stack.test()
-        return
 
         const ubyte max_files = 10
         uword[max_files] blocks
         str filenames = "?????????????????" * max_files
 
         ubyte num_files=0
-        ; num_files = diskio.listfiles(8, ".bin", true, filenames, blocks, max_files)
+        txt.print("files starting with 'cub':\n")
-        txt.print("num files: ")
+        num_files = diskio.listfiles(8, "cub", false, filenames, blocks, max_files)
-        txt.print_ub(num_files)
+        print_listing()
         txt.chrout('\n')
+        txt.print("files ending with 'gfx':\n")
+        num_files = diskio.listfiles(8, "gfx", true, filenames, blocks, max_files)
+        print_listing()
+        ;test_stack.test()
 
-        test_stack.test()
+        sub print_listing() {
-
+            if num_files==0
-        if num_files>0 {
+                txt.print("no files found.")
+            else {
                 ubyte i
                 uword filenameptr = &filenames
                 for i in 0 to num_files-1 {
                     txt.print_ub(i+1)
                     txt.print(": ")
                     txt.print(filenameptr)
-                txt.print(" (")
+                    txt.print("   = ")
                     txt.print_uw(blocks[i])
-                txt.print(" blocks)\n")
+                    txt.print(" blocks\n")
                     filenameptr += strlen(filenameptr) + 1
                 }
             }
-
+        }
-        test_stack.test()
     }
 }