basic session handling works now

1 files changed, 9 insertions, 7 deletions

diff --git a/src/helsinki.at/rhimport/importer.go b/src/helsinki.at/rhimport/importer.go
index 1bfdf0c..a245270 100644
--- a/src/helsinki.at/rhimport/importer.go
+++ b/src/helsinki.at/rhimport/importer.go
@@ -693,18 +693,20 @@ func ImportFile(ctx *ImportContext) (res *ImportResult, err error) {
 	}
 
 	if ctx.Cart != 0 && ctx.Cut != 0 {
-		if err = import_audio(ctx, res); err != nil {
-			return
-		}
-		if res.ResponseCode != http.StatusOK {
-			rhl.Printf("Fileimport has failed (Cart/Cut %d/%d): %s", res.Cart, res.Cut, res.ErrorString)
+		if err = import_audio(ctx, res); err != nil || res.ResponseCode != http.StatusOK {
+			if err != nil {
+				rhl.Printf("Fileimport has failed (Cart/Cut %d/%d): %s", ctx.Cart, ctx.Cut, err)
+			} else {
+				rhl.Printf("Fileimport has failed (Cart/Cut %d/%d): %s", res.Cart, res.Cut, res.ErrorString)
+			}
+			// Try to clean up after failed import
 			rmres := ImportResult{ResponseCode: http.StatusOK}
 			if rmCartOnErr {
-				if err = remove_cart(ctx, &rmres); err != nil {
+				if rerr := remove_cart(ctx, &rmres); rerr != nil {
 					return
 				}
 			} else if rmCutOnErr {
-				if err = remove_cut(ctx, &rmres); err != nil {
+				if rerr := remove_cut(ctx, &rmres); rerr != nil {
 					return
 				}
 			}