mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-05 16:42:26 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master' into watchforchanges-ng

Browse Source 
Conflicts:
	src/tomahawkwindow.ui
This commit is contained in:
Jeff Mitchell 2011-06-13 15:11:14 -04:00
commit 169917fd53
52 changed files with 648 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/mac/add-Qt-to-bundle.sh
View File

@ -54,8 +54,8 @@ cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/
#cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/
#cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/
cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/
cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/

7
admin/mac/deposx.sh
View File

@ -50,7 +50,11 @@ function deposx_change
install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \
@executable_path/../Frameworks/$y.framework/Versions/4/$y \
"$1"
"$1"
install_name_tool -change /usr/X11/lib/libpng12.0.dylib \
@executable_path/libpng12.0.dylib \
"$1"
done
for y in $LIBS
@ -126,6 +130,7 @@ import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib
import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib
import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib
import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib
import_lib /usr/X11/lib/libpng12.0.dylib
import_lib $ORIGROOT/libjreen.dylib
import_lib $ORIGROOT/libtomahawklib.dylib

22
data/sql/dbmigrate-23_to_24.sql Normal file
View File

@ -0,0 +1,22 @@
-- Script to migate from db version 23 to 24.
-- Added the social_attributes table.
--
-- Separate each command with %%
CREATE TABLE IF NOT EXISTS social_attributes (
id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, -- track id
source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, -- DEFERRABLE INITIALLY DEFERRED,
k TEXT NOT NULL,
v TEXT NOT NULL,
timestamp INTEGER NOT NULL DEFAULT 0
);
CREATE INDEX social_attrib_id ON social_attributes(id);
CREATE INDEX social_attrib_source ON social_attributes(source);
CREATE INDEX social_attrib_k ON social_attributes(k);
CREATE INDEX social_attrib_timestamp ON social_attributes(timestamp);
UPDATE settings SET v = '24' WHERE k == 'schema_version';

1
resources.qrc
View File

@ -102,5 +102,6 @@
<file>./data/www/auth.na.html</file>
<file>./data/www/tomahawk_banner_small.png</file>
<file>./data/sql/dbmigrate-22_to_23.sql</file>
<file>./data/sql/dbmigrate-23_to_24.sql</file>
</qresource>
</RCC>

4
src/audiocontrols.cpp
View File

@ -314,10 +314,10 @@ AudioControls::onPlaybackResumed()
/* m_playAction->setEnabled( false );
m_pauseAction->setEnabled( true ); */
ui->pauseButton->setVisible( true );
ui->pauseButton->setEnabled( true );
ui->playPauseButton->setVisible( false );
ui->playPauseButton->setEnabled( false );
ui->pauseButton->setVisible( true );
ui->pauseButton->setEnabled( true );
}

77
src/libtomahawk/database/databasecommand_resolve.cpp
View File

@ -36,6 +36,13 @@ DatabaseCommand_Resolve::DatabaseCommand_Resolve( const query_ptr& query )
void
DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
{
/*
* Resolving is a 2 stage process.
* 1) find list of trk/art/alb IDs that are reasonable matches to the metadata given
* 2) find files in database by permitted sources and calculate score, ignoring
* results that are less than MINSCORE
*/
if ( !m_query->resultHint().isEmpty() )
{
qDebug() << "Using result-hint to speed up resolving:" << m_query->resultHint();
@ -64,20 +71,12 @@ void
DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
{
QList<Tomahawk::result_ptr> res;
/*
Resolving is a 2 stage process.
1) find list of trk/art/alb IDs that are reasonable matches to the metadata given
2) find files in database by permitted sources and calculate score, ignoring
results that are less than MINSCORE
*/
typedef QPair<int, float> scorepair_t;
// STEP 1
QList< int > artists = lib->searchTable( "artist", m_query->artist(), 10 );
QList< int > tracks = lib->searchTable( "track", m_query->track(), 10 );
QList< int > albums = lib->searchTable( "album", m_query->album(), 10 );
QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->artist(), 10 );
QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->track(), 10 );
QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->album(), 10 );
if ( artists.length() == 0 || tracks.length() == 0 )
{
@ -90,10 +89,10 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
TomahawkSqlQuery files_query = lib->newquery();
QStringList artsl, trksl;
foreach( int i, artists )
artsl.append( QString::number( i ) );
foreach( int i, tracks )
trksl.append( QString::number( i ) );
for ( int k = 0; k < artists.count(); k++ )
artsl.append( QString::number( artists.at( k ).first ) );
for ( int k = 0; k < tracks.count(); k++ )
trksl.append( QString::number( tracks.at( k ).first ) );
QString artsToken = QString( "file_join.artist IN (%1)" ).arg( artsl.join( "," ) );
QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
@ -174,7 +173,7 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
float score = how_similar( m_query, result );
result->setScore( score );
if ( m_query->fullTextQuery().isEmpty() && score < MINSCORE )
if ( score < MINSCORE )
continue;
result->setCollection( s->collection() );
@ -189,20 +188,12 @@ void
DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
{
QList<Tomahawk::result_ptr> res;
/*
* Resolving is a 2 stage process.
* 1) find list of trk/art/alb IDs that are reasonable matches to the metadata given
* 2) find files in database by permitted sources and calculate score, ignoring
* results that are less than MINSCORE
*/
typedef QPair<int, float> scorepair_t;
// STEP 1
QList< int > artists = lib->searchTable( "artist", m_query->fullTextQuery(), 10 );
QList< int > tracks = lib->searchTable( "track", m_query->fullTextQuery(), 10 );
QList< int > albums = lib->searchTable( "album", m_query->fullTextQuery(), 10 );
QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->fullTextQuery(), 10 );
QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->fullTextQuery(), 10 );
QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->fullTextQuery(), 10 );
if ( artists.length() == 0 && tracks.length() == 0 && albums.length() == 0 )
{
@ -215,12 +206,12 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
TomahawkSqlQuery files_query = lib->newquery();
QStringList artsl, trksl, albsl;
foreach( int i, artists )
artsl.append( QString::number( i ) );
foreach( int i, tracks )
trksl.append( QString::number( i ) );
foreach( int i, albums )
albsl.append( QString::number( i ) );
for ( int k = 0; k < artists.count(); k++ )
artsl.append( QString::number( artists.at( k ).first ) );
for ( int k = 0; k < tracks.count(); k++ )
trksl.append( QString::number( tracks.at( k ).first ) );
for ( int k = 0; k < albums.count(); k++ )
albsl.append( QString::number( albums.at( k ).first ) );
QString artsToken = QString( "file_join.artist IN (%1)" ).arg( artsl.join( "," ) );
QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
@ -241,10 +232,8 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
"artist.id = file_join.artist AND "
"track.id = file_join.track AND "
"file.id = file_join.file AND "
"(%1 OR %2 OR %3)" )
.arg( artists.length() > 0 ? artsToken : QString( "0" ) )
.arg( tracks.length() > 0 ? trksToken : QString( "0" ) )
.arg( albums.length() > 0 ? albsToken : QString( "0" ) );
"%1" )
.arg( tracks.length() > 0 ? trksToken : QString( "0" ) );
files_query.prepare( sql );
files_query.exec();
@ -288,6 +277,15 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
result->setId( files_query.value( 9 ).toUInt() );
result->setYear( files_query.value( 17 ).toUInt() );
for ( int k = 0; k < tracks.count(); k++ )
{
if ( tracks.at( k ).first == (int)result->dbid() )
{
result->setScore( tracks.at( k ).second );
break;
}
}
TomahawkSqlQuery attrQuery = lib->newquery();
QVariantMap attr;
@ -301,11 +299,6 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
result->setAttributes( attr );
float score = how_similar( m_query, result );
result->setScore( score );
if ( m_query->fullTextQuery().isEmpty() && score < MINSCORE )
continue;
result->setCollection( s->collection() );
res << result;
}

126
src/libtomahawk/database/databaseimpl.cpp
View File

