2 files changed, 78 insertions, 4 deletions

diff --git a/source/app.d b/source/app.d
index 943b9d0..52074b1 100644
--- a/source/app.d
+++ b/source/app.d
@@ -75,10 +75,13 @@ void main()
             try
             {
                 auto file = File(filename, "wb");
-
+                file.writefln!"%s %s"(disp.y, disp.x);
+                file.writefln!"%d"(rocks);
+                overlay.save(file);
             }
-            catch (ErrnoException e)
+            catch (Exception e)
             {
+                // TODO: log the error in a user-visible way
             }
             disp.print();
             break;
@@ -86,10 +89,22 @@ void main()
             auto filename = stdscr.readquery("Load:");
             try
             {
+                import std.algorithm.iteration : splitter, map;
+                import std.conv : to;
+                import std.bigint;
+
                 auto file = File(filename);
+                auto coord = file.readln.splitter().map!(to!BigInt);
+                disp.y = coord.front;
+                coord.popFront;
+                disp.x = coord.front;
+                file.readf!"%d\n"(rocks);
+                disp.status = format("%d", rocks);
+                overlay.load(file);
             }
-            catch (ErrnoException e)
+            catch (Exception e)
             {
+                printw("exception!");
             }
             disp.print();
             break;
diff --git a/source/spots.d b/source/spots.d
index 0f9d8b7..f57ba8f 100644
--- a/source/spots.d
+++ b/source/spots.d
@@ -2,8 +2,9 @@ import std.bigint;
 import std.digest.crc;
 import std.random : unpredictableSeed;
 import std.range;
+import std.stdio;
 import lru : LRUCache;
-import deimos.ncurses;
+import std.traits : isSomeString;
 
 private BigInt positive(BigInt n)
 {
@@ -27,6 +28,18 @@ struct Spot
         _contents = c;
     }
 
+    string toString()
+    {
+        import std.format : format;
+
+        return format("'%c'", _contents);
+    }
+
+    void fromString(S)(S s) if (isSomeString!S)
+    {
+        _contents = cast(char) s[1];
+    }
+
     @property contents()
     {
         return _contents;
@@ -46,6 +59,8 @@ struct Spot
 interface SpotSource
 {
     Spot opIndex(BigInt y, BigInt x);
+    void save(File);
+    void load(File);
 }
 
 class RandomSource : SpotSource
@@ -99,12 +114,24 @@ class RandomSource : SpotSource
         cache[[y, x]] = ret;
         return ret;
     }
+
+    public void save(File f)
+    {
+        f.writefln!"%d %f"(seed, density);
+    }
+
+    public void load(File f)
+    {
+        f.readf!"%d %f\n"(seed, density);
+        cache = new LRUCache!(BigInt[2], Spot)(50000);
+    }
 }
 
 class OverlaySource : SpotSource
 {
     private SpotSource _base;
     private Spot[BigInt[2]] _overlay;
+    immutable private string terminator = "END OVERLAY\n";
 
     this(SpotSource base)
     {
@@ -133,6 +160,38 @@ class OverlaySource : SpotSource
             return _base[y, x];
     }
 
+    void save(File f)
+    {
+        _base.save(f);
+        foreach (coord; _overlay.keys())
+        {
+            f.writefln!"%s, %s: %s"(coord[0], coord[1], _overlay[coord]);
+        }
+        f.write(terminator);
+    }
+
+    void load(File f)
+    {
+        import std.conv : to;
+        import std.algorithm.iteration;
+
+        _base.load(f);
+        foreach (char[] line; f.lines)
+        {
+            if (line == terminator)
+                break;
+            auto trim = line.filter!(a => a == ' ' || a == '\r' || a == '\n').array;
+            auto parts = trim.splitter(':');
+            auto ints = parts.moveFront.splitter(',').map!(to!BigInt);
+            BigInt[2] coord;
+            coord[0] = ints.moveFront;
+            coord[1] = ints.front;
+            auto s = new Spot();
+            (*s).fromString(parts.front);
+            _overlay[coord] = *s;
+        }
+    }
+
     unittest
     {
         auto base = new RandomSource(0, 0.0);