Merge pull request #175 from davidgiven/scp

Make SCP import and export properly handle single-sided images.

src/fe-fluxtoscp.cc

@@ -61,10 +61,7 @@ static int strackno(int track, int side)
 {
     if (fortyTrackMode)
         track /= 2;
-    if (singleSided)
-        return track;
-    else
-        return (track << 1) | side;
+	return (track << 1) | side;
 }
 
 int mainConvertFluxToScp(int argc, const char* argv[])
@@ -117,9 +114,15 @@ int mainConvertFluxToScp(int argc, const char* argv[])
         for (int side = 0; side <= maxside; side++)
         {
             int strack = strackno(track, side);
-            std::cout << fmt::format("FE track {}.{}, SCP track {}: ", track, side, strack) << std::flush;
+            std::cout << fmt::format("{}.{}: ", track, side) << std::flush;
 
             auto fluxmap = sqlReadFlux(inputDb, track, side);
+			if (fluxmap->bytes() == 0)
+			{
+				std::cout << "missing\n";
+				continue;
+			}
+
             ScpTrack trackheader = {0};
             trackheader.track_id[0] = 'T';
             trackheader.track_id[1] = 'R';
@@ -175,7 +178,7 @@ int mainConvertFluxToScp(int argc, const char* argv[])
             trackdataWriter += Bytes((uint8_t*)&trackheader, sizeof(trackheader));
             trackdataWriter += fluxdata;
 
-            std::cout << fmt::format("{} ms in {} bytes\n",
+            std::cout << fmt::format("{:.3f} ms in {} bytes\n",
                 totalTicks * MS_PER_TICK,
                 fluxdata.size());
         }

src/fe-scptoflux.cc

@@ -28,15 +28,11 @@ static void check_for_error()
 
 static int trackno(int strack)
 {
-    if (startSide == endSide)
-        return strack;
     return strack >> 1;
 }
 
 static int headno(int strack)
 {
-    if (startSide == endSide)
-        return startSide;
     return strack & 1;
 }
 
@@ -65,6 +61,8 @@ static void read_header()
 static void read_track(int strack)
 {
     uint32_t offset = Bytes(header.track[strack], 4).reader().read_le32();
+	if (offset == 0)
+		return;
 
     ScpTrack trackheader;
     inputFile.seekg(offset, std::ios::beg);
@@ -112,7 +110,7 @@ static void read_track(int strack)
         inputBytes += datalength*2;
     }
 
-    std::cout << fmt::format(" {} ms in {} input bytes and {} output bytes\n",
+    std::cout << fmt::format(" {:.3f} ms in {} input bytes and {} output bytes\n",
         fluxmap.duration() / 1e6, inputBytes, fluxmap.bytes());
     sqlWriteFlux(outputDb, trackno(strack), headno(strack), fluxmap);
 }