@ -38,7 +38,7 @@
*/
#include "schema.sql.h"
#define CURRENT_SCHEMA_VERSION 23
#define CURRENT_SCHEMA_VERSION 24
DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
@ -47,67 +47,48 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
, m_lastalbid( 0 )
, m_lasttrkid( 0 )
{
db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
db.setDatabaseName( dbname );
if ( !db.open() )
{
qDebug() << "FAILED TO OPEN DB";
throw "failed to open db"; // TODO
}
QSqlQuery qry = QSqlQuery( db );
bool schemaUpdated = false;
qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
if ( qry.next() )
int version = getDatabaseVersion( dbname );
if ( version > 0 && version != CURRENT_SCHEMA_VERSION )
{
int v = qry.value( 0 ).toInt();
qDebug() << "Current schema is" << v << this->thread();
if ( v != CURRENT_SCHEMA_VERSION )
QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version );
qDebug() << endl << "****************************" << endl;
qDebug() << "Schema version too old: " << version << ". Current version is:" << CURRENT_SCHEMA_VERSION;
qDebug() << "Moving" << dbname << newname;
qDebug() << "If the migration fails, you can recover your DB by copying" << newname << "back to" << dbname;
qDebug() << endl << "****************************" << endl;
QFile::copy( dbname, newname );
{
db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
db.setDatabaseName( dbname );
if( !db.open() )
throw "db moving failed";
QString newname = QString("%1.v%2").arg(dbname).arg(v);
qDebug() << endl << "****************************" << endl;
qDebug() << "Schema version too old: " << v << ". Current version is:" << CURRENT_SCHEMA_VERSION;
qDebug() << "Moving" << dbname << newname;
qDebug() << "If the migration fails, you can recover your DB by copying" << newname << "back to" << dbname;
qDebug() << endl << "****************************" << endl;
TomahawkSqlQuery query = newquery();
query.exec( "PRAGMA auto_vacuum = FULL" );
qry.clear();
qry.finish();
db.close();
db.removeDatabase( "tomahawk" );
if( QFile::copy( dbname, newname ) )
{
db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
db.setDatabaseName( dbname );
if( !db.open() )
throw "db moving failed";
TomahawkSqlQuery query = newquery();
query.exec( "PRAGMA auto_vacuum = FULL" );
schemaUpdated = updateSchema( v );
if( !schemaUpdated )
{
Q_ASSERT( false );
QTimer::singleShot( 0, qApp, SLOT( quit() ) );
}
}
else
schemaUpdated = updateSchema( version );
if ( !schemaUpdated )
{
Q_ASSERT( false );
QTimer::singleShot( 0, qApp, SLOT( quit() ) );
return;
}
}
}
else
{
schemaUpdated = updateSchema( 0 );
db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
db.setDatabaseName( dbname );
if ( !db.open() )
{
qDebug() << "Failed to open database" << dbname;
throw "failed to open db"; // TODO
}
if ( version < 0 )
schemaUpdated = updateSchema( 0 );
}
TomahawkSqlQuery query = newquery();
@ -422,30 +403,23 @@ DatabaseImpl::albumId( int artistid, const QString& name_orig, bool& isnew )
}
QList< int >
QList< QPair<int, float> >
DatabaseImpl::searchTable( const QString& table, const QString& name, uint limit )
{
Q_UNUSED( limit );
QList< int > results;
if( table != "artist" && table != "track" && table != "album" )
return results;
QMap< int, float > resultsmap = m_fuzzyIndex->search( table, name );
QList< QPair<int, float> > resultslist;
if( table != "artist" && table != "track" && table != "album" )
return resultslist;
QMap< int, float > resultsmap = m_fuzzyIndex->search( table, name );
foreach( int i, resultsmap.keys() )
{
resultslist << QPair<int, float>( i, (float)resultsmap.value( i ) );
}
qSort( resultslist.begin(), resultslist.end(), DatabaseImpl::scorepairSorter );
for( int k = 0; k < resultslist.count(); k++ )
{
results << resultslist.at( k ).first;
}
// qDebug() << "Returning" << results.count() << "results";
return results;
return resultslist;
}
@ -639,3 +613,31 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
return res;
}
int
DatabaseImpl::getDatabaseVersion( const QString& dbname )
{
int version = -1;
{
QSqlDatabase db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
db.setDatabaseName( dbname );
if ( !db.open() )
{
qDebug() << "Failed to open database" << dbname;
throw "failed to open db"; // TODO
}
QSqlQuery qry = QSqlQuery( db );
qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
if ( qry.next() )
{
version = qry.value( 0 ).toInt();
qDebug() << "Database schema of" << dbname << "is" << version;
}
}
QSqlDatabase::removeDatabase( "tomahawk" );
return version;
}

9
src/libtomahawk/database/databaseimpl.h
View File

@ -45,6 +45,8 @@ friend class FuzzyIndex;
friend class DatabaseCommand_UpdateSearchIndex;
public:
static int getDatabaseVersion( const QString& dbname );
DatabaseImpl( const QString& dbname, Database* parent = 0 );
~DatabaseImpl();
@ -55,7 +57,7 @@ public:
int trackId( int artistid, const QString& name_orig, bool& isnew );
int albumId( int artistid, const QString& name_orig, bool& isnew );
QList< int > searchTable( const QString& table, const QString& name, uint limit = 10 );
QList< QPair<int, float> > searchTable( const QString& table, const QString& name, uint limit = 10 );
QList< int > getTrackFids( int tid );
static QString sortname( const QString& str );
@ -85,18 +87,15 @@ public slots:
private:
QString cleanSql( const QString& sql );
bool m_ready;
bool updateSchema( int oldVersion );
bool m_ready;
QSqlDatabase db;
QString m_lastart, m_lastalb, m_lasttrk;
int m_lastartid, m_lastalbid, m_lasttrkid;
QString m_dbid;
FuzzyIndex* m_fuzzyIndex;
};

20
src/libtomahawk/database/schema.sql
View File

