Merge pull request #182 from ttshivers/search_library

Search tweaks
ttshivers · Sep 28, 2020 · 71ab10a · 71ab10a
2 parents f80e701 + e9aadef
commit 71ab10a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 15 deletions.
diff --git a/src/components/PlexOnDeck.vue b/src/components/PlexOnDeck.vue
@@ -46,7 +46,6 @@
       >
         <PlexThumbnail
           :content="content"
-          :machine-identifier="machineIdentifier"
           type="art"
           cols="12"
           sm="4"

diff --git a/src/components/PlexRecentlyAdded.vue b/src/components/PlexRecentlyAdded.vue
@@ -44,7 +44,6 @@
       >
         <PlexThumbnail
           :content="content"
-          :machine-identifier="machineIdentifier"
           full-title
           type="thumb"
           cols="4"

diff --git a/src/components/PlexThumbnail.vue b/src/components/PlexThumbnail.vue
@@ -78,30 +78,39 @@
         >
           <v-col
             cols="12"
-            style="max-width: 100%;"
+            class="text-subtitle-2 text-truncate"
           >
-            <div
-              class="text-subtitle-2 text-truncate"
-            >
-              {{ getTitle(content, fullTitle) }}
-            </div>
+            {{ getTitle(content, fullTitle) }}
           </v-col>
 
           <v-col
             cols="12"
+            class="text-caption text-truncate text--secondary"
           >
-            <div class="text-caption text-truncate text--secondary">
-              {{ getSecondaryTitle(content, fullTitle) }}
-            </div>
+            {{ getSecondaryTitle(content, fullTitle) }}
+          </v-col>
+
+          <v-col
+            v-if="content.reason"
+            cols="12"
+            class="text-caption text-truncate text--secondary"
+          >
+            {{ getReasonTitle(content) }}
           </v-col>
         </v-row>
       </template>
 
       <div>{{ getTitle(content, fullTitle) }}</div>
+
+      <div class="text-caption text--secondary">
+        {{ getSecondaryTitle(content, fullTitle) }}
+      </div>
+
       <div
+        v-if="content.reason"
         class="text-caption text--secondary"
       >
-        {{ getSecondaryTitle(content, fullTitle) }}
+        {{ getReasonTitle(content) }}
       </div>
     </v-tooltip>
   </v-card>
@@ -295,6 +304,12 @@ export default {
     }
   },
 
+  beforeDestroy() {
+    if (this.$el.vanillaTilt) {
+      this.$el.vanillaTilt.destroy();
+    }
+  },
+
   methods: {
     getImageUrl(width) {
       return this.GET_MEDIA_IMAGE_URL({

diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
@@ -76,7 +76,7 @@
 
           <v-list-item-content>
             <v-list-item-title> {{ getTitle(item) }} </v-list-item-title>
-            <v-list-item-subtitle> {{ getSecondaryTitle(item) }} </v-list-item-subtitle>
+            <v-list-item-subtitle> {{ getItemSecondaryTitle(item) }} </v-list-item-subtitle>
           </v-list-item-content>
         </v-list-item>
       </template>
@@ -159,6 +159,12 @@ export default {
       'SEARCH_PLEX_SERVER_HUB',
     ]),
 
+    getItemSecondaryTitle(item) {
+      return item.reason
+        ? this.getReasonTitle(item)
+        : this.getSecondaryTitle(item);
+    },
+
     getItemThumb({ type, thumb, grandparentThumb }) {
       switch (type) {
         case 'movie':

diff --git a/src/utils/contenttitleutils.js b/src/utils/contenttitleutils.js
@@ -1,3 +1,9 @@
+const reasonWord = {
+  section: 'in',
+  actor: 'with',
+  director: 'by',
+};
+
 export default {
   getTitle: (metadata, fullTitle) => {
     switch (metadata.type) {
@@ -63,4 +69,6 @@ export default {
       }
     }
   },
+
+  getReasonTitle: ({ reason, reasonTitle }) => `${reasonWord[reason]} ${reasonTitle}`,
 };
diff --git a/src/views/PlexLibrary.vue b/src/views/PlexLibrary.vue
@@ -60,7 +60,6 @@
       >
         <PlexThumbnail
           :content="content"
-          :machine-identifier="content.machineIdentifier"
           type="thumb"
           cols="4"
           sm="3"

diff --git a/src/views/PlexSearch.vue b/src/views/PlexSearch.vue
@@ -25,7 +25,6 @@
         >
           <PlexThumbnail
             :content="item"
-            :machine-identifier="item.machineIdentifier"
             show-server
             type="thumb"
             :cols="getHubCols(hub)"