People: Improve logging, command help, and handling of broken files #22

Author: lastzero

frontend/package-lock.json

@@ -41,13 +41,13 @@
                                    @click.stop.prevent="downloadFile(file)">
                               <translate>Download</translate>
                             </v-btn>
-                            <v-btn v-if="features.edit && file.Type === 'jpg' && !file.Primary" small depressed dark
+                            <v-btn v-if="features.edit && file.Type === 'jpg' && file.Error === '' && !file.Primary" small depressed dark
                                    color="primary-button"
                                    class="ma-0 action-primary"
                                    @click.stop.prevent="primaryFile(file)">
                               <translate>Primary</translate>
                             </v-btn>
-                            <v-btn v-if="features.edit && !file.Sidecar && !file.Primary && file.Root === '/'" small
+                            <v-btn v-if="features.edit && !file.Sidecar && file.Error === '' && !file.Primary && file.Root === '/'" small
                                    depressed dark color="primary-button"
                                    class="ma-0 action-unstack"
                                    @click.stop.prevent="unstackFile(file)">
@@ -66,6 +66,12 @@
                           </td>
                           <td>{{ file.UID | uppercase }}</td>
                         </tr>
+                        <tr v-if="file.Error">
+                          <td>
+                            <translate>Error</translate>
+                          </td>
+                          <td><span class="body-2">{{ file.Error | uppercase }}</span></td>
+                        </tr>
                         <tr v-if="file.InstanceID" title="XMP">
                           <td>
                             <translate>Instance ID</translate>
@@ -162,12 +168,6 @@
                           </td>
                           <td>{{ file.Chroma }} / 100</td>
                         </tr>
-                        <tr v-if="file.Error">
-                          <td>
-                            <translate>Error</translate>
-                          </td>
-                          <td>{{ file.Error }}</td>
-                        </tr>
                         <tr v-if="file.Missing">
                           <td>
                             <translate>Missing</translate>

frontend/src/dialog/photo/files.vue

@@ -76,15 +76,15 @@ func AlbumCover(router *gin.RouterGroup) {
 		f, err := query.AlbumCoverByUID(uid)
 
 		if err != nil {
-			log.Debugf("%s: no photos yet, using generic image for %s", albumCover, uid)
+			log.Debugf("%s: %s contains no photos, using generic cover", albumCover, uid)
 			c.Data(http.StatusOK, "image/svg+xml", albumIconSvg)
 			return
 		}
 
 		fileName := photoprism.FileName(f.FileRoot, f.FileName)
 
 		if !fs.FileExists(fileName) {
-			log.Errorf("%s: could not find original for %s", albumCover, fileName)
+			log.Errorf("%s: found no original for %s", albumCover, fileName)
 			c.Data(http.StatusOK, "image/svg+xml", albumIconSvg)
 
 			// Set missing flag so that the file doesn't show up in search results anymore.

internal/api/covers.go

@@ -15,7 +15,7 @@ func TestAlbumCover(t *testing.T) {
 
 		assert.Equal(t, http.StatusOK, r.Code)
 	})
-	t.Run("album has no photo (because is not existing)", func(t *testing.T) {
+	t.Run("album contains no photos (because is not existing)", func(t *testing.T) {
 		app, router, conf := NewApiTest()
 		AlbumCover(router)
 		r := PerformRequest(app, "GET", "/api/v1/albums/987-986435/t/"+conf.PreviewToken()+"/tile_500")

internal/api/covers_test.go

@@ -85,7 +85,7 @@ func FolderCover(router *gin.RouterGroup) {
 		f, err := query.FolderCoverByUID(uid)
 
 		if err != nil {
-			log.Debugf("%s: no photos yet, using generic image for %s", folderCover, uid)
+			log.Debugf("%s: %s contains no photos, using generic cover", folderCover, uid)
 			c.Data(http.StatusOK, "image/svg+xml", folderIconSvg)
 			return
 		}

internal/api/folder_cover.go

@@ -77,7 +77,7 @@ func StartImport(router *gin.RouterGroup) {
 		}
 
 		if len(f.Albums) > 0 {
-			log.Debugf("import: files will be added to album %s", strings.Join(f.Albums, " and "))
+			log.Debugf("import: adding files to album %s", strings.Join(f.Albums, " and "))
 			opt.Albums = f.Albums
 		}
 

internal/api/import.go

@@ -81,11 +81,11 @@ func PhotoUnstack(router *gin.RouterGroup) {
 			AbortEntityNotFound(c)
 			return
 		} else if related.Len() == 0 {
-			log.Errorf("photo: no files found for %s (unstack)", txt.Quote(baseName))
+			log.Errorf("photo: found no files for %s (unstack)", txt.Quote(baseName))
 			AbortEntityNotFound(c)
 			return
 		} else if related.Main == nil {
-			log.Errorf("photo: no main file found for %s (unstack)", txt.Quote(baseName))
+			log.Errorf("photo: found no main file for %s (unstack)", txt.Quote(baseName))
 			AbortEntityNotFound(c)
 			return
 		}

internal/api/photo_unstack.go

@@ -85,9 +85,9 @@ func configAction(ctx *cli.Context) error {
 	fmt.Printf("%-25s %s\n", "site-url", conf.SiteUrl())
 	fmt.Printf("%-25s %s\n", "site-preview", conf.SitePreview())
 	fmt.Printf("%-25s %s\n", "site-title", conf.SiteTitle())
+	fmt.Printf("%-25s %s\n", "site-author", conf.SiteAuthor())
 	fmt.Printf("%-25s %s\n", "site-caption", conf.SiteCaption())
 	fmt.Printf("%-25s %s\n", "site-description", conf.SiteDescription())
-	fmt.Printf("%-25s %s\n", "site-author", conf.SiteAuthor())
 	fmt.Printf("%-25s %s\n", "cdn-url", conf.CdnUrl("/"))
 	fmt.Printf("%-25s %s\n", "content-uri", conf.ContentUri())
 	fmt.Printf("%-25s %s\n", "static-uri", conf.StaticUri())

internal/commands/config.go

@@ -35,7 +35,7 @@ var FacesCommand = cli.Command{
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "fix, f",
-					Usage: "issues will be fixed automatically",
+					Usage: "automatically fixes issues",
 				},
 			},
 			Action: facesAuditAction,
@@ -46,7 +46,7 @@ var FacesCommand = cli.Command{
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "force, f",
-					Usage: "remove all people and faces",
+					Usage: "removes all people and faces",
 				},
 			},
 			Action: facesResetAction,
@@ -63,7 +63,7 @@ var FacesCommand = cli.Command{
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "force, f",
-					Usage: "update all  faces",
+					Usage: "updates all faces",
 				},
 			},
 			Action: facesUpdateAction,

internal/commands/faces.go

@@ -48,9 +48,7 @@ func TestIndexCommand(t *testing.T) {
 		// Expected index command output.
 		assert.Contains(t, output, "indexing originals")
 		assert.Contains(t, output, "classify: loading labels")
-		assert.Contains(t, output, "index: no .ppignore file found")
-		assert.Contains(t, output, "index: updating primary files")
-		assert.Contains(t, output, "index: flagging hidden files")
+		assert.Contains(t, output, "index: found no .ppignore file")
 	} else {
 		t.Fatal("log output missing")
 	}