Added default config file and subexes format for download/upload commands.

Göran Krampe
1 parent db95b901
Showing 1 changed file with 29 additions and 9 deletions
blimp.nim
-import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp
+import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes
 # blimp is a little utility program for handling large files
 # in git repositories. Its inspired by git-fat and s3annex
@@ -19,9 +19,19 @@ import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp
 #   <gitroot>/.blimp.conf
 #   ~/blimpstore/.blimp.conf
-var blimpStore, remoteBlimpStore: string = nil
-var verbose: bool
+var
+  blimpStore, uploadCommandFormat, downloadCommandFormat: string
+  remoteBlimpStore: string = nil
+  verbose: bool
+let
+  defaultConfig = """
+[rsync]
+remote = "blimp@some-rsync-server.com::blimpstore"
+# $1 is filename, $2 is remote and $3 is the local blimpstore
+upload = "rsync --password-file ~/blimp.pass -avzP $3/$1 $2/"
+download = "rsync -avzP $2/$1 $3/"
+"""
 # Load blimp.conf file, overkill for now but...
 proc parseConfFile(filename: string) =
@@ -37,8 +47,13 @@ proc parseConfFile(filename: string) =
       of cfgSectionStart:
         continue # Ignore
       of cfgKeyValuePair:
-        if e.key == "remote":
+        case e.key
+        of "remote":
           remoteBlimpStore = e.value
+        of "upload":
+          uploadCommandFormat = e.value
+        of "download":
+          downloadCommandFormat = e.value
         else:
           quit("Unknown configuration: " & e.key)
       of cfgOption:
@@ -57,15 +72,17 @@ proc uploadFile(blimpFilename: string) =
   if remoteBlimpStore.isNil:
     echo("Remote blimpstore not set in configuration file, not uploading content:\n\t" & blimpFilename)
     return
-  let errorCode = run("rsync -a " & blimpStore / blimpFilename & " " & remoteBlimpStore)
-  if errorCode != 0: quit("Something went wrong uploading content to " & remoteBlimpStore, 2)
+  let errorCode = run(format(uploadCommandFormat, blimpFilename, remoteBlimpStore, blimpStore))
+  if errorCode != 0:
+    quit("Something went wrong uploading " & blimpFilename & " 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 = run("rsync -a " & remoteBlimpStore / blimpFilename & " " & blimpStore / "")
-  if errorCode != 0: quit("Something went wrong downloading " & blimpFilename & " from " & remoteBlimpStore, 3)
+  let errorCode = run(format(downloadCommandFormat, blimpFilename, remoteBlimpStore, blimpStore))
+  if errorCode != 0:
+    quit("Something went wrong downloading " & blimpFilename & " from " & remoteBlimpStore, 3)
 # Copy content to blimpStore, no upload yet.
@@ -135,7 +152,10 @@ blimpStore = getHomeDir() / &quot;blimpstore&quot;
 # Make sure we have the dir, or create it.
 try:
-  if not existsDir(blimpStore): createDir(blimpStore)
+  if not existsDir(blimpStore):
+    createDir(blimpStore)
+  if not existsFile(blimpStore / ".blimp.conf"):
+    writeFile(blimpStore / ".blimp.conf", defaultConfig)
 except:
   quit("Could not create " & blimpStore & " directory.", 1)