Make new paging default, fixes #102

kraxarn · Nov 11, 2023 · 5ad1fa3 · 5ad1fa3
1 parent 6b5a769
commit 5ad1fa3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 57 deletions.
diff --git a/lib/include/lib/enum/experiment.hpp b/lib/include/lib/enum/experiment.hpp
@@ -7,6 +7,5 @@ namespace lib
 	 */
 	enum class experiment
 	{
-		new_paging = 1,
 	};
 }
diff --git a/src/commandline/args.hpp b/src/commandline/args.hpp
@@ -39,8 +39,3 @@
  * Print system information
  */
 #define ARG_SYSTEM_INFORMATION QStringLiteral("system-info")
-
-/**
- * Enable new paging experiment with better performance
- */
-#define ARG_NEW_PAGING QStringLiteral("experiment-new-paging")
diff --git a/src/commandline/parser.cpp b/src/commandline/parser.cpp
@@ -29,10 +29,6 @@ auto CommandLine::Parser::options() -> QList<QCommandLineOption>
 			ARG_SYSTEM_INFORMATION,
 			QStringLiteral("Print system information"),
 		},
-		{
-			ARG_NEW_PAGING,
-			QStringLiteral("Enable new page loading (experimental)"),
-		},
 		// Playback options
 		{
 			ARG_PLAY_PAUSE,

diff --git a/src/commandline/processor.cpp b/src/commandline/processor.cpp
@@ -14,12 +14,6 @@ auto CommandLine::Processor::process(const QCommandLineParser &parser) -> bool
 	if (parser.isSet(ARG_ENABLE_DEV))
 	{
 		lib::developer_mode::enabled = true;
-
-		if (parser.isSet(ARG_NEW_PAGING))
-		{
-			lib::developer_mode::add_experiment(lib::experiment::new_paging);
-		}
-
 		return false;
 	}
 

diff --git a/src/list/tracks.cpp b/src/list/tracks.cpp
@@ -662,56 +662,41 @@ void List::Tracks::refreshPlaylist(const lib::spt::playlist &playlist)
 {
 	auto *mainWindow = MainWindow::find(parentWidget());
 
-	if (lib::developer_mode::is_experiment_enabled(lib::experiment::new_paging))
+	const auto playlistUri = lib::spt::id_to_uri("playlist", playlist.id);
+	if (refreshing && playlistUri == mainWindow->history()->currentUri())
 	{
-		const auto playlistUri = lib::spt::id_to_uri("playlist", playlist.id);
-		if (refreshing && playlistUri == mainWindow->history()->currentUri())
-		{
-			return;
-		}
+		return;
+	}
 
-		refreshing = true;
+	refreshing = true;
+
+	spotify.playlist_tracks(playlist,
+		[this, mainWindow, playlist, playlistUri]
+			(const lib::result<lib::spt::page<lib::spt::track>> &result) -> bool
+		{
+			if (playlistUri != mainWindow->history()->currentUri())
+			{
+				refreshing = false;
+				return false;
+			}
 
-		spotify.playlist_tracks(playlist,
-			[this, mainWindow, playlist, playlistUri]
-				(const lib::result<lib::spt::page<lib::spt::track>> &result) -> bool
+			if (!result.success())
 			{
-				if (playlistUri != mainWindow->history()->currentUri())
-				{
-					refreshing = false;
-					return false;
-				}
-
-				if (!result.success())
-				{
-					StatusMessage::error(QString("Failed to load playlist: %1")
-						.arg(QString::fromStdString(result.message())));
-
-					refreshing = false;
-					return false;
-				}
-
-				if (load(result.value()))
-				{
-					return true;
-				}
+				StatusMessage::error(QString("Failed to load playlist: %1")
+					.arg(QString::fromStdString(result.message())));
 
 				refreshing = false;
-				saveToCache(playlist);
 				return false;
-			});
+			}
 
-		return;
-	}
+			if (load(result.value()))
+			{
+				return true;
+			}
 
-	spotify.playlist_tracks(playlist,
-		[this, playlist](const std::vector<lib::spt::track> &tracks)
-		{
-			auto newPlaylist = playlist;
-			newPlaylist.tracks = tracks;
-			this->load(newPlaylist.tracks);
-			this->setEnabled(true);
-			this->cache.set_playlist(newPlaylist);
+			refreshing = false;
+			saveToCache(playlist);
+			return false;
 		});
 }