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

Replace the Error() object with an error() function which takes fmt

Browse Source 
formatspecs, making for much cleaner code. Reformatted everything.

This actually happened in multiple steps but then I corrupted my local
repository and I had to recover from the working tree.
This commit is contained in:
dg
2023-05-09 20:59:44 +00:00
parent bfa0846ad0
commit 466c3c34e5
168 changed files with 5722 additions and 5135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
lib/imagewriter/nsiimagewriter.cc
View File

@@ -2,7 +2,6 @@
#include "flags.h"
#include "sector.h"
#include "imagewriter/imagewriter.h"
#include "fmt/format.h"
#include "decoders/decoders.h"
#include "image.h"
#include "logger.h"
@@ -15,76 +14,103 @@
class NsiImageWriter : public ImageWriter
{
public:
NsiImageWriter(const ImageWriterProto& config):
ImageWriter(config)
{}
NsiImageWriter(const ImageWriterProto& config): ImageWriter(config) {}
void writeImage(const Image& image)
{
const Geometry& geometry = image.getGeometry();
bool mixedDensity = false;
void writeImage(const Image& image)
{
const Geometry& geometry = image.getGeometry();
bool mixedDensity = false;
size_t trackSize = geometry.numSectors * geometry.sectorSize;
size_t trackSize = geometry.numSectors * geometry.sectorSize;
if (geometry.numTracks * trackSize == 0) {
Logger() << "No sectors in output; skipping .nsi image file generation.";
return;
}
if (geometry.numTracks * trackSize == 0)
{
Logger()
<< "No sectors in output; skipping .nsi image file generation.";
return;
}
Logger() << fmt::format("Writing {} tracks, {} sides, {} sectors, {} ({} bytes/sector), {} kB total",
geometry.numTracks, geometry.numSides,
geometry.numSectors, geometry.sectorSize == 256 ? "SD" : "DD", geometry.sectorSize,
geometry.numTracks * geometry.numSides * geometry.numSectors * geometry.sectorSize / 1024);
Logger() << fmt::format(
"Writing {} tracks, {} sides, {} sectors, {} ({} bytes/sector), {} "
"kB total",
geometry.numTracks,
geometry.numSides,
geometry.numSectors,
geometry.sectorSize == 256 ? "SD" : "DD",
geometry.sectorSize,
geometry.numTracks * geometry.numSides * geometry.numSectors *
geometry.sectorSize / 1024);
std::ofstream outputFile(_config.filename(), std::ios::out | std::ios::binary);
if (!outputFile.is_open())
Error() << "cannot open output file";
std::ofstream outputFile(
_config.filename(), std::ios::out | std::ios::binary);
if (!outputFile.is_open())
error("cannot open output file");
unsigned sectorFileOffset;
for (int track = 0; track < geometry.numTracks * geometry.numSides; track++)
{
int side = (track < geometry.numTracks) ? 0 : 1;
for (int sectorId = 0; sectorId < geometry.numSectors; sectorId++)
{
const auto& sector = image.get(track % geometry.numTracks, side, sectorId);
if (sector)
{
if (side == 0) { /* Side 0 is from track 0-34 */
sectorFileOffset = track * trackSize + sectorId * geometry.sectorSize;
}
else { /* Side 1 is from track 70-35 */
sectorFileOffset = (geometry.sectorSize * geometry.numSectors * geometry.numTracks) + /* Skip over side 0 */
((geometry.numTracks - 1) - (track % geometry.numTracks)) * (geometry.sectorSize * geometry.numSectors) +
(sectorId * geometry.sectorSize); /* Sector offset from beginning of track. */
}
outputFile.seekp(sectorFileOffset, std::ios::beg);
if ((geometry.sectorSize == 512) && (sector->data.size() == 256)) {
/* North Star DOS provided an upgrade path for disks formatted as single-
* density to hold double-density data without reformatting. In this
* case, the four directory blocks will be single-density but other areas
* of the disk are double-density. This cannot be accurately represented
* using a .nsi file, so in these cases, we pad the sector to 512-bytes,
* filling with spaces.
*/
char fill[256];
memset(fill, ' ', sizeof(fill));
if (mixedDensity == false) {
Logger() << "Warning: Disk contains mixed single/double-density sectors.";
}
mixedDensity = true;
sector->data.slice(0, 256).writeTo(outputFile);
outputFile.write(fill, sizeof(fill));
} else {
sector->data.slice(0, geometry.sectorSize).writeTo(outputFile);
}
}
}
}
}
unsigned sectorFileOffset;
for (int track = 0; track < geometry.numTracks * geometry.numSides;
track++)
{
int side = (track < geometry.numTracks) ? 0 : 1;
for (int sectorId = 0; sectorId < geometry.numSectors; sectorId++)
{
const auto& sector =
image.get(track % geometry.numTracks, side, sectorId);
if (sector)
{
if (side == 0)
{ /* Side 0 is from track 0-34 */
sectorFileOffset =
track * trackSize + sectorId * geometry.sectorSize;
}
else
{ /* Side 1 is from track 70-35 */
sectorFileOffset =
(geometry.sectorSize * geometry.numSectors *
geometry.numTracks) + /* Skip over side 0 */
((geometry.numTracks - 1) -
(track % geometry.numTracks)) *
(geometry.sectorSize * geometry.numSectors) +
(sectorId *
geometry.sectorSize); /* Sector offset from
beginning of track. */
}
outputFile.seekp(sectorFileOffset, std::ios::beg);
if ((geometry.sectorSize == 512) &&
(sector->data.size() == 256))
{
/* North Star DOS provided an upgrade path for disks
* formatted as single- density to hold double-density
* data without reformatting. In this case, the four
* directory blocks will be single-density but other
* areas of the disk are double-density. This cannot be
* accurately represented using a .nsi file, so in these
* cases, we pad the sector to 512-bytes, filling with
* spaces.
*/
char fill[256];
memset(fill, ' ', sizeof(fill));
if (mixedDensity == false)
{
Logger() << "Warning: Disk contains mixed "
"single/double-density sectors.";
}
mixedDensity = true;
sector->data.slice(0, 256).writeTo(outputFile);
outputFile.write(fill, sizeof(fill));
}
else
{
sector->data.slice(0, geometry.sectorSize)
.writeTo(outputFile);
}
}
}
}
}
};
std::unique_ptr<ImageWriter> ImageWriter::createNsiImageWriter(
const ImageWriterProto& config)
const ImageWriterProto& config)
{
return std::unique_ptr<ImageWriter>(new NsiImageWriter(config));
}