From 9928b9fcb58a6e3ee9b2528dab226f92720fb266 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@edgecase.io>
Date: Mon, 17 Oct 2016 17:15:00 -0500
Subject: [PATCH] Added a file manifest to track modifcations.

---
 daily_notifier.nim       |  2 +-
 daily_notifier.nimble    |  2 +-
 deploy_plans_via_ftp.nim | 48 ++++++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/daily_notifier.nim b/daily_notifier.nim
index 6c6b1e1..34623a6 100644
--- a/daily_notifier.nim
+++ b/daily_notifier.nim
@@ -49,7 +49,7 @@ Options:
 
   -h --help                     Print this usage information.
 """
-  let args = docopt(doc, version = "daily_notifier 0.1.0")
+  let args = docopt(doc, version = "daily_notifier 0.2.0")
 
   if args["--help"]:
     echo doc
diff --git a/daily_notifier.nimble b/daily_notifier.nimble
index 7c0088d..bcfb7c0 100644
--- a/daily_notifier.nimble
+++ b/daily_notifier.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.0"
+version       = "0.2.0"
 author        = "Jonathan Bernard"
 description   = "Little programs that reads my daily plan and notifies me of upcoming events."
 license       = "MIT"
diff --git a/deploy_plans_via_ftp.nim b/deploy_plans_via_ftp.nim
index e91dfe0..180aa2b 100644
--- a/deploy_plans_via_ftp.nim
+++ b/deploy_plans_via_ftp.nim
@@ -1,4 +1,4 @@
-import docopt, json, nre, os, osproc, sequtils, sets, strutils, tempfile
+import docopt, json, md5, nre, os, osproc, sequtils, sets, strutils, tempfile
 
 proc doStep(step: string, verbose: bool, cmd: string): tuple[output: TaintedString, exitCode: int] =
   if verbose: echo "> " & cmd
@@ -21,7 +21,7 @@ Options:
   -V --version           Print version information.
 """
 
-  let args = docopt(doc, version = "deploy_plans_via_ftp 0.1.0")
+  let args = docopt(doc, version = "deploy_plans_via_ftp 0.2.0")
 
   if args["--help"]: echo doc; quit()
 
@@ -81,19 +81,19 @@ Options:
 
   for curDir in subDirs:
     let fullDirPath = tempdir & "/" & curDir
-    let remoteOptions = " --user '" &
-      ftpUsername & ":" & ftpPassword & "' '" &
-      ftpRoot & "/" & curDir & "/' "
+    let userOption = " --user '" & ftpUsername & ":" & ftpPassword & "' "
+    let remoteOptions = userOption & " '" & ftpRoot & "/" & curDir & "/' "
 
-   # List the files on the server.
-    (output, exitCode) = doStep("read remote files (" & curDir & ")", verbose,
-      "curl " & remoteOptions)
+    # Get the file manifest from the server.
+    (output, exitCode) = doStep("read remote files manifest (" & curDir & ")", verbose,
+      "curl " & userOption & " '" & ftpRoot & "/" & curDir & "/mf.json'")
 
-    let remoteFiles = output.splitLines
-      .filterIt(it.find(htmlFileRe).isSome)
-      .mapIt(it.find(htmlFileRe).get().captures[0])
-      .toSet
-      
+    var manifestUpdated = false
+
+    var manifest: JsonNode
+    try: manifest = parseJson(output)
+    except: manifest = newJObject()
+    
     # List the daily files locally.
     let localFiles =
       sequtils.toSeq(walkDir(fullDirPath))
@@ -102,12 +102,16 @@ Options:
         .mapIt(it.path.find(mdFileRe).get().captures[0])
         .toSet
 
-    # ID the files that are new (present locally but not remotely).
-    let newFiles = localFiles - remoteFiles
-
-    for fileName in newFiles:
+    # ID the files that have changed or are missing.
+    for fileName in localFiles:
       let tempPath = fullDirPath & "/temp.html"
       let filePath = fullDirPath & "/" & fileName
+      let localMd5 = getMD5(readFile(filePath & ".md"))
+      let remoteMd5 =
+        if manifest.hasKey(fileName): manifest[fileName].getStr
+        else: getMD5("")
+
+      if localMd5 == remoteMd5: continue
 
       # Compile the markdown into HTML
       discard doStep("compile plan file (" & fileName & ")", verbose,
@@ -121,6 +125,16 @@ Options:
       discard doStep("upload file to FastMail (" & fileName & ")", verbose,
         "curl -T '" & filePath & ".html' " & remoteOptions)
 
+      manifest[fileName] = %($localMd5)
+      manifestUpdated = true
+
+    # Upload the new manifest
+    if manifestUpdated:
+      let manifestFilePath = fullDirPath & "/mf.json"
+      writeFile(manifestFilePath, manifest.pretty)
+      discard doStep("upload updated manifest", verbose,
+        "curl -T '" & manifestFilePath & "' " & remoteOptions)
+
   # Delete local temp repo
   if verbose: echo "Deleting " & tempdir
   removeDir(tempdir)