@ -227,6 +227,24 @@ CREATE TABLE IF NOT EXISTS track_attributes (
CREATE INDEX track_attrib_id ON track_attributes(id);
CREATE INDEX track_attrib_k ON track_attributes(k);
-- social attributes connected to the track.
-- like love, hate, comments, recommendations
-- love=[comment], hate=[comment], comment=Some text
-- NB: since all values are text, numeric values should be zero-padded to a set amount
-- so that we can always do range queries.
CREATE TABLE IF NOT EXISTS social_attributes (
id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, -- track id
source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, -- DEFERRABLE INITIALLY DEFERRED,
k TEXT NOT NULL,
v TEXT NOT NULL,
timestamp INTEGER NOT NULL DEFAULT 0
);
CREATE INDEX social_attrib_id ON social_attributes(id);
CREATE INDEX social_attrib_source ON social_attributes(source);
CREATE INDEX social_attrib_k ON social_attributes(k);
CREATE INDEX social_attrib_timestamp ON social_attributes(timestamp);
-- playback history
@ -264,4 +282,4 @@ CREATE TABLE IF NOT EXISTS settings (
v TEXT NOT NULL DEFAULT ''
);
INSERT INTO settings(k,v) VALUES('schema_version', '23');
INSERT INTO settings(k,v) VALUES('schema_version', '24');

15
src/libtomahawk/database/schema.sql.h
View File

@ -1,5 +1,5 @@
/*
This file was automatically generated from schema.sql on Fri Apr 15 15:55:52 EDT 2011.
This file was automatically generated from ./schema.sql on Sun Jun 12 05:17:25 CEST 2011.
*/
static const char * tomahawk_schema_sql =
@ -151,6 +151,17 @@ static const char * tomahawk_schema_sql =
");"
"CREATE INDEX track_attrib_id ON track_attributes(id);"
"CREATE INDEX track_attrib_k ON track_attributes(k);"
"CREATE TABLE IF NOT EXISTS social_attributes ("
" id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
" source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, "
" k TEXT NOT NULL,"
" v TEXT NOT NULL,"
" timestamp INTEGER NOT NULL DEFAULT 0"
");"
"CREATE INDEX social_attrib_id ON social_attributes(id);"
"CREATE INDEX social_attrib_source ON social_attributes(source);"
"CREATE INDEX social_attrib_k ON social_attributes(k);"
"CREATE INDEX social_attrib_timestamp ON social_attributes(timestamp);"
"CREATE TABLE IF NOT EXISTS playback_log ("
" id INTEGER PRIMARY KEY AUTOINCREMENT,"
" source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
@ -172,7 +183,7 @@ static const char * tomahawk_schema_sql =
" k TEXT NOT NULL PRIMARY KEY,"
" v TEXT NOT NULL DEFAULT ''"
");"
"INSERT INTO settings(k,v) VALUES('schema_version', '23');"
"INSERT INTO settings(k,v) VALUES('schema_version', '24');"
;
const char * get_tomahawk_sql()

12
src/libtomahawk/globalactionmanager.cpp
View File

@ -78,9 +78,9 @@ GlobalActionManager::openLinkFromQuery( const Tomahawk::query_ptr& query ) const
}
QUrl
GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album, bool tomahk ) const
GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album ) const
{
QUrl link( tomahk ? "http://toma.hk/open/track/" : "tomahawk://open/track/" );
QUrl link( QString( "%1/open/track/" ).arg( hostname() ) );
if( !title.isEmpty() )
link.addQueryItem( "title", title );
@ -95,7 +95,7 @@ GlobalActionManager::openLink( const QString& title, const QString& artist, cons
QString
GlobalActionManager::copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist )
{
QUrl link( QString( "tomahawk://%1/create/" ).arg( playlist->mode() == Tomahawk::OnDemand ? "station" : "autoplaylist" ) );
QUrl link( QString( "%1/%2/create/" ).arg( hostname() ).arg( playlist->mode() == Tomahawk::OnDemand ? "station" : "autoplaylist" ) );
if( playlist->generator()->type() != "echonest" ) {
qDebug() << "Only echonest generators are supported";
@ -676,4 +676,8 @@ GlobalActionManager::waitingForResolved( bool success )
m_waitingToPlay.clear();
}
QString
GlobalActionManager::hostname() const
{
return QString( "http://toma.hk" );
}

3
src/libtomahawk/globalactionmanager.h
View File

@ -36,7 +36,7 @@ public:
virtual ~GlobalActionManager();
QUrl openLinkFromQuery( const Tomahawk::query_ptr& query ) const;
QUrl openLink( const QString& title, const QString& artist, const QString& album, bool tomahk=false ) const;
QUrl openLink( const QString& title, const QString& artist, const QString& album ) const;
void copyToClipboard( const Tomahawk::query_ptr& query ) const;
QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist );
@ -68,6 +68,7 @@ private:
bool handleOpenCommand(const QUrl& url );
bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
QString hostname() const;
Tomahawk::playlist_ptr m_toShow;
Tomahawk::query_ptr m_waitingToBookmark;

35
src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp
View File

@ -18,6 +18,8 @@
#include <string.h>
#include <QTimer>
#include "infosystem/infosystemworker.h"
#include "artist.h"
#include "result.h"
@ -65,6 +67,10 @@ AdiumPlugin::AdiumPlugin()
connect( TomahawkSettings::instance(), SIGNAL( changed() ),
SLOT( settingsChanged() ), Qt::QueuedConnection );
m_pauseTimer = new QTimer( this );
connect( m_pauseTimer, SIGNAL( timeout() ),
this, SLOT( clearStatus() ) );
}
AdiumPlugin::~AdiumPlugin()
@ -73,6 +79,13 @@ AdiumPlugin::~AdiumPlugin()
setStatus( "" );
}
void
AdiumPlugin::clearStatus()
{
qDebug() << Q_FUNC_INFO;
setStatus( "" );
}
void
AdiumPlugin::settingsChanged()
{
@ -107,9 +120,9 @@ AdiumPlugin::pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoTyp
case InfoNowPlaying:
audioStarted( input );
break;
// case InfoNowPaused:
// audioPaused();
// break;
case InfoNowPaused:
audioPaused();
return;
case InfoNowResumed:
audioResumed( input );
break;
@ -120,6 +133,9 @@ AdiumPlugin::pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoTyp
default:
return;
}
// Stop the pause timer always, unless pausing of course
m_pauseTimer->stop();
}
/** Audio state slots */
@ -136,11 +152,14 @@ AdiumPlugin::audioStarted( const QVariant &input )
return;
QString nowPlaying = "";
nowPlaying.append( hash["title"] );
nowPlaying.append(" - ");
nowPlaying.append( hash["artist"] );
nowPlaying.append(" - ");
nowPlaying.append( hash["title"] );
nowPlaying.append( " " );
// Escape quotes, or Applescript gets confused
nowPlaying.replace( "\"", "\\\"" );
nowPlaying.append( openLinkFromHash( hash ).toEncoded() );
qDebug() << "nowPlaying: " << nowPlaying;
setStatus( nowPlaying );
}
@ -157,7 +176,7 @@ AdiumPlugin::openLinkFromHash( const Tomahawk::InfoSystem::InfoCriteriaHash& has
album = hash["album"];
}
return GlobalActionManager::instance()->openLink( title, artist, album, true );
return GlobalActionManager::instance()->openLink( title, artist, album );
}
void
@ -177,14 +196,12 @@ void
AdiumPlugin::audioPaused()
{
qDebug() << Q_FUNC_INFO;
//setStatus( "Paused" );
m_pauseTimer->start( 60 * 1000 );
}
void
AdiumPlugin::audioResumed( const QVariant &input )
{
qDebug() << Q_FUNC_INFO;
// TODO: audio resumed, so push update status to Adium with playing track
audioStarted( input );
}

7
src/libtomahawk/infosystem/infoplugins/adiumplugin.h
View File

