Merge pull request #214 from GordonSmith/REFACTOR_UTILS

chore: Minor tweaks to graphviz refactor

.vscode/launch.json

@@ -5,12 +5,15 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "index.html",
+            "name": "index-browser",
             "type": "msedge",
             "request": "launch",
             "url": "http://localhost:8000/index.html",
-            "runtimeArgs": [],
-            "webRoot": "${workspaceRoot}"
+            "webRoot": "${workspaceRoot}",
+            "sourceMapPathOverrides": {
+                "webpack:///./*": "${workspaceRoot}/*",
+                "webpack:///*": "/*"
+            },
         },
         {
             "name": "file:///index.html",

src-cpp/graphviz/main.hpp

@@ -1,9 +1,7 @@
-#include <string>
 #include "util.hpp"
 
 class Graphviz
 {
-private:
 public:
     static const char *version();
     static const char *lastError();

src-cpp/graphviz/util.cpp

@@ -46,10 +46,12 @@ TempFileBuffer::operator std::string() const
     if (filePointer != nullptr)
     {
         std::rewind(filePointer);
-        char buffer[256];
-        size_t bytesRead;
-        while ((bytesRead = std::fread(buffer, 1, sizeof(buffer), filePointer)) > 0)
-            content.append(buffer, bytesRead);
+        std::fseek(filePointer, 0, SEEK_END);
+        long fileSize = std::ftell(filePointer);
+        std::rewind(filePointer);
+
+        content.resize(fileSize);
+        std::fread(&content[0], 1, fileSize, filePointer);
     }
     return content;
 }

src-cpp/graphviz/util.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <cstdio>
 
 class StringBuffer
 {
@@ -23,6 +24,11 @@ class TempFileBuffer
     TempFileBuffer();
     ~TempFileBuffer();
 
+    TempFileBuffer(const TempFileBuffer &) = delete;
+    TempFileBuffer(TempFileBuffer &&) = delete;
+    TempFileBuffer &operator=(const TempFileBuffer &) = delete;
+    TempFileBuffer &operator=(TempFileBuffer &&) = delete;
+
     operator FILE *() const;
     operator std::string() const;
     operator const char *() const;

src-ts/__tests__/base91.ts

@@ -36,7 +36,6 @@ describe("base91", function () {
 
         const base91 = await Base91.load();
         const base91Str = base91.encode(compressed_data);
-        console.log(data.byteLength, base91Str.length);
         const compressed_data2 = base91.decode(base91Str);
         expect(compressed_data).to.deep.equal(compressed_data2);