Merge pull request #1446 from PRX/fix/megaphone_import_no_override

Fix megaphone import no override, and keep breaks

Author: kookster

app/models/imports/podcast_megaphone_import.rb

@@ -187,4 +187,8 @@ def import_drafts
   def import_drafts=(val)
     self.published_only = !ActiveModel::Type::Boolean.new.cast(val)
   end
+
+  def override_enclosures=(val)
+    super(ActiveModel::Type::Boolean.new.cast(val))
+  end
 end

app/models/tasks/copy_media_task.rb

@@ -34,7 +34,7 @@ def update_owner
         media_resource.channels = info[:Audio][:Channels].to_i
         media_resource.duration = info[:Audio][:Duration].to_f / 1000
         media_resource.bit_rate = info[:Audio][:Bitrate].to_i / 1000
-        if info[:Audio][:Tags] && media_resource.is_a?(Uncut)
+        if info[:Audio][:Tags] && media_resource.is_a?(Uncut) && media_resource.ad_breaks.blank?
           breaks = media_resource.breaks_from_tags(info[:Audio][:Tags])
           original_count = [media_resource.episode.segment_count.to_i, 1].max
           media_resource.ad_breaks = breaks

test/controllers/imports_controller_test.rb

@@ -38,10 +38,22 @@ class ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_difference("PodcastImport.count") do
       post podcast_imports_url(@podcast), params: {podcast_import: params}
     end
-
     assert_redirected_to podcast_import_url(@podcast, PodcastImport.last)
   end
 
+  test "should create megaphone import with false override_enclosures" do
+    megaphone_params = {url: feed.url, type: "PodcastMegaphoneImport", override_enclosures: "0"}
+
+    assert_difference("PodcastImport.count") do
+      post podcast_imports_url(@podcast), params: {podcast_import: megaphone_params}
+    end
+
+    last_import = PodcastImport.last
+    assert !last_import.override_enclosures
+
+    assert_redirected_to podcast_import_url(@podcast, last_import)
+  end
+
   test "authorizes creating imports" do
     @podcast.update(prx_account_uri: "/api/v1/accounts/456")
     post podcast_imports_url(@podcast), params: {podcast_import: params}

test/models/tasks/copy_media_task_test.rb

@@ -128,6 +128,24 @@
         end
       end
     end
+    it "will not override ad breaks if already set" do
+      slice = Minitest::Mock.new
+
+      episode = build(:episode, segment_count: 3)
+      uncut = build(:uncut, episode: episode)
+      uncut.ad_breaks = [1.0, 2.0]
+
+      task.stub(:media_resource, uncut) do
+        uncut.stub(:slice_contents, slice) do
+          assert_equal [1.0, 2.0], task.media_resource.ad_breaks
+          assert_equal 3, task.media_resource.episode.segment_count
+
+          task.update_owner
+          assert_equal [1.0, 2.0], task.media_resource.ad_breaks
+          assert_equal 3, task.media_resource.episode.segment_count
+        end
+      end
+    end
 
     it "updates audio metadata on complete" do
       task.media_resource.reset_media_attributes