mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 15:29:42 +01:00
Code Issues Releases Wiki Activity

Updater work

Browse Source
This commit is contained in:
Leo Franchi 2011-10-07 18:08:13 -04:00
parent 3b861983e6
commit 687ed02df0
13 changed files with 314 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -75,6 +75,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
settingslistdelegate.cpp
resolversmodel.cpp
tomahawkwindow.cpp
LoadXSPFDialog.cpp
)
SET( tomahawkHeaders ${tomahawkHeaders}
@ -124,6 +125,7 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
resolversmodel.h
delegateconfigwrapper.h
tomahawkwindow.h
LoadXSPFDialog.h
)
SET( tomahawkUI ${tomahawkUI}
@ -135,6 +137,7 @@ SET( tomahawkUI ${tomahawkUI}
audiocontrols.ui
GetNewStuffDialog.ui
LoadXSPFDialog.ui
)
INCLUDE_DIRECTORIES(

56
src/LoadXSPFDialog.cpp Normal file
View File

@ -0,0 +1,56 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/
#include "LoadXSPFDialog.h"
#include "ui_LoadXSPFDialog.h"
#include <QFileDialog>
LoadXSPFDialog::LoadXSPFDialog( QWidget* parent, Qt::WindowFlags f )
: QDialog( parent, f )
, m_ui( new Ui_LoadXSPF )
{
m_ui->setupUi( this );
connect( m_ui->buttonBox, SIGNAL( accepted() ), SLOT( accept() ) );
connect( m_ui->buttonBox, SIGNAL( rejected() ), SLOT( reject() ) );
connect( m_ui->navigateButton, SIGNAL( clicked( bool ) ), this, SLOT( getLocalFile() ) );
}
LoadXSPFDialog::~LoadXSPFDialog()
{
}
void
LoadXSPFDialog::getLocalFile()
{
QString url = QFileDialog::getOpenFileName( this, tr( "Load XSPF File" ), QDir::homePath(), ".xspf" );
m_ui->lineEdit->setText( url );
}
QString LoadXSPFDialog::xspfUrl() const
{
return m_ui->lineEdit->text();
}
bool
LoadXSPFDialog::autoUpdate() const
{
return m_ui->autoUpdate->isChecked();
}

43
src/LoadXSPFDialog.h Normal file
View File

@ -0,0 +1,43 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tomahawk is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LOADXSPFDIALOG_H
#define LOADXSPFDIALOG_H
#include <QDialog>
class Ui_LoadXSPF;
class LoadXSPFDialog : public QDialog
{
Q_OBJECT
public:
explicit LoadXSPFDialog( QWidget* parent = 0, Qt::WindowFlags f = 0 );
virtual ~LoadXSPFDialog();
QString xspfUrl() const;
bool autoUpdate() const;
public slots:
void getLocalFile();
private:
Ui_LoadXSPF* m_ui;
};
#endif // LOADXSPFDIALOG_H

102
src/LoadXSPFDialog.ui Normal file
View File

@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LoadXSPF</class>
<widget class="QDialog" name="LoadXSPF">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>332</width>
<height>86</height>
</rect>
</property>
<property name="windowTitle">
<string>Load XSPF</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>XSPF Url:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit">
<property name="placeholderText">
<string>Enter URL...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="navigateButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="autoUpdate">
<property name="text">
<string>Automatically update</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>LoadXSPF</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>LoadXSPF</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

9
src/libtomahawk/playlist.cpp
View File

@ -116,6 +116,7 @@ Playlist::Playlist( const source_ptr& src,
, m_lastmodified( lastmod )
, m_createdOn( createdOn )
, m_shared( shared )
, m_updater( 0 )
{
init();
}
@ -138,6 +139,7 @@ Playlist::Playlist( const source_ptr& author,
, m_createdOn( 0 ) // will be set by db command
, m_shared( shared )
, m_initEntries( entries )
, m_updater( 0 )
{
init();
}
@ -511,9 +513,12 @@ Playlist::addEntries( const QList<query_ptr>& queries, const QString& oldrev )
QList<plentry_ptr>
Playlist::entriesFromQueries( const QList<Tomahawk::query_ptr>& queries )
Playlist::entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst )
{
QList<plentry_ptr> el = entries();
QList<plentry_ptr> el;
if ( !clearFirst )
el = entries();
foreach( const query_ptr& query, queries )
{
plentry_ptr e( new PlaylistEntry() );

10
src/libtomahawk/playlist.h
View File

@ -36,10 +36,11 @@ class DatabaseCommand_LoadAllPlaylists;
class DatabaseCommand_LoadAllSortedPlaylists;
class DatabaseCommand_SetPlaylistRevision;
class DatabaseCommand_CreatePlaylist;
namespace Tomahawk
{
class PlaylistUpdaterInterface;
class DLLEXPORT PlaylistEntry : public QObject
{
Q_OBJECT
@ -196,7 +197,10 @@ public:
virtual void setFilter( const QString& /*pattern*/ ) {}
QList<plentry_ptr> entriesFromQueries( const QList<Tomahawk::query_ptr>& queries );
QList<plentry_ptr> entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst = false );
void setUpdater( PlaylistUpdaterInterface* interface ) const { m_updater = interface; }
PlaylistUpdaterInterface* updater() const { return m_updater; }
signals:
/// emitted when the playlist revision changes (whenever the playlist changes)
void revisionLoaded( Tomahawk::PlaylistRevision );
@ -293,6 +297,8 @@ private:
QQueue<RevisionQueueItem> m_revisionQueue;
PlaylistUpdaterInterface* m_updater;
bool m_locallyChanged;
bool m_deleted;
bool m_busy;

30
src/libtomahawk/playlist/PlaylistUpdaterInterface.h
View File

@ -22,6 +22,7 @@
#include "dllmacro.h"
#include "typedefs.h"
#include "playlist.h"
#include <QTimer>
namespace Tomahawk
{
@ -35,21 +36,40 @@ class DLLEXPORT PlaylistUpdaterInterface : public QObject
{
Q_OBJECT
public:
PlaylistUpdaterInterface( const playlist_ptr& pl, QObject* parent )
: QObject( parent )
PlaylistUpdaterInterface( const playlist_ptr& pl )
: QObject( pl.data() )
, m_timer( new QTimer( this ) )
, m_autoUpdate( true )
, m_playlist( pl )
{}
{
Q_ASSERT( !m_playlist.isNull() );
m_playlist->setUpdater( this );
connect( m_timer, SIGNAL( timeout() ), this, SLOT( updateNow() ) );
}
virtual ~PlaylistUpdaterInterface() {}
void setAutoUpdate( bool autoUpdate ) { m_autoUpdate = autoUpdate; }
void setAutoUpdate( bool autoUpdate ) {
m_autoUpdate = autoUpdate;
if ( m_autoUpdate )
m_timer->start();
else
m_timer->stop();
}
bool autoUpdate() const { return m_autoUpdate; }
void setInterval( int intervalMsecs ) { m_timer->setInterval( intervalMsecs ); }
int intervalMsecs() const { return m_timer->interval(); }
playlist_ptr playlist() const { return m_playlist; }
signals:
public slots:
virtual void updateNow() {}
private:
QTimer* m_timer;
bool m_autoUpdate;
playlist_ptr m_playlist;
};

15
src/libtomahawk/playlist/XspfUpdater.cpp
View File

@ -25,23 +25,20 @@
using namespace Tomahawk;
XspfUpdater::XspfUpdater( const playlist_ptr& pl, const QString& xUrl, QObject *parent )
: PlaylistUpdaterInterface( pl, parent )
XspfUpdater::XspfUpdater( const playlist_ptr& pl, const QString& xUrl )
: PlaylistUpdaterInterface( pl )
, m_url( xUrl )
, m_timer( new QTimer( this ) )
{
// for now refresh every 60min
m_timer->setInterval( 60 * 60 * 1000);
connect( m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
}
XspfUpdater::~XspfUpdater()
{}
void
XspfUpdater::update()
XspfUpdater::updateNow()
{
XSPFLoader* l = new XSPFLoader( false );
XSPFLoader* l = new XSPFLoader( false, false );
l->load( m_url );
connect( l, SIGNAL( ok ( Tomahawk::playlist_ptr ) ), this, SLOT( playlistLoaded() ) );
}
@ -52,7 +49,7 @@ XspfUpdater::playlistLoaded()
Q_ASSERT( loader );
QList< query_ptr > queries = loader->entries();
QList<plentry_ptr> el = playlist()->entriesFromQueries( queries );
QList<plentry_ptr> el = playlist()->entriesFromQueries( queries, true );
playlist()->createNewRevision( uuid(), playlist()->currentrevision(), el );
// // if there are any different from the current playlist, clear and use the new one, update

7
src/libtomahawk/playlist/XspfUpdater.h
View File

@ -30,16 +30,17 @@ class XspfUpdater : public PlaylistUpdaterInterface
{
Q_OBJECT
public:
explicit XspfUpdater( const playlist_ptr& pl, const QString& xspfUrl, QObject *parent = 0 );
explicit XspfUpdater( const playlist_ptr& pl, const QString& xspfUrl );
virtual ~XspfUpdater();
public slots:
void updateNow();
private slots:
void update();
void playlistLoaded();
private:
QString m_url;
QTimer* m_timer;
};
}

13
src/libtomahawk/utils/xspfloader.cpp
View File

@ -26,12 +26,14 @@
#include "sourcelist.h"
#include "playlist.h"
#include <XspfUpdater.h>
using namespace Tomahawk;
XSPFLoader::XSPFLoader( bool autoCreate, QObject *parent )
XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject *parent )
: QObject( parent )
, m_autoCreate( autoCreate )
, m_autoUpdate( autoUpdate )
, m_NS("http://xspf.org/ns/0/")
{
qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode");
@ -60,10 +62,11 @@ void
XSPFLoader::load( const QUrl& url )
{
QNetworkRequest request( url );
m_url = url;
Q_ASSERT( TomahawkUtils::nam() != 0 );
QNetworkReply* reply = TomahawkUtils::nam()->get( request );
// isn't there a race condition here? something could happen before we connect()
connect( reply, SIGNAL( finished() ),
SLOT( networkLoadFinished() ) );
@ -219,6 +222,12 @@ XSPFLoader::gotBody()
false,
m_entries );
if ( m_autoUpdate )
{
Tomahawk::XspfUpdater* updater = new Tomahawk::XspfUpdater( m_playlist, m_url.toString() );
updater->setInterval( 60000 );
updater->setAutoUpdate( true );
}
deleteLater();
}

5
src/libtomahawk/utils/xspfloader.h
View File

@ -40,7 +40,7 @@ Q_OBJECT
public:
enum XSPFErrorCode { ParseError, InvalidTrackError, FetchError };
explicit XSPFLoader( bool autoCreate = true, QObject* parent = 0 );
explicit XSPFLoader( bool autoCreate = true, bool autoUpdate = false, QObject* parent = 0 );
virtual ~XSPFLoader();
QList< Tomahawk::query_ptr > entries() const;
@ -63,11 +63,12 @@ private:
void reportError();
void gotBody();
bool m_autoCreate;
bool m_autoCreate, m_autoUpdate;
QString m_NS,m_overrideTitle;
QList< Tomahawk::query_ptr > m_entries;
QString m_title, m_info, m_creator;
QUrl m_url;
QByteArray m_body;
Tomahawk::playlist_ptr m_playlist;
};

51
src/tomahawkwindow.cpp
View File

@ -68,6 +68,7 @@
#include "utils/logger.h"
#include "jobview/JobStatusModel.h"
#include "LoadXSPFDialog.h"
using namespace Tomahawk;
@ -488,16 +489,52 @@ TomahawkWindow::showOfflineSources()
void
TomahawkWindow::loadSpiff()
{
bool ok;
QString urlstr = QInputDialog::getText( this, tr( "Load XSPF" ), tr( "Path:" ), QLineEdit::Normal, "http://ws.audioscrobbler.com/1.0/tag/metal/toptracks.xspf", &ok );
if ( !ok || urlstr.isEmpty() )
return;
// bool ok;
// QString urlstr = QInputDialog::getText( this, tr( "Load XSPF" ), tr( "Path:" ), QLineEdit::Normal, "http://ws.audioscrobbler.com/1.0/tag/metal/toptracks.xspf", &ok );
// if ( !ok || urlstr.isEmpty() )
// return;
//
// XSPFLoader* loader = new XSPFLoader;
// connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
// loader->load( QUrl::fromUserInput( urlstr ) );
LoadXSPFDialog* diag = new LoadXSPFDialog( this, Qt::Sheet );
#ifdef Q_WS_MAC
connect( diag, SIGNAL( finished( int ) ), this, SLOT( loadXspfFinished( int ) ) );
diag->show();
#else
QWeakPointer< LoadXSPFDialog > safe( diag );
XSPFLoader* loader = new XSPFLoader;
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
loader->load( QUrl::fromUserInput( urlstr ) );
int ret = diag->exec();
if ( !safe.isNull() && ret == QDialog::Accepted )
{
QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() );
bool autoUpdate = safe.data()->autoUpdate();
XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
loader->load( url );
}
#endif
}
void
TomahawkWindow::loadXspfFinished( int ret )
{
LoadXSPFDialog* d = qobject_cast< LoadXSPFDialog* >( sender() );
Q_ASSERT( d );
if ( ret == QDialog::Accepted )
{
QUrl url = QUrl::fromUserInput( d->xspfUrl() );
bool autoUpdate = d->autoUpdate();
XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
loader->load( url );
}
d->deleteLater();
}
void
TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error )

2
src/tomahawkwindow.h
View File

@ -102,6 +102,8 @@ private slots:
void onSearch( const QString& search );
void onFilterEdited();
void loadXspfFinished( int );
void showQueue();
void hideQueue();