Roll requiredSectors into readerwriter.cc.

Author: davidgiven

lib/decoders/decoders.cc

@@ -61,7 +61,8 @@ std::unique_ptr<Decoder> Decoder::create(const DecoderProto& config)
 }
 
 std::shared_ptr<TrackDataFlux> Decoder::decodeToSectors(
-    std::shared_ptr<const Fluxmap> fluxmap, std::shared_ptr<const TrackInfo>& trackInfo)
+    std::shared_ptr<const Fluxmap> fluxmap,
+    std::shared_ptr<const TrackInfo>& trackInfo)
 {
     _trackdata = std::make_shared<TrackDataFlux>();
     _trackdata->fluxmap = fluxmap;
@@ -220,16 +221,3 @@ uint64_t Decoder::readRaw64()
 {
     return toBytes(readRawBits(64)).reader().read_be64();
 }
-
-std::set<LogicalLocation> Decoder::requiredSectors(
-    std::shared_ptr<const TrackInfo>& trackInfo) const
-{
-    const auto trackLayout =
-        Layout::getLayoutOfTrackPhysical(trackInfo->physicalTrack, trackInfo->physicalSide);
-
-    std::set<LogicalLocation> results;
-    for (unsigned sectorId : trackLayout->logicalSectorOrder)
-        results.insert(LogicalLocation{
-            trackLayout->logicalTrack, trackLayout->logicalSide, sectorId});
-    return results;
-}

lib/decoders/decoders.h

@@ -89,9 +89,6 @@ class Decoder
         return _fmr->getDuration();
     }
 
-    virtual std::set<LogicalLocation> requiredSectors(
-        std::shared_ptr<const TrackInfo>& trackInfo) const;
-
 protected:
     virtual void beginTrack(){};
     virtual nanoseconds_t advanceToNextRecord() = 0;

lib/readerwriter.cc

@@ -156,21 +156,29 @@ static std::set<std::shared_ptr<const Sector>> collectSectors(
 
 BadSectorsState combineRecordAndSectors(TrackFlux& trackFlux,
     Decoder& decoder,
-    std::shared_ptr<const TrackInfo>& layout)
+    std::shared_ptr<const TrackInfo>& trackLayout)
 {
     std::set<std::shared_ptr<const Sector>> track_sectors;
 
+    /* Add the sectors which were there. */
+
     for (auto& trackdataflux : trackFlux.trackDatas)
         track_sectors.insert(
             trackdataflux->sectors.begin(), trackdataflux->sectors.end());
 
-    for (auto& logicalLocation : decoder.requiredSectors(trackFlux.trackInfo))
+    /* Add the sectors which should be there. */
+
+    for (unsigned sectorId : trackLayout->logicalSectorOrder)
     {
-        auto sector = std::make_shared<Sector>(logicalLocation);
+        auto sector = std::make_shared<Sector>(LogicalLocation{
+            trackLayout->logicalTrack, trackLayout->logicalSide, sectorId});
+
         sector->status = Sector::MISSING;
         track_sectors.insert(sector);
     }
 
+    /* Deduplicate. */
+
     trackFlux.sectors = collectSectors(track_sectors);
     if (trackFlux.sectors.empty())
         return HAS_BAD_SECTORS;
@@ -402,7 +410,7 @@ void writeDiskCommand(const Image& image,
 
 void writeRawDiskCommand(FluxSource& fluxSource, FluxSink& fluxSink)
 {
-	auto locations = Layout::computeLocations();
+    auto locations = Layout::computeLocations();
     writeTracks(
         fluxSink,
         [&](std::shared_ptr<const TrackInfo>& layout)