Merge pull request #14 from nandyalu/main

Add some updates

Author: aculix

.github/workflows/docker-publish-release.yml

@@ -0,0 +1,88 @@
+name: Docker Publish for Release
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build_and_publish:
+    name: Push Docker image to Github Container Registry
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+    
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@v3.5.0
+        with:
+          cosign-release: 'v2.2.4'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+  
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GIT_TOKEN }} 
+      
+      - name: Ensure cache directory exists
+        run: mkdir -p /tmp/.buildx-cache
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          # Cache key based on package.json and Dockerfile
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-docker-${{ hashFiles('package.json', 'Dockerfile') }}
+          restore-keys: |
+            ${{ runner.os }}-docker-
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            latest
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            APP_VERSION=${{ github.ref_name }}
+
+      - name: Sign the published Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          TAGS: ${{ steps.meta.outputs.tags }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

Dockerfile

@@ -18,6 +18,10 @@ RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -o main .
 FROM alpine:3.18
 RUN apk --no-cache add ca-certificates
 
+# ARG APP_VERSION, will be set during build by github actions
+ARG APP_VERSION=0.0.0
+LABEL app.version=$APP_VERSION
+
 # Set working directory in final image
 WORKDIR /app
 

README.md

@@ -114,6 +114,11 @@ Settings are saved automatically to `/app/config/settings.json` inside the Docke
 1.  **Configure Settings:** Set up your proxy and search providers (Prowlarr/Jackett) as described above.
 2.  **Search:** Use the search bar to query Prowlarr or Jackett for torrents.
 3.  **Add Torrent:** Paste a magnet link directly or click a search result to add the torrent to BitPlay.
+
+    > BitPlay also supports opening from another app/program by providing torrent or magnet link as query parameter `torrent`. The link needs to be URL-encoded! 
+    >
+    > Ex: `http://localhost:3347?torrent=magnet%3A%3Fxt%3Durn%3Abtih%3A08ada5a7a6183aae1e09d831df6748d566095a10%26dn%3DSintel%26tr%3Dudp%253A%252F%252Fexplodie.org%253A6969%26tr%3Dudp%253A%252F%252Ftracker.coppersurfer.tk%253A6969%26tr%3Dudp%253A%252F%252Ftracker.empire-js.us%253A1337%26tr%3Dudp%253A%252F%252Ftracker.leechers-paradise.org%253A6969%26tr%3Dudp%253A%252F%252Ftracker.opentrackr.org%253A1337%26tr%3Dwss%253A%252F%252Ftracker.btorrent.xyz%26tr%3Dwss%253A%252F%252Ftracker.fastcast.nz%26tr%3Dwss%253A%252F%252Ftracker.openwebtorrent.com%26ws%3Dhttps%253A%252F%252Fwebtorrent.io%252Ftorrents%252F%26xs%3Dhttps%253A%252F%252Fwebtorrent.io%252Ftorrents%252Fsintel.torrent`
+
 4.  **Stream:** Once the torrent info is loaded, select the video file you want to watch. BitPlay will start downloading and streaming it directly in the built-in player.
 
 ## Contributing

client/assets/video-js.min.css

@@ -9,10 +9,7 @@
       content="BitPlay is a web-based torrent streaming application that allows you to stream torrents directly in your browser."
     />
     <link rel="icon" href="assets/favicon.png" type="image/png" />
-    <link
-      href="https://vjs.zencdn.net/8.10.0/video-js.min.css"
-      rel="stylesheet"
-    />
+    <link rel="stylesheet" href="assets/video-js.min.css" />
     <link rel="stylesheet" href="assets/butterup.min.css" />
     <link rel="stylesheet" href="assets/output.css" />
     <script>
@@ -22,6 +19,18 @@
       } else {
         document.documentElement.classList.add("light");
       }
+      // Read 'torrent' query parameter and set default value for magnet input
+      document.addEventListener("DOMContentLoaded", function () {
+        const urlParams = new URLSearchParams(window.location.search);
+        const torrent = urlParams.get("torrent");
+        if (torrent) {
+          const decodedTorrent = decodeURIComponent(torrent);
+          const magnetInput = document.getElementById("magnet");
+          if (magnetInput) {
+            magnetInput.value = decodedTorrent;
+          }
+        }
+      });
     </script>
   </head>
 
@@ -537,7 +546,7 @@ <h1 class="text-xl font-semibold">Settings</h1>
         </form>
       </div>
     </div>
-    <script src="https://vjs.zencdn.net/8.10.0/video.min.js"></script>
+    <script src="assets/video.min.js"></script>
     <script src="assets/videojs.hotkeys.min.js"></script>
     <script src="assets/butterup.min.js"></script>
     <script type="module" src="assets/index.js"></script>