Merge branch 'dev' into movie-time

package.json

@@ -1,6 +1,6 @@
 {
   "name": "movie-web",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "private": true,
   "homepage": "https://movie.squeezebox.dev",
   "dependencies": {

src/backend/providers/netfilm.ts

@@ -22,6 +22,7 @@ registerProvider({
   displayName: "NetFilm",
   rank: 15,
   type: [MWMediaType.MOVIE, MWMediaType.SERIES],
+  disabled: true, // The creator has asked us (very nicely) to leave him alone. Until (if) we self-host, netfilm should remain disabled
 
   async scrape({ media, episode, progress }) {
     if (!this.type.includes(media.meta.type)) {

src/backend/providers/superstream/index.ts

@@ -229,9 +229,7 @@ registerProvider({
       (subtitle: any): MWCaption | null => {
         const sub = subtitle;
         sub.subtitles = subtitle.subtitles.filter((subFile: any) => {
-          const extension = subFile.file_path.substring(
+          const extension = subFile.file_path.slice(-3);
-            sub.file_path.length - 3
-          );
           return [MWCaptionType.SRT, MWCaptionType.VTT].includes(extension);
         });
         return {

src/components/popout/FloatingView.tsx

@@ -29,6 +29,7 @@ export function FloatingView(props: Props) {
         data-floating-page={props.show ? "true" : undefined}
         style={{
           height: props.height ? `${props.height}px` : undefined,
+          maxHeight: "70vh",
           width: props.width ? width : undefined,
         }}
       >

src/components/popout/positions/FloatingCardMobilePosition.tsx

@@ -21,8 +21,20 @@ export function FloatingCardMobilePosition(props: MobilePositionProps) {
   }));
 
   const bind = useDrag(
-    ({ last, velocity: [, vy], direction: [, dy], movement: [, my] }) => {
+    ({
+      last,
+      velocity: [, vy],
+      direction: [, dy],
+      movement: [, my],
+      ...event
+    }) => {
       if (closing.current) return;
+
+      const isInScrollable = (event.target as HTMLDivElement).closest(
+        ".overflow-y-auto"
+      );
+      if (isInScrollable) return; // Don't attempt to swipe the thing away if it's a scroll area unless the scroll area is at the top and the user is swiping down
+
       const height = cardRect?.height ?? 0;
       if (last) {
         // if past half height downwards
@@ -69,7 +81,7 @@ export function FloatingCardMobilePosition(props: MobilePositionProps) {
 
   return (
     <div
-      className="absolute inset-x-0 mx-auto max-w-[400px] origin-bottom-left touch-none"
+      className="is-mobile-view absolute inset-x-0 mx-auto max-w-[400px] origin-bottom-left touch-none"
       style={{
         transform: `translateY(${
           window.innerHeight - (cardRect?.height ?? 0) + 200

src/setup/index.css

@@ -38,6 +38,7 @@ body[data-no-select] {
   from {
     transform: rotate(0deg);
   }
+
   to {
     transform: rotate(360deg);
   }
@@ -55,6 +56,10 @@ body[data-no-select] {
   @apply brightness-[500];
 }
 
+.is-mobile-view .overflow-y-auto {
+  height: 60vh;
+}
+
 /*generated with Input range slider CSS style generator (version 20211225)
 https://toughengineer.github.io/demo/slider-styler*/
 :root {
@@ -62,6 +67,7 @@ https://toughengineer.github.io/demo/slider-styler*/
   --slider-border-radius: 1em;
   --slider-progress-background: #8652bb;
 }
+
 input[type=range].styled-slider {
   height: var(--slider-height);
   -webkit-appearance: none;