Skip to content

Commit

Permalink
Merge pull request #288 from midarrlabs/feature/v2.1.0
Browse files Browse the repository at this point in the history
v2.1.0
  • Loading branch information
trueChazza authored Feb 28, 2023
2 parents 0ad792f + 7da8206 commit 59b0ee0
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 21 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.PAT }}

- name: Build tag push
id: docker_build
uses: docker/build-push-action@v2
- name: Build tag
uses: docker/build-push-action@v3
with:
platforms: linux/amd64,linux/arm64
push: true
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Tag

on:
push:
tags:
- 'v2.1.0'

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.PAT }}

- name: Build tag
uses: docker/build-push-action@v3
with:
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/midarrlabs/midarr-server:${{ env.RELEASE_VERSION }}
build-args: |
"MIX_ENV=prod"
"SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}"
- name: Build latest
uses: docker/build-push-action@v3
with:
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/midarrlabs/midarr-server:latest
build-args: |
"MIX_ENV=prod"
"SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}"
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ This is a lightweight (albeit companion) media server to the likes of Radarr and
Your media is left untouched and unscathed as it is served through a simple (yet familiar) web interface that puts your media front and center for
**you** and **your** users to enjoy.

While other media solutions look to re-index, re-fetch and re-double handle your media library, **Midarr** simply levarages your pre-existing
services to delight and enchant **you** and **your** users' media experience.
While other media solutions look to re-index, re-fetch and re-double handle your media library, **Midarr** simply leverages your pre-existing
services to delight and enchant **your** media experience.

![Preview](priv/screenshots/ecosystem-v2.0.0.jpg)

### How is this lightweight?

* **No media indexing.** All the metadata needed is already on your server. **Midarr** never goes out looking for more, everything we need you already have.
* **No media transcoding.** Nope, none whatsoever. Your media is served fresh off the metal.
* **Direct streaming.** Your media is served fresh off the metal (*an experimental transcoder is available*).
* **Smart caching.** Your metadata is retrieved fresh off the metal, smartly kept in sync with your integrations.
* **No media editing.** We trust you already have it the way you like it, lets keep it that way.

### What does this do?
Expand Down Expand Up @@ -108,8 +108,8 @@ services:
### Integrations
* Supports Radarr - `v4.1`
* Supports Sonarr - `v3.0`
* Supports Radarr `v4.x`
* Supports Sonarr `v3.x`

On server startup **Midarr** attempts to auto configure your integrations by:

Expand Down
2 changes: 1 addition & 1 deletion lib/media_server_web.ex
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ defmodule MediaServerWeb do
def live_view do
quote do
use Phoenix.LiveView,
layout: {MediaServerWeb.LayoutView, "live.html"}
layout: {MediaServerWeb.LayoutView, :live}