@ -24,6 +24,8 @@
#include <QObject>
#include <QVariant>
class QTimer;
namespace Tomahawk {
namespace InfoSystem {
@ -44,6 +46,9 @@ public slots:
void namChangedSlot( QNetworkAccessManager *nam ) {} // unused
void notInCacheSlot( const Tomahawk::InfoSystem::InfoCriteriaHash criteria, const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input, const Tomahawk::InfoSystem::InfoCustomData customData ) {} // unused
private slots:
void clearStatus();
private:
void settingsChanged();
@ -59,6 +64,8 @@ private:
QString m_beforeStatus;
QString m_afterStatus;
QTimer* m_pauseTimer;
};

2
src/libtomahawk/playlist.cpp
View File

@ -220,6 +220,8 @@ Playlist::load( const QString& guid )
bool
Playlist::remove( const playlist_ptr& playlist )
{
playlist->aboutToBeDeleted( playlist );
TomahawkSettings *s = TomahawkSettings::instance();
s->removePlaylistSettings( playlist->guid() );

6
src/libtomahawk/playlist.h
View File

@ -190,6 +190,12 @@ signals:
/// renamed etc.
void changed();
/**
* delete command is scheduled but not completed. Do not call remove() again once this
* is emitted.
*/
void aboutToBeDeleted( const Tomahawk::playlist_ptr& pl );
/// was deleted, eh?
void deleted( const Tomahawk::playlist_ptr& pl );

106
src/libtomahawk/playlist/collectionproxymodel.cpp
View File

@ -29,109 +29,3 @@ CollectionProxyModel::CollectionProxyModel( QObject* parent )
: TrackProxyModel( parent )
{
}
bool
CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
{
TrackModelItem* p1 = itemFromIndex( left );
TrackModelItem* p2 = itemFromIndex( right );
if ( !p1 )
return true;
if ( !p2 )
return false;
const Tomahawk::query_ptr& q1 = p1->query();
const Tomahawk::query_ptr& q2 = p2->query();
QString artist1 = q1->artist();
QString artist2 = q2->artist();
QString album1 = q1->album();
QString album2 = q2->album();
QString track1 = q1->track();
QString track2 = q2->track();
unsigned int albumpos1 = 0, albumpos2 = 0;
unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0;
unsigned int id1 = 0, id2 = 0;
unsigned int size1 = 0, size2 = 0;
if ( q1->numResults() )
{
const Tomahawk::result_ptr& r = q1->results().at( 0 );
artist1 = r->artist()->name();
album1 = r->album()->name();
track1 = r->track();
albumpos1 = r->albumpos();
bitrate1 = r->bitrate();
mtime1 = r->modificationTime();
id1 = r->dbid();
size1 = r->size();
}
if ( q2->numResults() )
{
const Tomahawk::result_ptr& r = q2->results().at( 0 );
artist2 = r->artist()->name();
album2 = r->album()->name();
track2 = r->track();
albumpos2 = r->albumpos();
bitrate2 = r->bitrate();
mtime2 = r->modificationTime();
id2 = r->dbid();
size2 = r->size();
}
if ( left.column() == TrackModel::Artist ) // sort by artist
{
if ( artist1 == artist2 )
{
if ( album1 == album2 )
{
if ( albumpos1 == albumpos2 )
return id1 < id2;
return albumpos1 < albumpos2;
}
return QString::localeAwareCompare( album1, album2 ) < 0;
}
return QString::localeAwareCompare( artist1, artist2 ) < 0;
}
else if ( left.column() == TrackModel::Album ) // sort by album
{
if ( album1 == album2 )
{
if ( albumpos1 == albumpos2 )
return id1 < id2;
return albumpos1 < albumpos2;
}
return QString::localeAwareCompare( album1, album2 ) < 0;
}
else if ( left.column() == TrackModel::Bitrate ) // sort by bitrate
{
if ( bitrate1 == bitrate2 )
return id1 < id2;
return bitrate1 < bitrate2;
}
else if ( left.column() == TrackModel::Age ) // sort by mtime
{
if ( mtime1 == mtime2 )
return id1 < id2;
return mtime1 < mtime2;
}
else if ( left.column() == TrackModel::Filesize ) // sort by file size
{
if ( size1 == size2 )
return id1 < id2;
return size1 < size2;
}
return QString::localeAwareCompare( sourceModel()->data( left ).toString(),
sourceModel()->data( right ).toString() ) < 0;
}

5
src/libtomahawk/playlist/collectionproxymodel.h
View File

@ -1,5 +1,5 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
@ -31,9 +31,6 @@ public:
explicit CollectionProxyModel( QObject* parent = 0 );
virtual PlaylistInterface::ViewMode viewMode() const { return PlaylistInterface::Flat; }
protected:
bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
};
#endif // COLLECTIONPROXYMODEL_H

14
src/libtomahawk/playlist/collectionview.cpp
View File

@ -63,8 +63,12 @@ void
CollectionView::setTrackModel( TrackModel* model )
{
TrackView::setTrackModel( model );
setColumnHidden( TrackModel::Score, true ); // Hide age column per default
setGuid( "collectionview" );
setSortingEnabled( true );
sortByColumn( 0, Qt::AscendingOrder );
connect( model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
}
@ -83,14 +87,14 @@ CollectionView::setupMenus()
m_playItemAction = m_itemMenu.addAction( tr( "&Play" ) );
m_addItemsToQueueAction = m_itemMenu.addAction( tr( "Add to &Queue" ) );
m_itemMenu.addSeparator();
m_itemMenu.addSeparator();
foreach( QAction* a, actions() )
m_itemMenu.addAction( a );
foreach( QAction* a, actions() )
m_itemMenu.addAction( a );
// m_addItemsToPlaylistAction = m_itemMenu.addAction( tr( "&Add to Playlist" ) );
connect( m_playItemAction, SIGNAL( triggered() ), SLOT( playItem() ) );
connect( m_addItemsToQueueAction, SIGNAL( triggered() ), SLOT( addItemsToQueue() ) );
connect( m_playItemAction, SIGNAL( triggered() ), SLOT( playItem() ) );
connect( m_addItemsToQueueAction, SIGNAL( triggered() ), SLOT( addItemsToQueue() ) );
// connect( m_addItemsToPlaylistAction, SIGNAL( triggered() ), SLOT( addItemsToPlaylist() ) );
}

5
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@ -26,6 +26,7 @@
#include "database/databasecommand_setdynamicplaylistrevision.h"
#include "database/databasecommand_loaddynamicplaylist.h"
#include "database/databasecommand_deletedynamicplaylist.h"
#include "tomahawksettings.h"
using namespace Tomahawk;
@ -249,6 +250,10 @@ DynamicPlaylist::loadRevision( const QString& rev )
bool
DynamicPlaylist::remove( const Tomahawk::dynplaylist_ptr& playlist )
{
playlist->aboutToBeDeleted( playlist );
TomahawkSettings::instance()->removePlaylistSettings( playlist->guid() );
DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeleteDynamicPlaylist( playlist->author(), playlist->guid() );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );

1
src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
View File

@ -115,6 +115,7 @@ signals:
/// emitted when the playlist revision changes (whenever the playlist changes)
void dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision );
void aboutToBeDeleted( const Tomahawk::dynplaylist_ptr& pl );
void deleted( const Tomahawk::dynplaylist_ptr& pl );
public slots:

102
src/libtomahawk/playlist/playlistitemdelegate.cpp
View File

@ -18,6 +18,7 @@
#include "playlistitemdelegate.h"
#include <QApplication>
#include <QDebug>
#include <QPainter>
@ -36,6 +37,7 @@
PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel* proxy )
: QStyledItemDelegate( (QObject*)parent )
, m_style( Detailed )
, m_view( parent )
, m_model( proxy )
{
@ -43,6 +45,13 @@ PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel*
}
void
PlaylistItemDelegate::setStyle( PlaylistItemDelegate::PlaylistItemStyle style )
{
m_style = style;
}
void
PlaylistItemDelegate::updateRowSize( const QModelIndex& index )
{
@ -70,6 +79,29 @@ PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem&
void
PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{
switch ( m_style )
{
case Detailed:
paintDetailed( painter, option, index );
break;
case Short:
paintShort( painter, option, index );
break;
}
}
void
PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{
}
void
PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{
TrackModelItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
if ( !item || item->query().isNull() )
@ -82,13 +114,51 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
opacity = qMax( (float)0.3, opacity );
QColor textColor = TomahawkUtils::alphaBlend( option.palette.color( QPalette::Foreground ), option.palette.color( QPalette::Background ), opacity );
QStyleOptionViewItemV4 opt = option;
initStyleOption( &opt, index );
if ( item->isPlaying() )
{
// painter->setRenderHint( QPainter::Antialiasing );
painter->save();
opt.palette.setColor( QPalette::Highlight, opt.palette.color( QPalette::Mid ) );
opt.state |= QStyle::State_Selected;
}
if ( item->isPlaying() || index.column() == TrackModel::Score )
opt.text.clear();
if ( opt.state & QStyle::State_Selected )
opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
else
opt.palette.setColor( QPalette::Text, textColor );
qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
painter->save();
if ( index.column() == TrackModel::Score )
{
if ( opt.state & QStyle::State_Selected )
painter->setPen( opt.palette.brightText().color() );
else
painter->setPen( opt.palette.highlight().color() );
QRect r = opt.rect.adjusted( 3, 3, -6, -5 );
painter->drawRect( r );
QRect fillR = r;
int fillerWidth = (int)( index.data().toFloat() * (float)fillR.width() );
fillR.adjust( 0, 0, -( fillR.width() - fillerWidth ), 0 );
if ( opt.state & QStyle::State_Selected )
painter->setBrush( opt.palette.brightText().color() );
else
painter->setBrush( opt.palette.highlight().color() );
painter->drawRect( fillR );
}
else if ( item->isPlaying() )
{
{
QRect r = option.rect.adjusted( 3, 0, 0, 0 );
QRect r = opt.rect.adjusted( 3, 0, 0, 0 );
// Paint Now Playing Speaker Icon
if ( m_view->header()->visualIndex( index.column() ) == 0 )
{
r.adjust( 0, 0, 0, -3 );
@ -96,34 +166,22 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
r.adjust( 22, 0, 0, 3 );
}
painter->setPen( option.palette.text().color() );
painter->setPen( opt.palette.text().color() );
QTextOption to( Qt::AlignVCenter );
QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, to );
}
// if ( m_view->header()->visualIndex( index.column() ) == m_view->header()->visibleSectionCount() - 1 )
{
QRect r = QRect( 3, option.rect.y() + 1, m_view->viewport()->width() - 6, option.rect.height() - 2 );
painter->setPen( option.palette.highlight().color() );
// Paint Now Playing Frame
/* {
QRect r = QRect( 3, opt.rect.y() + 1, m_view->viewport()->width() - 6, opt.rect.height() - 2 );
painter->setPen( opt.palette.highlight().color() );
QPen pen = painter->pen();
pen.setWidth( 1.0 );
painter->setPen( pen );
painter->drawRoundedRect( r, 3.0, 3.0 );
}
painter->restore();
}
else
{
if ( const QStyleOptionViewItem *vioption = qstyleoption_cast<const QStyleOptionViewItem *>(&option))
{
QStyleOptionViewItemV4 o( *vioption );
o.palette.setColor( QPalette::Text, textColor );
QStyledItemDelegate::paint( painter, o, index );
}
else
QStyledItemDelegate::paint( painter, option, index );
}*/
}
painter->restore();
}

11
src/libtomahawk/playlist/playlistitemdelegate.h
View File

@ -1,5 +1,5 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
@ -31,8 +31,12 @@ class DLLEXPORT PlaylistItemDelegate : public QStyledItemDelegate
Q_OBJECT
public:
enum PlaylistItemStyle
{ Detailed = 0, Short = 1 };
PlaylistItemDelegate( TrackView* parent = 0, TrackProxyModel* proxy = 0 );
void setStyle( PlaylistItemDelegate::PlaylistItemStyle style );
void updateRowSize( const QModelIndex& index );
public slots:
@ -41,13 +45,16 @@ public slots:
protected:
void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
private:
void paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
void paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
unsigned int m_removalProgress;
QPixmap m_nowPlayingIcon;
PlaylistItemStyle m_style;
TrackView* m_view;
TrackProxyModel* m_model;
};

