Merge master

datastore.go

@@ -55,3 +55,9 @@ type DataStore interface {
 	// and writing, must return os.ErrNotExist or similar.
 	Terminate(id string) error
 }
+
+type FinisherDataStore interface {
+	DataStore
+
+	FinishUpload(id string) error
+}

unrouted_handler.go

@@ -369,10 +369,21 @@ func (handler *UnroutedHandler) PatchFile(w http.ResponseWriter, r *http.Request
 	newOffset := offset + bytesWritten
 	w.Header().Set("Upload-Offset", strconv.FormatInt(newOffset, 10))
 
-	// If the upload is completed, send the info out to the channel
+	// If the upload is completed, ...
-	if handler.config.NotifyCompleteUploads && newOffset == info.Size {
+	if newOffset == info.Size {
-		info.Size = newOffset
+		// ... allow custom mechanism to finish and cleanup the upload
-		handler.CompleteUploads <- info
+		if store, ok := handler.dataStore.(FinisherDataStore); ok {
+			if err := store.FinishUpload(id); err != nil {
+				handler.sendError(w, r, err)
+				return
+			}
+		}
+
+		// ... send the info out to the channel
+		if handler.config.NotifyCompleteUploads {
+			info.Size = newOffset
+			handler.CompleteUploads <- info
+		}
 	}
 
 	w.WriteHeader(http.StatusNoContent)