Support extended ADF files about vamigaweb

[mras0]

Yes, seems to work 👍 Hoi intro music is now playing for me with the extended ADF version of the disks.

[mithrendal]

added like you said on my machine

#include "EXTFile.h"

...

  if (EXTFile::isCompatible(filename)) {
      printf("%s - Loading EXT file\n", filename);
      EXTFile ext{blob, len};
      return std::make_unique<FloppyDisk>(ext);
    }

and the compile succeeds...

so when the extension is also ADF then it should be enough like this right ? Do you have any of these disks to test ? Hang on while I will publish a test version ....

[mithrendal]

pushed it to test environment 😎
https://vamigaweb.github.io/uat/

[mras0]

I think it's filtered in the GUI, maybe here:

vAmigaWeb/js/vAmiga_ui.js

Line 914 in 96b8687

if(file_slot_file_name.match(/[.](adf|hdf|dms|exe|vAmiga)$/i))

Here's a small one that should work: show_regs.zip

I don't know if there's a standard extension for these files. If people also just call them ".adf" maybe it's better not to change the GUI and instead load like this:

    if (ADFFile::isCompatible(filename)) {
      printf("%s - Loading ADF file\n", filename);
      try {
        ADFFile adf{blob, len};
        return std::make_unique<FloppyDisk>(adf);
      } catch (const VAError& e) {
        // Maybe it's an extended ADF?
        printf("Error loading %s - %s. Trying to load as extended ADF\n", filename, e.what());
        EXTFile ext{blob, len};
        return std::make_unique<FloppyDisk>(ext);
      }
    }

[mithrendal]

I see your point. Will check what winuae accepts for extensions … we can lean on their behavior

[mithrendal]

winuae file dialog

hmm no .ext file extension ... 😬can not insert the showreg.ext file with this dialog ... only files with the listed extensions show up in the file list

lets try drag and drop into emulator canvas window ...

🤓yes that works ... hmmm what should we do now 🙄?

[mras0]

People probably expect extended ADFs to work with a ".adf" extension then (Example: dirkwhoffmann/vAmiga#672), so probably what I suggested above (first try to load as a normal ADF, and if that fails, load as an extended one).

[mithrendal]

🙋🏻ok did as you instructed me ... and published to test environment

https://vamigaweb.github.io/uat/

EDIT: for me loading show_regs works now 😍...

maybe @rhinoid s game on extended adf works now too with sound ?

then we can publish to the regular version now?