1
src/libtomahawk/playlist/playlistmodel.cpp
View File

@ -509,6 +509,7 @@ PlaylistModel::removeIndex( const QModelIndex& index, bool moreToCome )
}
}
bool
PlaylistModel::isTemporary() const
{

18
src/libtomahawk/playlist/playlistview.cpp
View File

@ -73,10 +73,8 @@ PlaylistView::setPlaylistModel( PlaylistModel* model )
else
{
setGuid( "playlistview" );
m_model->title();
m_model->description();
}
connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
connect( m_model, SIGNAL( playlistDeleted() ), SLOT( onDeleted() ) );
connect( m_model, SIGNAL( playlistChanged() ), SLOT( onChanged() ) );
@ -148,12 +146,6 @@ PlaylistView::keyPressEvent( QKeyEvent* event )
}
void
PlaylistView::addItemsToPlaylist()
{
}
void
PlaylistView::deleteItems()
{
@ -189,6 +181,7 @@ PlaylistView::onDeleted()
deleteLater();
}
void
PlaylistView::onChanged()
{
@ -197,12 +190,9 @@ PlaylistView::onChanged()
emit nameChanged( m_model->playlist()->title() );
}
bool
PlaylistView::isTemporaryPage() const
{
if ( m_model ) {
return m_model->isTemporary();
} else {
return false;
}
return ( m_model && m_model->isTemporary() );
}

1
src/libtomahawk/playlist/playlistview.h
View File

@ -65,7 +65,6 @@ private slots:
void onCustomContextMenu( const QPoint& pos );
void onTrackCountChanged( unsigned int tracks );
void addItemsToPlaylist();
void deleteItems();
void onDeleted();

8
src/libtomahawk/playlist/trackheader.cpp
View File

@ -1,5 +1,5 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
*
* Tomahawk is free software: you can redistribute it and/or modify
@ -79,11 +79,15 @@ TrackHeader::checkState()
QByteArray state = TomahawkSettings::instance()->playlistColumnSizes( m_parent->guid() );
if ( !state.isEmpty() )
{
restoreState( state );
setSortIndicatorShown( true );
setSortIndicator( -1, Qt::AscendingOrder );
}
else
{
QList< double > m_columnWeights;
m_columnWeights << 0.21 << 0.22 << 0.20 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05; // << 0.12;
m_columnWeights << 0.20 << 0.20 << 0.18 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.12; // << 0.05;
for ( int i = 0; i < count() - 1; i++ )
{

8
src/libtomahawk/playlist/trackmodel.cpp
View File

@ -82,7 +82,7 @@ int
TrackModel::columnCount( const QModelIndex& parent ) const
{
Q_UNUSED( parent );
return 9;
return 10;
}
@ -183,6 +183,10 @@ TrackModel::data( const QModelIndex& index, int role ) const
case Origin:
return query->results().first()->friendlySource();
break;
case Score:
return query->results().first()->score();
break;
}
}
@ -195,7 +199,7 @@ TrackModel::headerData( int section, Qt::Orientation orientation, int role ) con
{
Q_UNUSED( orientation );
QStringList headers;
headers << tr( "Artist" ) << tr( "Track" ) << tr( "Album" ) << tr( "Duration" ) << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" );
headers << tr( "Artist" ) << tr( "Track" ) << tr( "Album" ) << tr( "Duration" ) << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" ) << tr( "Score" );
if ( role == Qt::DisplayRole && section >= 0 )
{
return headers.at( section );

3
src/libtomahawk/playlist/trackmodel.h
View File

@ -42,7 +42,8 @@ public:
Age = 5,
Year = 6,
Filesize = 7,
Origin = 8
Origin = 8,
Score = 9
};
explicit TrackModel( QObject* parent = 0 );

108
src/libtomahawk/playlist/trackproxymodel.cpp
View File

@ -270,3 +270,111 @@ TrackProxyModel::removeIndexes( const QList<QPersistentModelIndex>& indexes )
sourceModel()->removeIndex( idx, b );
}
}
bool
TrackProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
{
qDebug() << Q_FUNC_INFO;
TrackModelItem* p1 = itemFromIndex( left );
TrackModelItem* p2 = itemFromIndex( right );
if ( !p1 )
return true;
if ( !p2 )
return false;
const Tomahawk::query_ptr& q1 = p1->query();
const Tomahawk::query_ptr& q2 = p2->query();
QString artist1 = q1->artist();
QString artist2 = q2->artist();
QString album1 = q1->album();
QString album2 = q2->album();
QString track1 = q1->track();
QString track2 = q2->track();
unsigned int albumpos1 = 0, albumpos2 = 0;
unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0;
unsigned int id1 = 0, id2 = 0;
unsigned int size1 = 0, size2 = 0;
if ( q1->numResults() )
{
const Tomahawk::result_ptr& r = q1->results().at( 0 );
artist1 = r->artist()->name();
album1 = r->album()->name();
track1 = r->track();
albumpos1 = r->albumpos();
bitrate1 = r->bitrate();
mtime1 = r->modificationTime();
id1 = r->dbid();
size1 = r->size();
}
if ( q2->numResults() )
{
const Tomahawk::result_ptr& r = q2->results().at( 0 );
artist2 = r->artist()->name();
album2 = r->album()->name();
track2 = r->track();
albumpos2 = r->albumpos();
bitrate2 = r->bitrate();
mtime2 = r->modificationTime();
id2 = r->dbid();
size2 = r->size();
}
if ( left.column() == TrackModel::Artist ) // sort by artist
{
if ( artist1 == artist2 )
{
if ( album1 == album2 )
{
if ( albumpos1 == albumpos2 )
return id1 < id2;
return albumpos1 < albumpos2;
}
return QString::localeAwareCompare( album1, album2 ) < 0;
}
return QString::localeAwareCompare( artist1, artist2 ) < 0;
}
else if ( left.column() == TrackModel::Album ) // sort by album
{
if ( album1 == album2 )
{
if ( albumpos1 == albumpos2 )
return id1 < id2;
return albumpos1 < albumpos2;
}
return QString::localeAwareCompare( album1, album2 ) < 0;
}
else if ( left.column() == TrackModel::Bitrate ) // sort by bitrate
{
if ( bitrate1 == bitrate2 )
return id1 < id2;
return bitrate1 < bitrate2;
}
else if ( left.column() == TrackModel::Age ) // sort by mtime
{
if ( mtime1 == mtime2 )
return id1 < id2;
return mtime1 < mtime2;
}
else if ( left.column() == TrackModel::Filesize ) // sort by file size
{
if ( size1 == size2 )
return id1 < id2;
return size1 < size2;
}
return QString::localeAwareCompare( sourceModel()->data( left ).toString(),
sourceModel()->data( right ).toString() ) < 0;
}

