Skip to content

Add support for diskcache 0x0101 (multiple extensions, take 2)

Duncan Macleod requested to merge duncanmmacleod/gwdatafind-server:diskcache-0x0101-2 into master

This MR implements Add support for ldas-tools-diskcache output for... (#21 - closed) (at the second attempt).

Closes Add support for diskcache version 0x0101 (multi... (!69 - closed) (first attempt).

This patch does the following

  • Adds support in the CacheManager object for determining the version of a diskcache ASCII file via the # version: header at runtime, and then mapping that version to a specific line parser that is then applied to the whole file; the version parsing is dynamic, so we should be able to elegantly handle the version changing while the app is running,
  • Adds support in the CacheManager object for parsing the 'multiple extensions' diskcache ASCII format, 0x0101
  • Removes a hack in the parsing of 0x00ff files to try and fine an extension string, this has never been supported upstream, so I'm not sure why that was there...
  • Adds a test suite for the CacheManager object and test both supported formats.
  • Migrates the test app configuration to point at the 0x0101 cache (for the rest of the test suite)

Merge request reports