From ae2938f2c98819dc115c9b1899a29c75c448dc9a Mon Sep 17 00:00:00 2001
From: simulot <jfcassan+github@gmail.com>
Date: Sun, 24 Dec 2023 18:49:09 +0100
Subject: [PATCH] chore: better report exclusions

---
 cmdupload/upload.go | 20 ++++++++++----------
 logger/journal.go   |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmdupload/upload.go b/cmdupload/upload.go
index eb4c57ee..7adf511d 100644
--- a/cmdupload/upload.go
+++ b/cmdupload/upload.go
@@ -316,35 +316,35 @@ func (app *UpCmd) handleAsset(ctx context.Context, a *browser.LocalAssetFile) er
 	}()
 	app.mediaCount++
 
-	ext := path.Ext(a.FileName)
-	if _, err := fshelper.MimeFromExt(ext); err != nil {
-		app.journalAsset(a, logger.DISCARDED, "not recognized extension")
-		return nil
-	}
+	// ext := path.Ext(a.FileName)
+	// if _, err := fshelper.MimeFromExt(ext); err != nil {
+	// 	app.journalAsset(a, logger.NOT_SELECTED, "not recognized extension")
+	// 	return nil
+	// }
 
 	if !app.KeepPartner && a.FromPartner {
-		app.journalAsset(a, logger.DISCARDED, "partners discarded")
+		app.journalAsset(a, logger.NOT_SELECTED, "partners asset excluded")
 		return nil
 	}
 
 	if !app.KeepTrashed && a.Trashed {
-		app.journalAsset(a, logger.DISCARDED, "trashed discarded")
+		app.journalAsset(a, logger.NOT_SELECTED, "trashed asset excluded")
 		return nil
 	}
 
 	if len(app.ImportFromAlbum) > 0 && !app.isInAlbum(a, app.ImportFromAlbum) {
-		app.journalAsset(a, logger.DISCARDED, "not in the requested album")
+		app.journalAsset(a, logger.NOT_SELECTED, "asset excluded because not from the required album")
 		return nil
 	}
 
 	if app.DateRange.IsSet() {
 		d := a.DateTaken
 		if d.IsZero() {
-			app.journalAsset(a, logger.DISCARDED, "date range import, impossible to get the date of capture")
+			app.journalAsset(a, logger.NOT_SELECTED, "asset excluded because  the date of capture is unknown and a date range is required.")
 			return nil
 		}
 		if !app.DateRange.InRange(d) {
-			app.journalAsset(a, logger.DISCARDED, "date of capture out of the date range")
+			app.journalAsset(a, logger.NOT_SELECTED, "asset excluded because the date of capture out of the date range")
 			return nil
 		}
 	}
diff --git a/logger/journal.go b/logger/journal.go
index d122dac9..2932dbc9 100644
--- a/logger/journal.go
+++ b/logger/journal.go
@@ -76,6 +76,7 @@ func (j *Journal) Report() {
 	j.Logger.OK("--------------------------------------------------------")
 
 	j.Logger.OK("%6d files with metadata", j.counts[ASSOCIATED_META])
+	j.Logger.OK("%6d discarded files because of options", j.counts[NOT_SELECTED])
 	j.Logger.OK("%6d discarded files because duplicated in the input", j.counts[LOCAL_DUPLICATE])
 	j.Logger.OK("%6d files already on the server", j.counts[SERVER_DUPLICATE])
 	j.Logger.OK("%6d uploaded files on the server", j.counts[UPLOADED])