1
src/libtomahawk/playlist/trackproxymodel.h
View File

@ -77,6 +77,7 @@ public slots:
protected:
bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
private:
TrackModel* m_model;

7
src/libtomahawk/playlist/trackview.cpp
View File

@ -50,7 +50,6 @@ TrackView::TrackView( QWidget* parent )
, m_resizing( false )
, m_dragging( false )
{
setSortingEnabled( false );
setAlternatingRowColors( true );
setSelectionMode( QAbstractItemView::ExtendedSelection );
setSelectionBehavior( QAbstractItemView::SelectRows );
@ -63,9 +62,11 @@ TrackView::TrackView( QWidget* parent )
setRootIsDecorated( false );
setUniformRowHeights( true );
setMinimumWidth( 300 );
// setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
// setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
setHeader( m_header );
setSortingEnabled( true );
sortByColumn( -1 );
#ifndef Q_WS_WIN
QFont f = font();
@ -78,7 +79,7 @@ TrackView::TrackView( QWidget* parent )
setFont( f );
#endif
QAction* createLinkAction = new QAction( tr( "Copy track link" ), this );
QAction* createLinkAction = new QAction( tr( "Copy Track Link" ), this );
connect( createLinkAction, SIGNAL( triggered( bool ) ), this, SLOT( copyLink() ) );
addAction( createLinkAction );

4
src/libtomahawk/utils/proxystyle.cpp
View File

@ -24,8 +24,8 @@
#include <QStyleOption>
#include <QWidget>
#define ARROW_WIDTH 8
#define ARROW_HEIGHT 8
#define ARROW_WIDTH 7
#define ARROW_HEIGHT 7
void

3
src/libtomahawk/utils/tomahawkutils.h
View File

@ -24,6 +24,7 @@
#include <QThread>
#include <QNetworkProxy>
#include <QStringList>
#include <QDir>
#define RESPATH ":/data/"
@ -43,7 +44,7 @@ namespace TomahawkUtils
NetworkProxyFactory()
: m_proxy( QNetworkProxy::NoProxy )
{}
virtual ~NetworkProxyFactory() {}
virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );

6
src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp
View File

@ -41,11 +41,11 @@ SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget*
ui->historyView->overlay()->setEnabled( false );
m_recentCollectionModel = new CollectionFlatModel( ui->recentCollectionView );
ui->recentCollectionView->setModel( m_recentCollectionModel );
ui->recentCollectionView->setTrackModel( m_recentCollectionModel );
m_recentCollectionModel->addFilteredCollection( source->collection(), 250, DatabaseCommand_AllTracks::ModificationTime );
m_historyModel = new PlaylistModel( ui->historyView );
ui->historyView->setModel( m_historyModel );
ui->historyView->setPlaylistModel( m_historyModel );
m_historyModel->loadHistory( source );
connect( source.data(), SIGNAL( playbackFinished( Tomahawk::query_ptr ) ), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ) );
@ -59,7 +59,7 @@ SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget*
ui->historyView->setColumnHidden( TrackModel::Filesize, true );
m_recentAlbumModel = new AlbumModel( ui->recentAlbumView );
ui->recentAlbumView->setModel( m_recentAlbumModel );
ui->recentAlbumView->setAlbumModel( m_recentAlbumModel );
m_recentAlbumModel->addFilteredCollection( source->collection(), 20, DatabaseCommand_AllAlbums::ModificationTime );
m_title = tr( "Info about %1" ).arg( source->isLocal() ? tr( "Your Collection" ) : source->friendlyName() );

1
src/libtomahawk/widgets/searchwidget.cpp
View File

@ -42,6 +42,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
m_resultsModel = new PlaylistModel( ui->resultsView );
ui->resultsView->setPlaylistModel( m_resultsModel );
ui->resultsView->overlay()->setEnabled( false );
ui->resultsView->sortByColumn( PlaylistModel::Score, Qt::DescendingOrder );
m_queries << Tomahawk::Query::get( search, uuid() );

6
src/resolvers/qtscriptresolver.h
View File

@ -22,6 +22,7 @@
#include "resolver.h"
#include "query.h"
#include "result.h"
#include "utils/tomahawkutils.h"
#include <QApplication>
#include <QDebug>
@ -41,6 +42,11 @@ public:
: QWebPage( (QObject*) parent )
, m_parent( parent )
{
settings()->setAttribute( QWebSettings::OfflineStorageDatabaseEnabled, true );
settings()->setOfflineStoragePath( TomahawkUtils::appDataDir().path() );
settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
settings()->setLocalStoragePath( TomahawkUtils::appDataDir().path() );
settings()->setAttribute( QWebSettings::LocalStorageDatabaseEnabled, true );
}
public slots:

8
src/resolvers/scriptresolver.cpp
View File

@ -39,7 +39,13 @@ ScriptResolver::ScriptResolver( const QString& exe )
connect( &m_proc, SIGNAL( readyReadStandardOutput() ), SLOT( readStdout() ) );
connect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
m_proc.start( filePath() );
QString filepath = filePath();
#ifdef WIN32
// have to enclose in quotes if path contains spaces on windows...
filepath = QString( "\"%1\"" ).arg( filepath );
#endif
m_proc.start( filepath );
}

7
src/settingsdialog.cpp
View File

@ -136,11 +136,12 @@ SettingsDialog::SettingsDialog( QWidget *parent )
}
// NOW PLAYING
#ifdef Q_WS_MAC
#ifdef Q_WS_MAC
ui->checkBoxEnableAdium->setChecked( s->nowPlayingEnabled() );
#else
#else
ui->nowPlaying->hide();
ui->checkBoxEnableAdium->hide();
#endif
#endif
// LAST FM
ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() );

5
src/sip/jabber/jabber.cpp
View File

