Move the logger into core.

davidgiven · Oct 13, 2024 · 9ddfa5a · 9ddfa5a
1 parent 6339cd6
commit 9ddfa5a
Show file tree

Hide file tree

Showing 41 changed files with 40 additions and 43 deletions.
diff --git a/build.py b/build.py
@@ -82,7 +82,6 @@
         "./lib/imagewriter/rawimagewriter.cc",
         "./lib/layout.cc",
         "./lib/ldbs.cc",
-        "./lib/logger.cc",
         "./lib/logrenderer.cc",
         "./lib/proto.cc",
         "./lib/readerwriter.cc",
@@ -180,7 +179,6 @@
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/layout.h": "./lib/layout.h",
         "lib/ldbs.h": "./lib/ldbs.h",
-        "lib/logger.h": "./lib/logger.h",
         "lib/proto.h": "./lib/proto.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
         "lib/sector.h": "./lib/sector.h",

diff --git a/lib/config.cc b/lib/config.cc
@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/core/utils.h"
 #include <fstream>
 #include <google/protobuf/text_format.h>

diff --git a/lib/core/build.py b/lib/core/build.py
@@ -9,6 +9,7 @@
         "./csvreader.cc",
         "./hexdump.cc",
         "./utils.cc",
+        "./logger.cc",
     ],
     hdrs={
         "lib/core/bitmap.h": "./bitmap.h",
@@ -17,6 +18,7 @@
         "lib/core/csvreader.h": "./csvreader.h",
         "lib/core/globals.h": "./globals.h",
         "lib/core/utils.h": "./utils.h",
+        "lib/core/logger.h": "./logger.h",
     },
     deps=[
         "dep/agg",

diff --git a/lib/logger.cc → lib/core/logger.cc b/lib/logger.cc → lib/core/logger.cc
@@ -1,9 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/core/bytes.h"
-#include "lib/fluxmap.h"
-#include "lib/sector.h"
-#include "lib/flux.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 
 static bool indented = false;
 

diff --git a/lib/logger.h → lib/core/logger.h b/lib/logger.h → lib/core/logger.h
diff --git a/lib/flags.cc b/lib/flags.cc
@@ -3,7 +3,7 @@
 #include "lib/flags.h"
 #include "lib/proto.h"
 #include "lib/core/utils.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/imagereader/imagereader.h"
 #include <google/protobuf/text_format.h>

diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc
@@ -6,7 +6,7 @@
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"

diff --git a/lib/fluxsink/hardwarefluxsink.cc b/lib/fluxsink/hardwarefluxsink.cc
@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsink/fluxsink.h"

diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc
@@ -11,7 +11,7 @@
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/scp.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/lib/fluxsource/dmkfluxsource.cc b/lib/fluxsource/dmkfluxsource.cc
@@ -4,7 +4,7 @@
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 #include <filesystem>
 

diff --git a/lib/fluxsource/hardwarefluxsource.cc b/lib/fluxsource/hardwarefluxsource.cc
@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"

diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc
@@ -6,7 +6,7 @@
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/scp.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <fstream>
 
 static int trackno(int strack)

diff --git a/lib/globals.cc b/lib/globals.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <sys/time.h>
 #include <stdarg.h>
 

diff --git a/lib/imagereader/d64imagereader.cc b/lib/imagereader/d64imagereader.cc
@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/d88imagereader.cc b/lib/imagereader/d88imagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/dimimagereader.cc b/lib/imagereader/dimimagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/proto.h"
 #include "lib/config.pb.h"
 #include <algorithm>

diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc
@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/fdiimagereader.cc b/lib/imagereader/fdiimagereader.cc
@@ -5,7 +5,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/imagereader.cc b/lib/imagereader/imagereader.cc
@@ -8,7 +8,7 @@
 #include "lib/image.h"
 #include "lib/layout.h"
 #include "lib/config.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <ctype.h>
 

diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/config.pb.h"
 #include <algorithm>

diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include "lib/layout.pb.h"
 #include "lib/proto.h"

diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc
@@ -3,7 +3,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/nfdimagereader.cc b/lib/imagereader/nfdimagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/nsiimagereader.cc b/lib/imagereader/nsiimagereader.cc
@@ -5,7 +5,7 @@
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/imagereader/imagereader.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagereader/td0imagereader.cc b/lib/imagereader/td0imagereader.cc
@@ -4,7 +4,7 @@
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/crc.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc
@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/ldbs.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagewriter/d88imagewriter.cc b/lib/imagewriter/d88imagewriter.cc
@@ -5,7 +5,7 @@
 #include "lib/image.h"
 #include "lib/config.pb.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc
@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagewriter/imagewriter.cc b/lib/imagewriter/imagewriter.cc
@@ -8,7 +8,7 @@
 #include "lib/config.pb.h"
 #include "lib/proto.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <iostream>
 #include <fstream>
 

diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc
@@ -5,7 +5,7 @@
 #include "lib/image.h"
 #include "lib/config.pb.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc
@@ -8,7 +8,7 @@
 #include "lib/config.pb.h"
 #include "lib/layout.h"
 #include "lib/layout.pb.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>

diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc
@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>

diff --git a/lib/imagewriter/nsiimagewriter.cc b/lib/imagewriter/nsiimagewriter.cc
@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "arch/northstar/northstar.h"
 #include "lib/imagewriter/imagewriter.pb.h"
 #include <algorithm>

diff --git a/lib/imagewriter/rawimagewriter.cc b/lib/imagewriter/rawimagewriter.cc
@@ -4,7 +4,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "arch/northstar/northstar.h"
 #include "lib/imagewriter/imagewriter.pb.h"
 #include <algorithm>

diff --git a/lib/layout.cc b/lib/layout.cc
@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/layout.h"
 #include "lib/proto.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/fl2.h"
 
 static unsigned getTrackStep()

diff --git a/lib/logrenderer.cc b/lib/logrenderer.cc
@@ -3,7 +3,7 @@
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
 #include "lib/flux.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 
 namespace
 {

diff --git a/lib/readerwriter.cc b/lib/readerwriter.cc
@@ -13,7 +13,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/sector.h"
 #include "lib/image.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/core/utils.h"
 #include "lib/config.pb.h"

diff --git a/lib/usb/usb.cc b/lib/usb/usb.cc
@@ -9,7 +9,7 @@
 #include "lib/core/bytes.h"
 #include "lib/proto.h"
 #include "usbfinder.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "applesauce.h"
 #include "greaseweazle.h"
 

diff --git a/lib/vfs/amigaffs.cc b/lib/vfs/amigaffs.cc
@@ -4,7 +4,7 @@
 #include "lib/config.pb.h"
 #include "lib/proto.h"
 #include "lib/layout.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 
 #include "adflib.h"
 #include "adf_blk.h"

diff --git a/src/gui/main.cc b/src/gui/main.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "gui.h"
 #include "lib/core/utils.h"
 

diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
@@ -2,7 +2,7 @@
 #include "lib/config.h"
 #include "lib/proto.h"
 #include "gui.h"
-#include "lib/logger.h"
+#include "lib/core/logger.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"