From 41b238e87b6da68630c560584bbe8d2f4c3170ba Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 26 Apr 2021 22:56:14 +0200
Subject: [PATCH] Formatting

---
 src/collection/collection.cpp        |  4 +--
 src/collection/collectionwatcher.cpp | 39 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/collection/collection.cpp b/src/collection/collection.cpp
index 32a340075..300a9e9fc 100644
--- a/src/collection/collection.cpp
+++ b/src/collection/collection.cpp
@@ -148,8 +148,8 @@ void SCollection::AbortScan() { watcher_->Stop(); }
 
 void SCollection::Rescan(const SongList &songs) {
 
-    qLog(Debug) << "Rescan" << songs.size() << "songs";
-    if (!songs.isEmpty()) watcher_->RescanTracksAsync(songs);
+  qLog(Debug) << "Rescan" << songs.size() << "songs";
+  if (!songs.isEmpty()) watcher_->RescanTracksAsync(songs);
 
 }
 
diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp
index 55fe076c0..ba2ab9885 100644
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -864,8 +864,9 @@ void CollectionWatcher::RescanTracksAsync(const SongList &songs) {
   song_rescan_queue_.append(songs);
 
   // Call only if it's not already running
-  if (!rescan_in_progress_)
+  if (!rescan_in_progress_) {
     QMetaObject::invokeMethod(this, "RescanTracksNow", Qt::QueuedConnection);
+  }
 
 }
 
@@ -875,25 +876,25 @@ void CollectionWatcher::FullScanNow() { PerformScan(false, true); }
 
 void CollectionWatcher::RescanTracksNow() {
 
-    Q_ASSERT(!rescan_in_progress_);
-    stop_requested_ = false;
+  Q_ASSERT(!rescan_in_progress_);
+  stop_requested_ = false;
 
-    // Currently we are too stupid to rescan one file at a time, so we'll just scan the full directiories
-    QStringList scanned_dirs; // To avoid double scans
-    while (!song_rescan_queue_.isEmpty()) {
-      if (stop_requested_) break;
-      Song song = song_rescan_queue_.takeFirst();
-      QString songdir = song.url().toLocalFile().section('/', 0, -2);
-      if (!scanned_dirs.contains(songdir)) {
-        qLog(Debug) << "Song" << song.title() << "dir id" << song.directory_id() << "dir" << songdir;
-        ScanTransaction transaction(this, song.directory_id(), false, false, mark_songs_unavailable_);
-        ScanSubdirectory(songdir, Subdirectory(), &transaction);
-        scanned_dirs << songdir;
-        emit CompilationsNeedUpdating();
-      }
-      else {
-        qLog(Debug) << "Directory" << songdir << "already scanned - skipping.";
-      }
+  // Currently we are too stupid to rescan one file at a time, so we'll just scan the full directiories
+  QStringList scanned_dirs; // To avoid double scans
+  while (!song_rescan_queue_.isEmpty()) {
+    if (stop_requested_) break;
+    Song song = song_rescan_queue_.takeFirst();
+    QString songdir = song.url().toLocalFile().section('/', 0, -2);
+    if (!scanned_dirs.contains(songdir)) {
+      qLog(Debug) << "Song" << song.title() << "dir id" << song.directory_id() << "dir" << songdir;
+      ScanTransaction transaction(this, song.directory_id(), false, false, mark_songs_unavailable_);
+      ScanSubdirectory(songdir, Subdirectory(), &transaction);
+      scanned_dirs << songdir;
+      emit CompilationsNeedUpdating();
+    }
+    else {
+      qLog(Debug) << "Directory" << songdir << "already scanned - skipping.";
+    }
   }
   Q_ASSERT(song_rescan_queue_.isEmpty());
   rescan_in_progress_ = false;