Added upload command, made file specifications use a set.

Göran Krampe
1 parent ec7d9613
Showing 1 changed file with 49 additions and 48 deletions
blimp.nim
-import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes, tables
+import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes, tables, sets
  
 # blimp is a little utility program for handling large files
 # in git repositories. Its inspired by git-fat and s3annex
 # but doesn't rely on S3 for storage - it uses rsync like git-fat.
 # It is a single binary without any dependencies.
 #
-# Manual use:
-#
-# Use "blimp d mybigfile" to deflate it before commit.
-# Use "blimp i mybigfile" to inflate it back to original size.
-#
-# When deflated the file only has:
-#   "blimphash:" <filename> + <an md5sum>
-# ...inside it.
-#
-# The file is copied over to a local dir:
-#  <blimpstore>/<filename>-<md5sum>
-#
-# Configuration is in these locations in order:
-#
-#   ./.blimp.conf
-#   <gitroot>/.blimp.conf
-#   ~/<blimpstore>/.blimp.conf
-#   ~/.blimp.conf
-#
-# This way you can have settings per directory, per git clone,
-# per store and per user. A default blimpstore with a commented .blimp.conf
-# is created in ~/blimpstore if you run blimp and no .blimp.conf is found.
+# Just run blimp --help for detailed help.
  
 const 
   versionMajor* = 0
@@ -189,7 +168,7 @@ proc remoteDeleteFile(blimpFilename: string) =
   if errorCode != 0:
     quit("Something went wrong deleting " & blimpFilename & " from " & remoteBlimpStore, 3)
  
-# Copy content to blimpStore, no upload yet.
+# Copy content to blimpStore and upload if it was a new file or upload == true.
 proc copyToBlimpStore(filename, blimpFilename: string) =
   if not existsFile(blimpStore / blimpFilename):
     if stdio:
@@ -200,6 +179,7 @@ proc copyToBlimpStore(filename, blimpFilename: string) =
     else:
       copyFile(filename, blimpStore / blimpFilename)
     uploadFile(blimpFilename)
+  
  
 # Copy content from blimpStore, and downloading first if needed
 proc copyFromBlimpStore(blimpFilename, filename: string) =
@@ -227,7 +207,7 @@ proc blimpFileNameFromString(line: string): string =
   else:
     result = nil
  
-# Pick out blimpFilename (filename & "-" & hash)
+# Pick out blimpFilename (filename & "-" & hash) or nil
 proc blimpFileName(filename: string): string =
   if stdio:
     blimpFileNameFromString(stdinContent)
@@ -299,6 +279,19 @@ proc remove(filename: string) =
   echo("\t" & filename & " content removed from blimpstore locally and remotely.")
  
  
+# Copy original file to blimpStore and replace with hash stub in git.
+proc upload(filename: string) =
+  if verbose: echo "Uploading " & filename
+  var blimpFilename = blimpFilename(filename)
+  if blimpFilename.isNil:
+    blimpFilename = computeBlimpFilename(filename)
+  if existsFile(blimpStore / blimpFilename):
+    uploadFile(blimpFilename)
+    if verbose: echo("\t" & filename & " uploaded.")
+  else:
+    if verbose: echo("\t" & filename & " is not in blimpstore, skipping.")
+
+
 proc setupBlimpStore() =
   try:
     if not existsDir(blimpStore):
@@ -333,7 +326,7 @@ let synopsis = &quot;&quot;&quot;
     -v,--verbose             Verbosity, only works without -s
     -i,--init                Set blimp filter in git config
     ----------
-    <command>   (string)     (d)eflate, (i)nflate, remove
+    <command>   (string)     (d)eflate, (i)nflate, remove, upload
     -a,--all                 Operate on all deflated files in clone
     -f,--filter              Operate on all files matching blimp filter
     ----------
@@ -341,6 +334,7 @@ let synopsis = &quot;&quot;&quot;
     <filenames> (string...)  One or more filepaths to inflate/deflate
 """
 let help = """
+
   blimp is a little utility program for handling large files
   in git repositories. Its inspired by git-fat and s3annex
   but doesn't rely on S3 for storage - it uses rsync like git-fat.
@@ -352,9 +346,9 @@ let help = &quot;&quot;&quot;
   Use "blimp d mybigfile" to deflate a file, typically before commit.
   Use "blimp i mybigfile" to inflate it back to original content.
  
-  When deflated the file only has:
+  When deflated the file only has this content:
+  
     "blimphash:" <filename> "-" <md5sum>
-  ...inside it.
  
   Deflate also copies the real content to your local blimpstore:
  
@@ -391,6 +385,10 @@ let help = &quot;&quot;&quot;
   the current content version, not older versions. The file itself is first
   inflated, if needed, and not deleted. This only "unblimps" the file.
  
+  The upload command (no single character shortcut) will upload the given file
+  from the local blimpstore to the remote. This is normally done automatically,
+  but this way you can make sure they are up on the remote.
+  
   In order to have blimp work automatically you can:
  
   * Create a .gitattributes file with lines like:
@@ -408,7 +406,7 @@ let help = &quot;&quot;&quot;
   This means that if you clone a git repository that already has a .gitattributes
   file in it that uses the blimp filter, then you should do:
  
-    blimp --init inflate --all
+    blimp --init inflate --filter
  
   This will configure the blimp filter and also find and inflate all deflated
   files throughout the clone.
@@ -469,9 +467,19 @@ if args[&quot;init&quot;].asBool:
   if verbose: echo("Installed blimp filter")
  
 let command = args["command"].asString
-var filenames: seq[PValue]
+var filenames = initSet[string]()
+
+# Add upp all files to operate on in a Set
 if args.hasKey("filenames"):
-  filenames = args["filenames"].asSeq
+  for f in args["filenames"].asSeq:
+    if f.asString != "":
+      filenames.incl(f.asString)
+if onAllDeflated:
+  for fn in allDeflated():
+    filenames.incl(fn)
+if onAllFiltered:
+  for fn in allFiltered():
+    filenames.incl(fn)
  
 # Make sure the local blimpstore is setup.
 setupBlimpStore()
@@ -479,27 +487,20 @@ setupBlimpStore()
 # Do the deed
 if command != "":
   if command == "d" or command == "deflate":
-    if onAllFiltered:
-      for fn in allFiltered():
-        deflate(fn)
-    else:
-      for fn in filenames:
-        deflate(fn.asString)
+    for fn in filenames:
+      deflate(fn)
   elif command == "i" or command == "inflate":
-    if onAllDeflated:
-      for fn in allDeflated():
-        inflate(fn)
-    elif onAllFiltered:
-      for fn in allFiltered():
-        inflate(fn)
-    else:
-      for fn in filenames:
-        inflate(fn.asString)
+    for fn in filenames:
+      inflate(fn)
   elif command == "remove":
     for fn in filenames:
-      remove(fn.asString)
+      remove(fn)
+  elif command == "upload":
+    echo repr(filenames)
+    for fn in filenames.items:
+      upload(fn)
   else:
-    quit("Unknown command, only (d)eflate, (i)inflate or remove are valid.", 6)
+    quit("Unknown command: \"" & command & "\",  only (d)eflate, (i)inflate, remove or upload are valid.", 6)
  
 # All good
 quit(0)