Merge pull request #21 from midarrlabs/feature/refactor-integrations

Feature/refactor integrations

Author: trueChazza

.gitattributes

@@ -0,0 +1,19 @@
+name: Feature
+
+on:
+  push:
+    branches: [ 'feature/**' ]
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Up services
+      run: docker compose up -d
+
+    - name: Run tests
+      run: docker run --network=midarr-server_default --env DB_USERNAME=my_user --env DB_PASSWORD=my_password --env DB_DATABASE=my_database --env DB_HOSTNAME=postgresql --env TEST_DB_HOSTNAME=test-postgresql --mount type=bind,src=${GITHUB_WORKSPACE}/fixtures/movies,dst=/movies --mount type=bind,src=${GITHUB_WORKSPACE}/fixtures/shows,dst=/shows midarr-server_midarr:latest mix test

.github/workflows/feature.yml

@@ -9,11 +9,14 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-    - name: Check out code
-      uses: actions/checkout@v2
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Up services
+        run: docker compose up -d
 
-    - name: Run tests
-      run: docker compose up test
+      - name: Run tests
+        run: docker run --network=midarr-server_default --env DB_USERNAME=my_user --env DB_PASSWORD=my_password --env DB_DATABASE=my_database --env DB_HOSTNAME=postgresql --env TEST_DB_HOSTNAME=test-postgresql --mount type=bind,src=${GITHUB_WORKSPACE}/fixtures/movies,dst=/movies --mount type=bind,src=${GITHUB_WORKSPACE}/fixtures/shows,dst=/shows midarr-server_midarr:latest mix test
 
   release:
     needs: test

.github/workflows/master.yml

@@ -81,9 +81,19 @@ services:
       - DB_PASSWORD=my_password
       - DB_DATABASE=my_database
       - DB_HOSTNAME=postgresql
+
+#      Initialise admin account
       - [email protected]
       - SETUP_ADMIN_NAME=admin
       - SETUP_ADMIN_PASSWORD=passwordpassword # min length 12
+
+#      Radarr integration
+      - RADARR_BASE_URL=radarr:7878
+      - RADARR_API_KEY=someApiKey
+
+#      Sonarr integration
+      - SONARR_BASE_URL=sonarr:8989
+      - SONARR_API_KEY=someApiKey
     depends_on:
       postgresql:
         condition: service_healthy
@@ -113,7 +123,7 @@ volumes:
 ```
 This is so `Midarr` has the same reference to your media library as your integrations, and can serve them.
 
-#### Setup
+#### Initialise admin account
 
 An admin account will be initialised for you on server startup, provided you have these `environment` variables configured:
 
@@ -125,6 +135,24 @@ environment:
 ```
 Login with these credentials, and access the `Settings` page to configure your server.
 
+#### Radarr integration
+
+```yaml
+environment:
+  - RADARR_BASE_URL=radarr:7878
+  - RADARR_API_KEY=someApiKey
+```
+Provide these environment variables to integrate your Radarr instance.
+
+#### Sonarr integration
+
+```yaml
+environment:
+  - SONARR_BASE_URL=sonarr:8989
+  - SONARR_API_KEY=someApiKey
+```
+Provide these environment variables to integrate your Sonarr instance.
+
 ## Video support
 
 * Video H.264
@@ -133,13 +161,13 @@ Login with these credentials, and access the `Settings` page to configure your s
 
 ## Contributing
 
-Thank you for your contributions! Big or small - we welcome all!
+Thank you for all your contributions! Big or small - all is welcome!
 
 ## License
 
 `Midarr` is open-sourced software licensed under the [MIT license](LICENSE).
 
-## Screenshots
+## Preview
 
 ![Preview](docs/online.png)
 ![Preview](docs/series.png)

README.md

@@ -72,3 +72,9 @@ config :phoenix, :stacktrace_depth, 20
 
 # Initialize plugs at runtime for faster development compilation
 config :phoenix, :plug_init_mode, :runtime
+
+config :media_server,
+  movies_base_url: System.get_env("RADARR_BASE_URL"),
+  movies_api_key: System.get_env("RADARR_API_KEY"),
+  series_base_url: System.get_env("SONARR_BASE_URL"),
+  series_api_key: System.get_env("SONARR_API_KEY")

config/dev.exs

