Merge pull request #5057 from Chocobozzz/master

Fix byte range requests with seafile (server >= 4.4.1)
This commit is contained in:
John Maguire 2015-10-05 18:31:35 +01:00
commit 816ff54cb0
3 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,7 @@
Next release:
Major features:
* Vk.com support
* Seafile support
* Seafile support (server >= 4.4.1)
* Amazon Cloud Drive support
* Add Ampache compatibility (through Subsonic service)
* Add new analyzer "Rainbow Dash"

View File

@ -250,7 +250,7 @@ void SeafileService::UpdateLibrariesInProgress(
library_updated_ = library_to_update;
if (library_to_update == "none") {
if (library_to_update.isEmpty() || library_to_update == "none") {
app_->task_manager()->SetTaskFinished(indexing_task_id_);
indexing_task_id_ = -1;
UpdatingLibrariesFinishedSignal();
@ -475,6 +475,8 @@ QNetworkReply* SeafileService::PrepareFetchContentUrlForFile(
const QString& library, const QString& filepath) {
QUrl content_url(server_ + QString(kFileUrl).arg(library));
content_url.addQueryItem("p", filepath);
// See https://github.com/haiwen/seahub/issues/677
content_url.addQueryItem("reuse", "1");
QNetworkRequest request(content_url);
AddAuthorizationHeader(&request);

View File

@ -134,7 +134,7 @@ void SeafileSettingsPage::Login() {
}
void SeafileSettingsPage::Logout() {
// Forget the songs added
// Forget the added songs by changing the library to "none"
service_->ChangeLibrary("none");
service_->ForgetCredentials();