Various fixes, moved to lapp for opt parsing.

Göran Krampe
1 parent 5fc367ad
Showing 1 changed file with 35 additions and 17 deletions
blimp.nim
-import md5, os, osproc, parseopt2, strutils, parsecfg, streams
+import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp
 # blimp is a little utility program for handling large files
 # in git repositories. Its inspired by git-fat and s3annex
@@ -19,12 +19,12 @@ import md5, os, osproc, parseopt2, strutils, parsecfg, streams
 #   <gitroot>/.blimp.conf
 #   ~/blimpstore/.blimp.conf
-var blimpStore, remoteBlimpStore: string
+var blimpStore, remoteBlimpStore: string = nil
+var verbose: bool
 # Load blimp.conf file, overkill for now but...
 proc parseConfFile(filename: string) =
-  echo filename
   var f = newFileStream(filename, fmRead)
   if f != nil:
     var p: CfgParser
@@ -47,20 +47,24 @@ proc parseConfFile(filename: string) =
         quit("Parsing " & filename & ": " & e.msg)
     close(p)
+# Trivial helper to enable verbose
+proc run(cmd: string): auto =
+  if verbose: echo(cmd)
+  execCmd(cmd)
 # Upload a file to the remote master blimpStore
 proc uploadFile(blimpFilename: string) =
   if remoteBlimpStore.isNil:
     echo("Remote blimpstore not set in configuration file, not uploading content:\n\t" & blimpFilename)
     return
-  let errorCode = execCmd("rsync -a " & blimpStore / blimpFilename & " " & remoteBlimpStore)
+  let errorCode = run("rsync -a " & blimpStore / blimpFilename & " " & remoteBlimpStore)
   if errorCode != 0: quit("Something went wrong uploading content to " & remoteBlimpStore, 2)
 # Download a file to the remote master blimpStore
 proc downloadFile(blimpFilename: string) =
   if remoteBlimpStore.isNil:
     quit("Remote blimpstore not set in configuration file, can not download content:\n\t" & blimpFilename)
-  let errorCode = execCmd("rsync -a " & remoteBlimpStore / blimpFilename & " " & blimpStore / "")
+  let errorCode = run("rsync -a " & remoteBlimpStore / blimpFilename & " " & blimpStore / "")
   if errorCode != 0: quit("Something went wrong downloading " & blimpFilename & " from " & remoteBlimpStore, 3)
@@ -79,26 +83,32 @@ proc copyFromblimpStore(blimpFilename, filename: string) =
 # Copy original file to blimpStore and replace with hash stub in git.
 proc deflate(filename: string) =
-  let content = readFile(filename)
+  var content: string
+  try:
+    content = readFile(filename)
+  except:
+    quit("Failed opening file: " & filename, 1)
   if content[0..4] == "hash:":
     quit("File is already deflated, ignored.", 5)
   let hash = getMD5(content)
   let blimpFilename = filename & "-" & hash
   copyToBlimpStore(filename, blimpFilename)
   writeFile(filename, "hash:" & blimpFilename)
-
+  echo("\t" & filename & " deflated.")
+  
 # Parse out hash from hash stub and copy back original content from blimpStore.
 proc inflate(filename: string) =
   var hashfile: File
   if not open(hashfile, filename):
-    quit("Could not open file: " & filename, 4)
+    quit("Failed opening file: " & filename, 4)
   let hashline = split(string(readLine(hashfile)), {':'})
   if hashline[0] == "hash":
     let blimpfilename = hashline[1]
     #removeFile(filename)
     copyFromblimpStore(blimpfilename, filename)
   else:
-    quit("File is not a blimp file.", 5)
+    quit("\t" & filename & " is not deflated.", 5)
+  echo("\t" & filename & " inflated.")
 # Find git root dir or fall back on current dir
 proc gitRoot(): string =
@@ -111,6 +121,13 @@ proc gitRoot(): string =
   except:
     result = getCurrentDir()
+let help = """
+  blimp [options] <command> <filenames...>
+    -v,--verbose             Verbosity
+    <command>   (string)     (i)nflate or (d)eflate
+    <filenames> (string...)  One or more filepaths to inflate/deflate
+  """
+
 ################################ main #####################################
 # Hardwired to "blimpstore" directory in home dir.
@@ -127,18 +144,19 @@ except:
 parseConfFile(gitRoot() / ".blimp.conf")
 parseConfFile(blimpStore / ".blimp.conf")
-# Only a command and a path as argument
-# TODO: Change to lapp
-let argv = commandLineParams()
-let command = argv[0]
-let filename = argv[1]
-
+# Using lapp to get args
+let args = parse(help)
+let command = args["command"].asString
+let filenames = args["filenames"].asSeq
+verbose = args["verbose"].asBool
 # Do the deed
 if command == "d" or command == "deflate":
-  deflate(filename)
+  for fn in filenames:
+    deflate(fn.asString)
 elif command == "i" or command == "inflate":
-  inflate(filename)
+  for fn in filenames:
+    inflate(fn.asString)
 else:
   quit("Unknown command, only (d)eflate or (i)inflate are valid.", 6)