Merge remote-tracking branch 'upstream/pr/1453' into impatient

vt-idiot · Oct 30, 2023 · 5bbbc63 · 5bbbc63
2 parents 393066a + ffdf892
commit 5bbbc63
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 5 deletions.
diff --git a/pkg/api/options.go b/pkg/api/options.go
@@ -57,6 +57,7 @@ type RequestSaveOptionsWeb struct {
 	ShowSubtitlesFile bool   `json:"showSubtitlesFile"`
 	SceneTrailerlist  bool   `json:"sceneTrailerlist"`
 	UpdateCheck       bool   `json:"updateCheck"`
+	IsAvailOpacity    int    `json:"isAvailOpacity"`
 }
 
 type RequestSaveOptionsAdvanced struct {
@@ -380,6 +381,7 @@ func (i ConfigResource) saveOptionsWeb(req *restful.Request, resp *restful.Respo
 	config.Config.Web.ShowSubtitlesFile = r.ShowSubtitlesFile
 	config.Config.Web.SceneTrailerlist = r.SceneTrailerlist
 	config.Config.Web.UpdateCheck = r.UpdateCheck
+	config.Config.Web.IsAvailOpacity = r.IsAvailOpacity
 	config.SaveConfig()
 
 	resp.WriteHeaderAndEntity(http.StatusOK, r)

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -42,6 +42,7 @@ type ObjectConfig struct {
 		ShowSubtitlesFile bool   `default:"true" json:"showSubtitlesFile"`
 		SceneTrailerlist  bool   `default:"true" json:"sceneTrailerlist"`
 		UpdateCheck       bool   `default:"true" json:"updateCheck"`
+		IsAvailOpacity    int    `default:"40" json:"isAvailOpacity"`
 	} `json:"web"`
 	Advanced struct {
 		ShowInternalSceneId   bool   `default:"false" json:"showInternalSceneId"`

diff --git a/pkg/config/state.go b/pkg/config/state.go
@@ -25,6 +25,7 @@ type ObjectState struct {
 		ShowSubtitlesFile bool   `json:"showSubtitlesFile"`
 		SceneTrailerlist  bool   `json:"sceneTrailerlist"`
 		UpdateCheck       bool   `json:"updateCheck"`
+		IsAvailOpacity    int    `json:"isAvailOpacity"`
 	} `json:"web"`
 	DLNA struct {
 		Running  bool     `json:"running"`

diff --git a/ui/src/store/optionsWeb.js b/ui/src/store/optionsWeb.js
@@ -15,7 +15,8 @@ const state = {
     showHspFile: true,
     showSubtitlesFile: true,
     sceneTrailerlist: true,
-    updateCheck: true
+    updateCheck: true,
+    isAvailOpacity: 40,
   }
 }
 
@@ -40,6 +41,7 @@ const actions = {
         state.web.showSubtitlesFile = data.config.web.showSubtitlesFile
         state.web.sceneTrailerlist = data.config.web.sceneTrailerlist
         state.web.updateCheck = data.config.web.updateCheck
+        state.web.isAvailOpacity = data.config.web.isAvailOpacity        
         state.loading = false
       })
   },
@@ -61,6 +63,7 @@ const actions = {
         state.web.showSubtitlesFile = data.showSubtitlesFile
         state.web.sceneTrailerlist = data.sceneTrailerlist
         state.web.updateCheck = data.updateCheck
+        state.web.isAvailOpacity = data.isAvailOpacity        
         state.loading = false
       })
   }

diff --git a/ui/src/views/actors/ActorCard.vue b/ui/src/views/actors/ActorCard.vue
@@ -2,7 +2,7 @@
   <div class="card is-shadowless">
     <div class="card-image">
       <div class="bbox"
-           v-bind:style="{backgroundImage: `url(${getImageURL(actor.image_url)})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat', opacity:isAvailable(actor) ? 1.0 : 0.4}"
+           v-bind:style="{backgroundImage: `url(${getImageURL(actor.image_url)})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat', opacity:isAvailable(actor) ? 1.0 : isAvailOpactiy}"
            @click="showDetails(actor)"
            @mouseover="preview = true"
            @mouseleave="preview = false">
@@ -69,6 +69,12 @@ export default {
     }
   },
   computed: {
+      isAvailOpactiy () {      
+      if (this.$store.state.optionsWeb.web.isAvailOpacity == undefined) {
+        return .4
+      }
+      return this.$store.state.optionsWeb.web.isAvailOpacity / 100
+    },
   },
   methods: {
     getImageURL (u) {

diff --git a/ui/src/views/options/sections/InterfaceWeb.vue b/ui/src/views/options/sections/InterfaceWeb.vue
@@ -75,6 +75,13 @@
                 show subtitles File button
               </b-switch>
             </b-field>
+            <b-field label="Opacity of unavailable scenes">
+              <div class="columns">
+                <div class="column is-two-thirds">
+                  <b-slider :min="0" :max="100" :step="10" :tooltip="false" v-model="isAvailOpacity" opacity:isAvailOpacity></b-slider>
+                </div>
+              </div>
+            </b-field>
 
             <b-field label="Automatically Check for Updates">
               <b-switch v-model="updateCheck">
@@ -208,9 +215,20 @@ export default {
         this.$store.state.optionsWeb.web.showSubtitlesFile = value
       }
     },
+    isAvailOpacity: {
+      get () {
+        if  (this.$store.state.optionsWeb.web.isAvailOpacity == undefined) {
+          return 40
+        }
+        return this.$store.state.optionsWeb.web.isAvailOpacity
+      },
+      set (value) {
+        this.$store.state.optionsWeb.web.isAvailOpacity = value
+      }
+    },
     isLoading: function () {
       return this.$store.state.optionsWeb.loading
-    }
+    }    
   }
 }
 </script>

diff --git a/ui/src/views/scenes/SceneCard.vue b/ui/src/views/scenes/SceneCard.vue
@@ -2,7 +2,7 @@
   <div class="card is-shadowless">
     <div class="card-image">
       <div class="bbox"
-           v-bind:style="{backgroundImage: `url(${getImageURL(item.cover_url)})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat', opacity:item.is_available ? 1.0 : 0.4}"
+           v-bind:style="{backgroundImage: `url(${getImageURL(item.cover_url)})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat', opacity:item.is_available ? 1.0 : this.isAvailOpactiy}"
            @click="showDetails(item)"
            @mouseover="preview = true"
            @mouseleave="preview = false">
@@ -129,7 +129,13 @@ export default {
         }
       })
       return count
-    }
+    },
+    isAvailOpactiy () {
+      if (this.$store.state.optionsWeb.web.isAvailOpacity == undefined) {
+        return .4
+      }
+      return this.$store.state.optionsWeb.web.isAvailOpacity / 100
+    },
   },
   methods: {
     getImageURL (u) {