@@ -12,7 +12,7 @@ config :media_server, MediaServer.Repo,
   username: System.get_env("DB_USERNAME"),
   password: System.get_env("DB_PASSWORD"),
   database: System.get_env("DB_DATABASE"),
-  hostname: System.get_env("DB_HOSTNAME"),
+  hostname: System.get_env("TEST_DB_HOSTNAME"),
   pool_size: 10,
   pool: Ecto.Adapters.SQL.Sandbox
 
@@ -31,3 +31,9 @@ config :logger, level: :warn
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime
+
+config :media_server,
+  movies_base_url: "radarr:7878",
+  movies_api_key: "d031e8c9b9df4b2fab311d1c3b3fa2c5",
+  series_base_url: "sonarr:8989",
+  series_api_key: "1accda4476394bfcaddefe8c4fd77d4a"

config/test.exs

@@ -1,7 +1,9 @@
 version: "3.4"
 
 services:
-  web:
+
+  midarr:
+    container_name: midarr
     build: .
     ports:
       - 4000:4000
@@ -14,32 +16,54 @@ services:
       - DB_PASSWORD=my_password
       - DB_DATABASE=my_database
       - DB_HOSTNAME=postgresql
+      - [email protected]
+      - SETUP_ADMIN_NAME=admin
+      - SETUP_ADMIN_PASSWORD=passwordpassword
+      - TEST_DB_HOSTNAME=test-postgresql
+      - RADARR_BASE_URL=radarr:7878
+      - RADARR_API_KEY=d031e8c9b9df4b2fab311d1c3b3fa2c5
+      - SONARR_BASE_URL=sonarr:8989
+      - SONARR_API_KEY=1accda4476394bfcaddefe8c4fd77d4a
     depends_on:
       postgresql:
         condition: service_healthy
+      test-postgresql:
+        condition: service_healthy
       radarr:
         condition: service_healthy
       sonarr:
         condition: service_healthy
-    command: bash -c "mix ecto.migrate && mix phx.server"
+    command: bash -c "mix ecto.migrate && mix run priv/repo/seeds.exs && mix phx.server"
 
   postgresql:
-    image: bitnami/postgresql:14
+    container_name: postgresql
+    image: postgres
     ports:
       - 5432:5432
     environment:
-      - POSTGRESQL_USERNAME=my_user
-      - POSTGRESQL_PASSWORD=my_password
-      - POSTGRESQL_DATABASE=my_database
+      - POSTGRES_USER=my_user
+      - POSTGRES_PASSWORD=my_password
+      - POSTGRES_DB=my_database
+    healthcheck:
+      test: "exit 0"
+
+  test-postgresql:
+    container_name: test-postgresql
+    image: postgres
+    environment:
+      - POSTGRES_USER=my_user
+      - POSTGRES_PASSWORD=my_password
+      - POSTGRES_DB=my_database
     healthcheck:
       test: "exit 0"
 
   radarr:
-    image: lscr.io/linuxserver/radarr
+    container_name: radarr
+    image: linuxserver/radarr:3.2.2
     ports:
       - 7878:7878
     volumes:
-      - ./fixtures/radarr:/config
+      - ./fixtures/radarr/config.xml:/config/config.xml
       - ./fixtures/movies:/movies
     environment:
       - PUID=1000
@@ -48,33 +72,15 @@ services:
       test: "exit 0"
 
   sonarr:
-    image: lscr.io/linuxserver/sonarr
+    container_name: sonarr
+    image: linuxserver/sonarr:3.0.6
     ports:
       - 8989:8989
     volumes:
-      - ./fixtures/sonarr:/config
+      - ./fixtures/sonarr/config.xml:/config/config.xml
       - ./fixtures/shows:/shows
     environment:
       - PUID=1000
       - PGID=1000
     healthcheck:
-      test: "exit 0"
-
-  test:
-    build: .
-    volumes:
-      - ./fixtures/movies:/movies
-      - ./fixtures/shows:/shows
-    environment:
-      - DB_USERNAME=my_user
-      - DB_PASSWORD=my_password
-      - DB_DATABASE=my_database
-      - DB_HOSTNAME=postgresql
-    depends_on:
-      postgresql:
-        condition: service_healthy
-      radarr:
-        condition: service_healthy
-      sonarr:
-        condition: service_healthy
-    command: bash -c "mix ecto.migrate && mix test"
+      test: "exit 0"