Ensure reset state of syncing when complete sync

app/jobs/media_sync_job.rb

@@ -1,19 +1,7 @@
 class MediaSyncJob < ApplicationJob
   queue_as :default
-  before_enqueue :start_syncing
-  after_perform :stop_syncing
 
   def perform(type = :all, file_paths = [])
     Media.sync(type, file_paths)
   end
-
-  private
-
-  def start_syncing
-    Media.syncing = true
-  end
-
-  def stop_syncing
-    Media.syncing = false
-  end
 end

app/models/media.rb

@@ -10,7 +10,9 @@ class Media
 
   class << self
     def sync(type = :all, file_paths = [])
+      self.syncing = true
       file_paths = MediaFile.file_paths if type == :all
+
       return if file_paths.blank?
 
       case type
@@ -25,6 +27,8 @@ def sync(type = :all, file_paths = [])
         remove_files(file_paths)
         add_files(file_paths)
       end
+    ensure
+      self.syncing = false
     end
 
     def syncing?

test/jobs/media_sync_job_test.rb

@@ -3,25 +3,17 @@
 require "test_helper"
 
 class MediaSyncJobTest < ActiveJob::TestCase
-  setup do
-    Media.syncing = false
-  end
-
   test "sync media" do
     mock = MiniTest::Mock.new
     mock.expect(:call, true, [:all, []])
 
     Setting.update(media_path: Rails.root.join("test/fixtures/files"))
-    assert_not Media.syncing?
 
     MediaSyncJob.perform_later
-    assert Media.syncing?
 
     Media.stub(:sync, mock) do
       perform_enqueued_jobs
       mock.verify
     end
-
-    assert_not Media.syncing?
   end
 end

test/models/media_test.rb

@@ -7,7 +7,6 @@ class MediaTest < ActiveSupport::TestCase
 
   setup do
     clear_media_data
-    Media.syncing = false
 
     Setting.update(media_path: Rails.root.join("test/fixtures/files"))
     Media.sync