Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Subsonic global search provider and some extra UI polish

This commit is contained in:
Alan Briolat 2013-01-21 22:13:48 +00:00
parent d424ed93a4
commit a5f6356be4
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/internet/subsonicservice.cpp
View File

@ -12,6 +12,8 @@
#include "core/database.h"
#include "core/closure.h"
#include "core/taskmanager.h"
#include "globalsearch/globalsearch.h"
#include "globalsearch/librarysearchprovider.h"
#include <QNetworkAccessManager>
#include <QNetworkReply>
@ -23,7 +25,7 @@
const char* SubsonicService::kServiceName = "Subsonic";
const char* SubsonicService::kSettingsGroup = "Subsonic";
const char* SubsonicService::kApiVersion = "1.7.0";
const char* SubsonicService::kApiVersion = "1.8.0";
const char* SubsonicService::kApiClientName = "Clementine";
const char* SubsonicService::kSongsTable = "subsonic_songs";
@ -81,8 +83,19 @@ SubsonicService::SubsonicService(Application* app, InternetModel *parent)
context_menu_->addActions(GetPlaylistActions());
context_menu_->addSeparator();
context_menu_->addAction(IconLoader::Load("view-refresh"), tr("Refresh catalogue"), this, SLOT(ReloadDatabase()));
QAction* config_action = context_menu_->addAction(IconLoader::Load("configure"),
tr("Configure Subsonic..."), this, SLOT(ShowConfig()));
context_menu_->addSeparator();
context_menu_->addMenu(library_filter_->menu());
library_filter_->AddMenuAction(config_action);
app_->global_search()->AddProvider(new LibrarySearchProvider(
library_backend_,
tr("Subsonic"),
"subsonic",
QIcon(":/providers/subsonic.png"),
true, app_, this));
}
SubsonicService::~SubsonicService()
@ -102,7 +115,9 @@ void SubsonicService::LazyPopulate(QStandardItem *item)
{
case InternetModel::Type_Service:
library_model_->Init();
if (total_song_count_ == 0 && !load_database_task_id_) {
if (login_state() != LoginState_Loggedin) {
ShowConfig();
} else if (total_song_count_ == 0 && !load_database_task_id_) {
ReloadDatabase();
}
model()->merged_model()->AddSubModel(item->index(), library_sort_model_);
@ -269,6 +284,11 @@ void SubsonicService::onPingFinished(QNetworkReply *reply)
emit LoginStateChanged(login_state_);
}
void SubsonicService::ShowConfig()
{
app_->OpenSettingsDialogAtPage(SettingsDialog::Page_Subsonic);
}
const int SubsonicLibraryScanner::kAlbumChunkSize = 500;
const int SubsonicLibraryScanner::kConcurrentRequests = 8;

2
src/internet/subsonicservice.h
View File

@ -117,6 +117,8 @@ class SubsonicService : public InternetService
void ReloadDatabaseFinished();
void onLoginStateChanged(SubsonicService::LoginState newstate);
void onPingFinished(QNetworkReply* reply);
void ShowConfig();
};
class SubsonicLibraryScanner : public QObject {