@ -622,7 +622,8 @@ void JabberPlugin::onNewMessage(const Jreen::Message& message)
if( message.subtype() == Jreen::Message::Error )
{
qDebug() << Q_FUNC_INFO << "Received error message from " << from << ", not answering... (Condition: " << message.error()->condition() << ")";
qDebug() << Q_FUNC_INFO << "Received error message from " << from << ", not answering... (Condition: "
<< ( message.error().isNull() ? -1 : message.error()->condition() ) << ")";
return;
}
@ -685,7 +686,7 @@ void JabberPlugin::onPresenceReceived( const Jreen::RosterItem::Ptr &item, const
Jreen::IQ featuresIq( Jreen::IQ::Get, jid );
featuresIq.addExtension( new Jreen::Disco::Info( node ) );
Jreen::IQReply *reply = m_client->send(featuresIq);
reply->setData(RequestDisco);
connect(reply, SIGNAL(received(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));

78
src/sourcetree/items/collectionitem.cpp
View File

@ -33,13 +33,22 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons
, m_playlists( 0 )
, m_stations( 0 )
, m_tempItem( 0 )
, m_sourceInfoItem( 0 )
, m_curTempPage( 0 )
, m_sourceInfoPage( 0 )
{
if( m_source.isNull() ) { // super collection
connect( ViewManager::instance(), SIGNAL( tempPageActivated( Tomahawk::ViewPage*) ), this, SLOT( tempPageActivated( Tomahawk::ViewPage* ) ) );
return;
}
m_sourceInfoItem = new GenericPageItem( model(), this, tr( "New Additions" ), QIcon(),
boost::bind( &CollectionItem::sourceInfoClicked, this ),
boost::bind( &CollectionItem::getSourceInfoPage, this )
);
m_sourceInfoItem->setSortValue( -300 );
// create category items if there are playlists to show, or stations to show
QList< playlist_ptr > playlists = source->collection()->playlists();
QList< dynplaylist_ptr > autoplaylists = source->collection()->autoPlaylists();
@ -71,18 +80,10 @@ CollectionItem::CollectionItem( SourcesModel* mdl, SourceTreeItem* parent, cons
connect( source->collection().data(), SIGNAL( playlistsAdded( QList<Tomahawk::playlist_ptr> ) ),
SLOT( onPlaylistsAdded( QList<Tomahawk::playlist_ptr> ) ), Qt::QueuedConnection );
connect( source->collection().data(), SIGNAL( playlistsDeleted( QList<Tomahawk::playlist_ptr> ) ),
SLOT( onPlaylistsDeleted( QList<Tomahawk::playlist_ptr> ) ), Qt::QueuedConnection );
connect( source->collection().data(), SIGNAL( autoPlaylistsAdded( QList< Tomahawk::dynplaylist_ptr > ) ),
SLOT( onAutoPlaylistsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
connect( source->collection().data(), SIGNAL( autoPlaylistsDeleted( QList<Tomahawk::dynplaylist_ptr> ) ),
SLOT( onAutoPlaylistsDeleted( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
connect( source->collection().data(), SIGNAL( stationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ),
SLOT( onStationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
connect( source->collection().data(), SIGNAL( stationsDeleted( QList<Tomahawk::dynplaylist_ptr> ) ),
SLOT( onStationsDeleted( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
}
@ -154,6 +155,14 @@ CollectionItem::playlistsAddedInternal( SourceTreeItem* parent, const QList< dyn
// qDebug() << "Dynamic Playlist added:" << p->title() << p->creator() << p->info();
p->loadRevision();
items << plItem;
if( p->mode() == Static ) {
connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
SLOT( onAutoPlaylistDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
} else {
connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
SLOT( onStationDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
}
}
parent->endRowsAdded();
}
@ -161,20 +170,17 @@ CollectionItem::playlistsAddedInternal( SourceTreeItem* parent, const QList< dyn
template< typename T >
void
CollectionItem::playlistsDeletedInternal( SourceTreeItem* parent, const QList< T >& playlists )
CollectionItem::playlistDeletedInternal( SourceTreeItem* parent, const T& p )
{
Q_ASSERT( parent ); // How can we delete playlists if we have none?
QList< SourceTreeItem* > items;
foreach( const T& playlist, playlists ) {
int curCount = parent->children().count();
for( int i = 0; i < curCount; i++ ) {
PlaylistItem* pl = qobject_cast< PlaylistItem* >( parent->children().at( i ) );
if( pl && pl->playlist() == playlist ) {
parent->beginRowsRemoved( i, i );
parent->removeChild( pl );
parent->endRowsRemoved();
break;
}
int curCount = parent->children().count();
for( int i = 0; i < curCount; i++ ) {
PlaylistItem* pl = qobject_cast< PlaylistItem* >( parent->children().at( i ) );
if( pl && pl->playlist() == p ) {
parent->beginRowsRemoved( i, i );
parent->removeChild( pl );
parent->endRowsRemoved();
break;
}
}
}
@ -208,15 +214,19 @@ CollectionItem::onPlaylistsAdded( const QList< playlist_ptr >& playlists )
// qDebug() << "Playlist added:" << p->title() << p->creator() << p->info();
p->loadRevision();
items << plItem;
connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::playlist_ptr ) ),
SLOT( onPlaylistDeleted( Tomahawk::playlist_ptr ) ), Qt::QueuedConnection );
}
m_playlists->endRowsAdded();
}
void
CollectionItem::onPlaylistsDeleted( const QList< playlist_ptr >& playlists )
CollectionItem::onPlaylistDeleted( const playlist_ptr& playlist )
{
playlistsDeletedInternal( m_playlists, playlists );
playlistDeletedInternal( m_playlists, playlist );
}
@ -238,12 +248,12 @@ CollectionItem::onAutoPlaylistsAdded( const QList< dynplaylist_ptr >& playlists
void
CollectionItem::onAutoPlaylistsDeleted( const QList< dynplaylist_ptr >& playlists )
CollectionItem::onAutoPlaylistDeleted( const dynplaylist_ptr& playlist )
{
if( !m_playlists )
qDebug() << "NO playlist category item for a deleting playlist..";
playlistsDeletedInternal( m_playlists, playlists );
playlistDeletedInternal( m_playlists, playlist );
}
@ -265,9 +275,9 @@ CollectionItem::onStationsAdded( const QList< dynplaylist_ptr >& stations )
void
CollectionItem::onStationsDeleted( const QList< dynplaylist_ptr >& stations )
CollectionItem::onStationDeleted( const dynplaylist_ptr& station )
{
playlistsDeletedInternal( m_stations, stations );
playlistDeletedInternal( m_stations, station );
}
void
@ -306,3 +316,19 @@ CollectionItem::getTempPage() const
{
return m_curTempPage;
}
ViewPage*
CollectionItem::sourceInfoClicked()
{
if( m_source.isNull() )
return 0;
m_sourceInfoPage = ViewManager::instance()->show( m_source );
return m_sourceInfoPage;
}
ViewPage*
CollectionItem::getSourceInfoPage() const
{
return m_sourceInfoPage;
}

13
src/sourcetree/items/collectionitem.h
View File

@ -45,27 +45,32 @@ public:
private slots:
void onPlaylistsAdded( const QList<Tomahawk::playlist_ptr>& playlists );
void onPlaylistsDeleted( const QList<Tomahawk::playlist_ptr>& playlists );
void onPlaylistDeleted( const Tomahawk::playlist_ptr& playlists );
void onAutoPlaylistsAdded( const QList<Tomahawk::dynplaylist_ptr>& playlists );
void onAutoPlaylistsDeleted( const QList<Tomahawk::dynplaylist_ptr>& playlists );
void onAutoPlaylistDeleted( const Tomahawk::dynplaylist_ptr& playlists );
void onStationsAdded( const QList<Tomahawk::dynplaylist_ptr>& stations );
void onStationsDeleted( const QList<Tomahawk::dynplaylist_ptr>& stations );
void onStationDeleted( const Tomahawk::dynplaylist_ptr& stations );
void tempPageActivated( Tomahawk::ViewPage* );
Tomahawk::ViewPage* tempItemClicked();
Tomahawk::ViewPage* getTempPage() const;
Tomahawk::ViewPage* sourceInfoClicked();
Tomahawk::ViewPage* getSourceInfoPage() const;
private:
void playlistsAddedInternal( SourceTreeItem* parent, const QList< Tomahawk::dynplaylist_ptr >& playlists );
template< typename T >
void playlistsDeletedInternal( SourceTreeItem* parent, const QList< T >& playlists );
void playlistDeletedInternal( SourceTreeItem* parent, const T& playlists );
Tomahawk::source_ptr m_source;
CategoryItem* m_playlists;
CategoryItem* m_stations;
GenericPageItem* m_tempItem;
GenericPageItem* m_sourceInfoItem;
Tomahawk::ViewPage* m_curTempPage;
Tomahawk::ViewPage* m_sourceInfoPage;
};

1
src/sourcetree/items/genericpageitems.cpp
View File

@ -26,6 +26,7 @@ GenericPageItem::GenericPageItem( SourcesModel* model, SourceTreeItem* parent, c
: SourceTreeItem( model, parent, SourcesModel::GenericPage )
, m_icon( icon )
, m_text( text )
, m_sortValue( 0 )
, m_show( show )
, m_get( get )
{

3
src/sourcetree/items/genericpageitems.h
View File

@ -35,14 +35,17 @@ public:
virtual void activate();
virtual bool willAcceptDrag( const QMimeData* data ) const;
virtual QIcon icon() const;
virtual int peerSortValue() const { return m_sortValue; } // How to sort relative to peers in the tree.
void setText( const QString& text );
void setSortValue( int value ) { m_sortValue = value; }
signals:
void activated();
private:
QIcon m_icon;
QString m_text;
int m_sortValue;
boost::function< Tomahawk::ViewPage*() > m_show;
boost::function< Tomahawk::ViewPage*() > m_get;
};

22
src/sourcetree/sourcetreeview.cpp
View File

@ -38,6 +38,7 @@
using namespace Tomahawk;
#define TREEVIEW_INDENT_ADD -7
class SourceDelegate : public QStyledItemDelegate
{
@ -53,6 +54,8 @@ protected:
editor->setGeometry( option.rect.adjusted( 20, 0, 0, 0 ) );
else
QStyledItemDelegate::updateEditorGeometry( editor, option, index );
editor->setGeometry( editor->geometry().adjusted( 2*TREEVIEW_INDENT_ADD, 0, 0, 0 ) );
}
private:
@ -79,7 +82,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
setDropIndicatorShown( false );
setAllColumnsShowFocus( true );
setUniformRowHeights( false );
setIndentation( 16 );
setIndentation( 14 );
setSortingEnabled( true );
sortByColumn( 0, Qt::AscendingOrder );
@ -595,6 +598,23 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
else
{
QStyledItemDelegate::paint( painter, o, index );
/*QStyleOptionViewItemV4 opt = o;
initStyleOption( &opt, index );
// shrink the indentations. count how indented this item is and remove it
int indentMult = 0;
QModelIndex counter = index;
while ( counter.parent().isValid() )
{
indentMult++;
counter = counter.parent();
}
int realX = opt.rect.x() + indentMult * TREEVIEW_INDENT_ADD;
opt.rect.setX( realX );
const QWidget *widget = opt.widget;
QStyle *style = widget ? widget->style() : QApplication::style();
style->drawControl( QStyle::CE_ItemViewItem, &opt, painter, widget ); */
}
#ifdef Q_WS_MAC

30
src/tomahawkwindow.cpp
View File

@ -82,7 +82,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
, m_trayIcon( new TomahawkTrayIcon( this ) )
, m_sourcetree( 0 )
{
qApp->setStyle( new ProxyStyle() );
// HACK QtCurve causes an infinite loop on startup. This is because setStyle calls setPalette, which calls ensureBaseStyle,
// which loads QtCurve. QtCurve calls setPalette, which creates an infinite loop. The UI will look like CRAP with QtCurve, but
// the user is asking for it explicitly... so he's gonna be stuck with an ugly UI.
if ( !QString( qApp->style()->metaObject()->className() ).toLower().contains( "qtcurve" ) )
qApp->setStyle( new ProxyStyle() );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
#ifdef Q_WS_MAC
@ -294,6 +299,16 @@ TomahawkWindow::setupSignals()
connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
connect( ui->actionExit, SIGNAL( triggered() ), qApp, SLOT( quit() ) );
connect( ui->actionPlay, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) );
connect( ui->actionNext, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) );
connect( ui->actionPrevious, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) );
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), this, SLOT( audioStarted() ) );
connect( AudioEngine::instance(), SIGNAL( resumed()), this, SLOT( audioStarted() ) );
connect( AudioEngine::instance(), SIGNAL( paused() ), this, SLOT( audioStopped() ) );
connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( audioStopped() ) );
#if defined( Q_OS_DARWIN )
connect( ui->actionMinimize, SIGNAL( triggered() ), SLOT( minimize() ) );
connect( ui->actionZoom, SIGNAL( triggered() ), SLOT( maximize() ) );
@ -528,6 +543,19 @@ TomahawkWindow::createPlaylist()
}
}
void
TomahawkWindow::audioStarted()
{
ui->actionPlay->setText( tr( "Pause" ) );
}
void
TomahawkWindow::audioStopped()
{
ui->actionPlay->setText( tr( "Play" ) );
}
void
TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )

4
src/tomahawkwindow.h
View File

@ -50,7 +50,6 @@ public:
~TomahawkWindow();
AudioControls* audioControls() { return m_audioControls; }
QStackedWidget* playlistStack();
SourceTreeView* sourceTreeView() const { return m_sourcetree; }
void setWindowTitle( const QString& title );
@ -84,6 +83,9 @@ private slots:
void onHistoryBackAvailable( bool avail );
void onHistoryForwardAvailable( bool avail );
void audioStarted();
void audioStopped();
void showAboutTomahawk();
void checkForUpdates();

24
src/tomahawkwindow.ui
View File

@ -35,7 +35,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>21</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuSettings">
@ -48,6 +48,10 @@
<property name="title">
<string>&amp;Music Player</string>
</property>
<addaction name="actionPlay"/>
<addaction name="actionPrevious"/>
<addaction name="actionNext"/>
<addaction name="separator"/>
<addaction name="actionUpdateCollection"/>
<addaction name="actionRescanCollection"/>
<addaction name="separator"/>
@ -201,6 +205,24 @@
<string>Fully Rescan Collection</string>
</property>
</action>
<action name="actionPlay">
<property name="text">
<string>Play</string>
</property>
<property name="shortcut">
<string>Space</string>
</property>
</action>
<action name="actionPrevious">
<property name="text">
<string>Previous</string>
</property>
</action>
<action name="actionNext">
<property name="text">
<string>Next</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>

2
src/web/api_v1.cpp
View File

@ -180,7 +180,7 @@ Api_v1::send404( QxtWebRequestEvent* event )
qDebug() << "404" << event->url.toString();
QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "<h1>Not Found</h1>" );
wpe->status = 404;
wpe->statusMessage = "not feventound";
wpe->statusMessage = "no event found";
postEvent( wpe );
}

26
thirdparty/liblastfm2/src/ws/ws.cpp vendored
View File

@ -1,5 +1,5 @@
/*
Copyright 2009 Last.fm Ltd.
Copyright 2009 Last.fm Ltd.
- Primarily authored by Max Howell, Jono Cole and Doug Mansell
This file is part of liblastfm.
@ -33,7 +33,7 @@ static QMap< QThread*, QNetworkAccessManager* > threadNamHash;
static QSet< QThread* > ourNamSet;
static QMutex namAccessMutex;
QString
QString
lastfm::ws::host()
{
QStringList const args = QCoreApplication::arguments();
@ -57,8 +57,8 @@ static QUrl url()
}
static QString iso639()
{
return QLocale().name().left( 2 ).toLower();
{
return QLocale().name().left( 2 ).toLower();
}
void autograph( QMap<QString, QString>& params )
@ -99,17 +99,17 @@ lastfm::ws::get( QMap<QString, QString> params )
QByteArray const value = QUrl::toPercentEncoding( i.value() );
url.addEncodedQueryItem( key, value );
}
qDebug() << url;
return nam()->get( QNetworkRequest(url) );
}
QNetworkReply*
lastfm::ws::post( QMap<QString, QString> params, bool sk )
{
sign( params, sk );
{
sign( params, sk );
QByteArray query;
QMapIterator<QString, QString> i( params );
while (i.hasNext()) {
@ -120,7 +120,9 @@ lastfm::ws::post( QMap<QString, QString> params, bool sk )
+ '&';
}
return nam()->post( QNetworkRequest(url()), query );
QNetworkRequest req(url());
req.setHeader( QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded" );
return nam()->post( req, query );
}
@ -133,7 +135,7 @@ lastfm::ws::parse( QNetworkReply* reply ) throw( ParseError )
if (!data.size())
throw MalformedResponse;
QDomDocument xml;
xml.setContent( data );
QDomElement lfm = xml.documentElement();
@ -223,7 +225,7 @@ lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
if ( oldNam == nam )
return;
threadNamHash[thread] = nam;
ourNamSet.remove( thread );
@ -286,7 +288,7 @@ namespace lastfm
const char* ApiKey;
/** if this is found set to "" we conjure ourselves a suitable one */
const char* UserAgent = 0;
const char* UserAgent = 0;
}
}

3
thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp vendored
View File

@ -682,6 +682,9 @@ void QxtHttpSessionManager::sendNextBlock(int requestID)
{
QSharedPointer<QIODevice>& dataSource = connector()->getRequestDataSource( requestID );
QIODevice* device = connector()->getRequestConnection(requestID);
if (!device)
return;
if (!qxt_d().connectionState.contains(device)) return; // in case a disconnect signal and a bytesWritten signal get fired in the wrong order
QxtHttpSessionManagerPrivate::ConnectionState& state = qxt_d().connectionState[device];
if (state.finishedTransfer) return;

5
thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp vendored
View File

@ -323,6 +323,11 @@ namespace QxtMetaObject
*/
bool connect(QObject* sender, const char* signal, QxtBoundFunction* slot, Qt::ConnectionType type)
{
if (!sender)
{
qWarning() << "Got connect() with a null sender!";
return false;
}
const QMetaObject* meta = sender->metaObject();
int methodID = meta->indexOfMethod(meta->normalizedSignature(signal).mid(1).constData());
if (methodID < 0)