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

Add proper playlist POSTing

Browse Source
This commit is contained in:
Leo Franchi
2012-04-26 21:12:44 -04:00
parent 24ec94ed96
commit 7fc03770d0
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libtomahawk/globalactionmanager.cpp
View File

@@ -172,12 +172,21 @@ GlobalActionManager::getShortLink( const playlist_ptr& pl )
QByteArray msg = s.serialize( jspf ); QByteArray msg = s.serialize( jspf );
qDebug() << "POSTING DATA:" << msg; qDebug() << "POSTING DATA:" << msg;
const QByteArray boundary = "----------------------------2434992cccab";
QByteArray data(QByteArray("--" + boundary + "\r\n"));
data += "Content-Disposition: form-data; name=\"data\"; filename=\"playlist.jspf\"\r\n";
data += "Content-Type: application/octet-stream\r\n\r\n";
data += msg;
data += "\r\n\r\n";
data += "--" + boundary + "--\r\n\r\n";
const QUrl url( QString( "%1/playlist/").arg( hostname() ) ); const QUrl url( QString( "%1/playlist/").arg( hostname() ) );
QNetworkRequest req( url ); QNetworkRequest req( url );
req.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) ); qDebug() << "POSTING TO:" << url.toString();
QNetworkReply *reply = TomahawkUtils::nam()->post( req, msg ); req.setHeader( QNetworkRequest::ContentTypeHeader, QString( "multipart/form-data; boundary=%1" ).arg( QString::fromLatin1( boundary ) ) );
QNetworkReply *reply = TomahawkUtils::nam()->post( req, data );
connect( reply, SIGNAL( finished() ), SLOT( shortenLinkRequestFinished() ) ); connect( reply, SIGNAL( finished() ), SLOT( postShortenFinished() ) );
connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( shortenLinkRequestError( QNetworkReply::NetworkError ) ) ); connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( shortenLinkRequestError( QNetworkReply::NetworkError ) ) );
} }
@@ -1102,6 +1111,25 @@ GlobalActionManager::shortenLinkRequestFinished()
} }
void
GlobalActionManager::postShortenFinished()
{
QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
Q_ASSERT( reply );
const QByteArray raw = reply->readAll();
qDebug() << "GOT REPLYL" << raw;
const QUrl url = QUrl::fromUserInput( raw );
qDebug() << "GOT POSTED SHORT URL:" << url.toString();
QClipboard* cb = QApplication::clipboard();
QByteArray data = url.toEncoded();
data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
cb->setText( data );
reply->deleteLater();
}
void void
GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error ) GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error )
{ {

1
src/libtomahawk/globalactionmanager.h
View File

@@ -72,6 +72,7 @@ signals:
private slots: private slots:
void shortenLinkRequestFinished(); void shortenLinkRequestFinished();
void postShortenFinished();
void shortenLinkRequestError( QNetworkReply::NetworkError ); void shortenLinkRequestError( QNetworkReply::NetworkError );
void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& pl ); void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& pl );

2
src/sourcetree/sourcetreeview.cpp
View File

@@ -361,7 +361,7 @@ SourceTreeView::copyPlaylistLink()
PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex ); PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
playlist_ptr playlist = item->playlist(); playlist_ptr playlist = item->playlist();
// GlobalActionManager::instance()->getShortLink( playlist ); GlobalActionManager::instance()->getShortLink( playlist );
// QString suggestedFilename = TomahawkSettings::instance()->playlistDefaultPath() + "/" + playlist->title(); // QString suggestedFilename = TomahawkSettings::instance()->playlistDefaultPath() + "/" + playlist->title();
// QString filename = QFileDialog::getSaveFileName( TomahawkUtils::tomahawkWindow(), tr( "Save XSPF" ), // QString filename = QFileDialog::getSaveFileName( TomahawkUtils::tomahawkWindow(), tr( "Save XSPF" ),