unquote(view_helpers())
end
Expand Down
6 changes: 3 additions & 3 deletions lib/media_server_web/components/header_home.ex
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ defmodule MediaServerWeb.Components.HeaderHome do
Play
<% end %>
<%= live_redirect to: MediaServerWeb.Router.Helpers.segment_movie_show_path(@socket, :show, Enum.at(@movies, 0)["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" do %>
<%= live_redirect to: MediaServerWeb.Router.Helpers.segment_movie_show_path(@socket, :show, Enum.at(@movies, 0)["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500" do %>
<svg
class="-ml-0.5 mr-2 h-6 w-6"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -90,10 +90,10 @@ defmodule MediaServerWeb.Components.HeaderHome do
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
/>
</svg>
Test
Test
<% end %>
<%= live_redirect to: MediaServerWeb.Router.Helpers.movies_show_path(@socket, :show, Enum.at(@movies, 0)["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500" do %>
<%= live_redirect to: MediaServerWeb.Router.Helpers.movies_show_path(@socket, :show, Enum.at(@movies, 0)["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500" do %>
<svg
xmlns="http://www.w3.org/2000/svg"
class="-ml-0.5 mr-2 h-6 w-6"
Expand Down
2 changes: 1 addition & 1 deletion lib/media_server_web/components/nav_component.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
clip-rule="evenodd"
/>
</svg>
<.form :let={f} for={:search} id="search" phx-target={@myself} phx-submit="search">
<.form :let={f} for={%{}} as={:search} id="search" phx-target={@myself} phx-submit="search">
<%= text_input(f, :query,
placeholder: "Search...",
class:
Expand Down
7 changes: 4 additions & 3 deletions lib/media_server_web/live/movies_live/show.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
Play
<% end %>

<%= live_redirect to: Routes.segment_movie_show_path(@socket, :show, @movie["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" do %>
<%= live_redirect to: Routes.segment_movie_show_path(@socket, :show, @movie["id"]), class: "inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500" do %>
<svg
class="-ml-0.5 mr-2 h-6 w-6"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -86,7 +86,7 @@
<button
id="add-to-playlists"
phx-click={JS.toggle(to: "#playlists")}
class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500"
class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500"
>
<svg
class="-ml-0.5 mr-2 h-6 w-6"
Expand Down Expand Up @@ -124,7 +124,8 @@
<.form
:let={f}
id="playlists-form"
for={:playlists}
for={%{}}
as={:playlists}
phx-change="save"
class="divide-y divide-gray-200"
>
Expand Down
2 changes: 1 addition & 1 deletion lib/media_server_web/live/playlist_live/index.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
>
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
</svg>
<.form :let={f} id="playlists-form" for={:playlists} phx-submit="save">
<.form :let={f} id="playlists-form" for={%{}} as={:playlists} phx-submit="save">
<%= text_input(f, :name,
placeholder: "New playlist",
class:
Expand Down
2 changes: 1 addition & 1 deletion lib/media_server_web/live/seasons_live/show.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<span class="ml-3">Play</span>
<% end %>

<%= live_redirect id: "test-#{ item["id"] }", to: Routes.segment_episode_show_path(@socket, :show, item["id"]), class: "flex items-center text-sm font-bold leading-6 text-red-700 hover:text-red-500" do %>
<%= live_redirect id: "test-#{ item["id"] }", to: Routes.segment_episode_show_path(@socket, :show, item["id"]), class: "flex items-center text-sm font-bold leading-6 text-slate-700 hover:text-slate-500" do %>
<svg
aria-hidden="true"
viewBox="0 0 10 10"
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defmodule MediaServer.MixProject do
{:cors_plug, "~> 3.0"},
{:scrivener, "~> 2.0"},
{:extitles, "~> 0.1.0"},
{:exstream, "~> 0.15.0"}
{:exstream, "~> 0.16.0"}
]
end

Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"exile": {:hex, :exile, "0.1.0", "082518fbb5104de8b7fc4b4040065e8cb5508524d844718068a6e6d00eb15d40", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "d7dcfa2c9a4809af02bcf979d9ef017cca8db8bf041a7ec2cefb4f58eef9e708"},
"expo": {:hex, :expo, "0.4.0", "bbe4bf455e2eb2ebd2f1e7d83530ce50fb9990eb88fc47855c515bfdf1c6626f", [:mix], [], "hexpm", "a8ed1683ec8b7c7fa53fd7a41b2c6935f539168a6bb0616d7fd6b58a36f3abf2"},
"exqlite": {:hex, :exqlite, "0.13.0", "fd92c307053490573c437dd50914d435b04129d014d913e97acf67681f93b6b0", [:make, :mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "e78038cd315e695f4ea5823a9c0a7ab271549d4f3010962bd76219fbd9f79201"},
"exstream": {:hex, :exstream, "0.14.0", "7988c0ff07b6bcb14d36ff89e5bff594b04608d7e9a8ee39c06f4078bda260ca", [:mix], [{:exile, "~> 0.1.0", [hex: :exile, repo: "hexpm", optional: false]}, {:extaima, "~> 0.3.0", [hex: :extaima, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}], "hexpm", "ac42bdd648508ede8acc3236c4506941d9c8e2807ecc0ff63510e0297a1cfe4b"},
"exstream": {:hex, :exstream, "0.16.0", "9c53dc1ea70e93ce3a8c21ebd85e826ca849b680f2f5568ee81f9e3c6608ba64", [:mix], [{:exile, "~> 0.1.0", [hex: :exile, repo: "hexpm", optional: false]}, {:extaima, "~> 0.3.0", [hex: :extaima, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}], "hexpm", "38463be7899a1e02676d381408f5894fb86cd9dac3ffef6c9d3ae651c9b471b6"},
"extaima": {:hex, :extaima, "0.3.0", "388e17aa8f67e27bb7bca2182a8942eadcd414e6e6f59b43e2e0024b86361d06", [:mix], [], "hexpm", "b77c20980ed6cd3ae360bbbe787559bae0b1cf62e76b9509c3bca0f835a02668"},
"extitles": {:hex, :extitles, "0.1.0", "bc3566f7feae87d0b8a2dddb872968884e924e1b1fbc83386f041162e6f8782a", [:mix], [], "hexpm", "2c5c1376ffc0625cd3fa8f961e857465acecc390b4239ddcc718dacde5c5accc"},
"file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
Expand Down

0 comments on commit 59b0ee0

Please sign in to comment.