UX improvements v1 (#39)

* Removed collection_type user input instead inferring from yt-dlp response

* Updated docs

* Added delete buttons for source; Refactored the way deletion methods work

* Update source to always run an initial index

* Added deletion to the last models

* Improved clarity around deletion operation

* Improved task fetching and deletion methods

* More tests

test/pinchflat_web/controllers/media_item_controller_test.exs

@@ -4,7 +4,6 @@ defmodule PinchflatWeb.MediaItemControllerTest do
   import Pinchflat.MediaFixtures
 
   alias Pinchflat.Repo
-  alias Pinchflat.Media
 
   describe "show media" do
     setup [:create_media_item]
@@ -19,10 +18,6 @@ defmodule PinchflatWeb.MediaItemControllerTest do
     setup do
       media_item = media_item_with_attachments()
 
-      on_exit(fn ->
-        Media.delete_attachments(media_item)
-      end)
-
       %{media_item: media_item}
     end
 

test/pinchflat_web/controllers/media_profile_controller_test.exs

@@ -1,8 +1,12 @@
 defmodule PinchflatWeb.MediaProfileControllerTest do
   use PinchflatWeb.ConnCase
 
+  import Pinchflat.MediaFixtures
+  import Pinchflat.SourcesFixtures
   import Pinchflat.ProfilesFixtures
 
+  alias Pinchflat.Repo
+
   @create_attrs %{name: "some name", output_path_template: "some output_path_template"}
   @update_attrs %{
     name: "some updated name",
@@ -97,21 +101,71 @@ defmodule PinchflatWeb.MediaProfileControllerTest do
     end
   end
 
-  describe "delete media_profile" do
+  describe "delete media_profile when just deleting the records" do
     setup [:create_media_profile]
 
-    test "deletes chosen media_profile", %{conn: conn, media_profile: media_profile} do
+    test "deletes chosen media_profile and its associations", %{conn: conn, media_profile: media_profile} do
+      source = source_fixture(media_profile_id: media_profile.id)
+      media_item = media_item_with_attachments(%{source_id: source.id})
+
       conn = delete(conn, ~p"/media_profiles/#{media_profile}")
       assert redirected_to(conn) == ~p"/media_profiles"
 
-      assert_error_sent 404, fn ->
-        get(conn, ~p"/media_profiles/#{media_profile}")
-      end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_profile) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(source) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_item) end
+    end
+
+    test "redirects to the media_profiles page", %{conn: conn, media_profile: media_profile} do
+      conn = delete(conn, ~p"/media_profiles/#{media_profile}")
+
+      assert redirected_to(conn) == ~p"/media_profiles"
+    end
+
+    test "doesn't delete any files", %{conn: conn, media_profile: media_profile} do
+      source = source_fixture(media_profile_id: media_profile.id)
+      media_item = media_item_with_attachments(%{source_id: source.id})
+
+      delete(conn, ~p"/media_profiles/#{media_profile}")
+
+      assert File.exists?(media_item.media_filepath)
+    end
+  end
+
+  describe "delete media_profile when deleting the records and files" do
+    setup [:create_media_profile]
+
+    test "deletes chosen media_profile and its associations", %{conn: conn, media_profile: media_profile} do
+      source = source_fixture(media_profile_id: media_profile.id)
+      media_item = media_item_with_attachments(%{source_id: source.id})
+
+      conn = delete(conn, ~p"/media_profiles/#{media_profile}?delete_files=true")
+      assert redirected_to(conn) == ~p"/media_profiles"
+
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_profile) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(source) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_item) end
+    end
+
+    test "redirects to the media_profiles page", %{conn: conn, media_profile: media_profile} do
+      conn = delete(conn, ~p"/media_profiles/#{media_profile}?delete_files=true")
+
+      assert redirected_to(conn) == ~p"/media_profiles"
+    end
+
+    test "deletes the files", %{conn: conn, media_profile: media_profile} do
+      source = source_fixture(media_profile_id: media_profile.id)
+      media_item = media_item_with_attachments(%{source_id: source.id})
+
+      delete(conn, ~p"/media_profiles/#{media_profile}?delete_files=true")
+
+      refute File.exists?(media_item.media_filepath)
     end
   end
 
   defp create_media_profile(_) do
     media_profile = media_profile_fixture()
+
     %{media_profile: media_profile}
   end
 end

test/pinchflat_web/controllers/source_controller_test.exs

@@ -2,8 +2,11 @@ defmodule PinchflatWeb.SourceControllerTest do
   use PinchflatWeb.ConnCase
   import Mox
 
-  import Pinchflat.ProfilesFixtures
+  import Pinchflat.MediaFixtures
   import Pinchflat.SourcesFixtures
+  import Pinchflat.ProfilesFixtures
+
+  alias Pinchflat.Repo
 
   setup do
     media_profile = media_profile_fixture()
@@ -119,21 +122,53 @@ defmodule PinchflatWeb.SourceControllerTest do
     end
   end
 
-  describe "delete source" do
+  describe "delete source when just deleting the records" do
     setup [:create_source]
 
-    test "deletes chosen source", %{conn: conn, source: source} do
+    test "deletes chosen source and media_items", %{conn: conn, source: source, media_item: media_item} do
+      delete(conn, ~p"/sources/#{source}")
+
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(source) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_item) end
+    end
+
+    test "redirects to the sources page", %{conn: conn, source: source} do
       conn = delete(conn, ~p"/sources/#{source}")
       assert redirected_to(conn) == ~p"/sources"
+    end
 
-      assert_error_sent 404, fn ->
-        get(conn, ~p"/sources/#{source}")
-      end
+    test "does not delete the files", %{conn: conn, source: source, media_item: media_item} do
+      delete(conn, ~p"/sources/#{source}")
+      assert File.exists?(media_item.media_filepath)
+    end
+  end
+
+  describe "delete source when deleting the records and files" do
+    setup [:create_source]
+
+    test "deletes chosen source and media_items", %{conn: conn, source: source, media_item: media_item} do
+      delete(conn, ~p"/sources/#{source}?delete_files=true")
+
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(source) end
+      assert_raise Ecto.NoResultsError, fn -> Repo.reload!(media_item) end
+    end
+
+    test "redirects to the sources page", %{conn: conn, source: source} do
+      conn = delete(conn, ~p"/sources/#{source}?delete_files=true")
+      assert redirected_to(conn) == ~p"/sources"
+    end
+
+    test "deletes the files", %{conn: conn, source: source, media_item: media_item} do
+      delete(conn, ~p"/sources/#{source}?delete_files=true")
+      refute File.exists?(media_item.media_filepath)
     end
   end
 
   defp create_source(_) do
-    %{source: source_fixture()}
+    source = source_fixture()
+    media_item = media_item_with_attachments(%{source_id: source.id})
+
+    %{source: source, media_item: media_item}
   end
 
   defp runner_function_mock(_url, _opts, _ot) do