Merge remote-tracking branch 'remotes/upstream/master'

client/components/controls/LibraryFilterSelect.vue

@@ -276,6 +276,11 @@ export default {
           text: this.$strings.ButtonIssues,
           value: 'issues',
           sublist: false
+        },
+        {
+          text: this.$strings.LabelRSSFeedOpen,
+          value: 'feed-open',
+          sublist: false
         }
       ]
     },

client/components/modals/EditSeriesInputInnerModal.vue

@@ -14,6 +14,7 @@
               <ui-text-input-with-label ref="sequenceInput" v-model="selectedSeries.sequence" :label="$strings.LabelSequence" />
             </div>
           </div>
+          <div v-if="error" class="text-error text-sm mt-2 p-1">{{ error }}</div>
           <div class="flex justify-end mt-2 p-1">
             <ui-btn type="submit">{{ $strings.ButtonSubmit }}</ui-btn>
           </div>
@@ -34,12 +35,17 @@ export default {
     existingSeriesNames: {
       type: Array,
       default: () => []
+    },
+    originalSeriesSequence: {
+      type: String,
+      default: null
     }
   },
   data() {
     return {
       el: null,
-      content: null
+      content: null,
+      error: null
     }
   },
   watch: {
@@ -85,10 +91,17 @@ export default {
       }
     },
     submitSeriesForm() {
+      this.error = null
+
       if (this.$refs.newSeriesSelect) {
         this.$refs.newSeriesSelect.blur()
       }
 
+      if (this.selectedSeries.sequence !== this.originalSeriesSequence && this.selectedSeries.sequence.includes(' ')) {
+        this.error = this.$strings.MessageSeriesSequenceCannotContainSpaces
+        return
+      }
+
       this.$emit('submit')
     },
     clickClose() {
@@ -100,6 +113,7 @@ export default {
       }
     },
     setShow() {
+      this.error = null
       if (!this.el || !this.content) {
         this.init()
       }

client/components/modals/podcast/EpisodeFeed.vue

@@ -244,8 +244,8 @@ export default {
       const sizeInMb = payloadSize / 1024 / 1024
       const sizeInMbPretty = sizeInMb.toFixed(2) + 'MB'
       console.log('Request size', sizeInMb)
-      if (sizeInMb > 4.99) {
-        return this.$toast.error(`Request is too large (${sizeInMbPretty}) should be < 5Mb`)
+      if (sizeInMb > 9.99) {
+        return this.$toast.error(`Request is too large (${sizeInMbPretty}) should be < 10Mb`)
       }
 
       this.processing = true

client/components/ui/VueTrix.vue

@@ -31,7 +31,7 @@
         </div>
       </div>
     </trix-toolbar>
-    <trix-editor :toolbar="toolbarId" :contenteditable="!disabledEditor" :class="['trix-content']" ref="trix" :input="computedId" :placeholder="placeholder" @trix-change="handleContentChange" @trix-initialize="handleInitialize" @trix-focus="processTrixFocus" @trix-blur="processTrixBlur" />
+    <trix-editor :toolbar="toolbarId" :contenteditable="!disabledEditor" :class="['trix-content']" ref="trix" :input="computedId" :placeholder="placeholder" @trix-change="handleContentChange" @trix-initialize="handleInitialize" @trix-focus="processTrixFocus" @trix-blur="processTrixBlur" @trix-attachment-add="handleAttachmentAdd" />
     <input type="hidden" :name="inputName" :id="computedId" :value="editorContent" />
   </div>
 </template>
@@ -316,6 +316,12 @@ export default {
       if (this.$refs.trix && this.$refs.trix.blur) {
         this.$refs.trix.blur()
       }
+    },
+    handleAttachmentAdd(event) {
+      // Prevent pasting in images from the browser
+      if (!event.attachment.file) {
+        event.attachment.remove()
+      }
     }
   },
   mounted() {

client/components/widgets/EncoderOptionsCard.vue

@@ -162,7 +162,7 @@ export default {
       } else {
         // Find closest bitrate rounding up
         const bitratesToMatch = [32, 64, 128, 192]
-        const closestBitrate = bitratesToMatch.find((bitrate) => bitrate >= this.currentBitrate)
+        const closestBitrate = bitratesToMatch.find((bitrate) => bitrate >= this.currentBitrate) || 192
         this.selectedBitrate = closestBitrate + 'k'
       }
 

client/components/widgets/SeriesInputWidget.vue

@@ -2,7 +2,7 @@
   <div>
     <ui-multi-select-query-input v-model="seriesItems" text-key="displayName" :label="$strings.LabelSeries" :disabled="disabled" readonly show-edit @edit="editSeriesItem" @add="addNewSeries" />
 
-    <modals-edit-series-input-inner-modal v-model="showSeriesForm" :selected-series="selectedSeries" :existing-series-names="existingSeriesNames" @submit="submitSeriesForm" />
+    <modals-edit-series-input-inner-modal v-model="showSeriesForm" :selected-series="selectedSeries" :existing-series-names="existingSeriesNames" :original-series-sequence="originalSeriesSequence" @submit="submitSeriesForm" />
   </div>
 </template>
 
@@ -18,6 +18,7 @@ export default {
   data() {
     return {
       selectedSeries: null,
+      originalSeriesSequence: null,
       showSeriesForm: false
     }
   },
@@ -59,6 +60,7 @@ export default {
         ..._series
       }
 
+      this.originalSeriesSequence = _series.sequence
       this.showSeriesForm = true
     },
     addNewSeries() {
@@ -68,6 +70,7 @@ export default {
         sequence: ''
       }
 
+      this.originalSeriesSequence = null
       this.showSeriesForm = true
     },
     submitSeriesForm() {