From 5929adfa57937d5e6ca1bfe214a2956a11247442 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 24 Nov 2011 13:30:20 +0100 Subject: [PATCH] * Support a few more URL shorteners: ow.ly, fb.me, itun.es, tinyurl.com. --- src/libtomahawk/dropjob.cpp | 10 ++++------ src/libtomahawk/utils/shortenedlinkparser.cpp | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/dropjob.cpp b/src/libtomahawk/dropjob.cpp index 4b3aedea8..982e56258 100644 --- a/src/libtomahawk/dropjob.cpp +++ b/src/libtomahawk/dropjob.cpp @@ -125,8 +125,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType if ( acceptedType.testFlag( Track ) ) { - - if( url.contains( "m3u" ) ) return true; @@ -473,7 +471,7 @@ DropJob::handleM3u( const QString& fileUrls ) void DropJob::handleXspfs( const QString& fileUrls ) { - tDebug() << Q_FUNC_INFO << "Got xspf playlist!!" << fileUrls; + tDebug() << Q_FUNC_INFO << "Got XSPF playlist!" << fileUrls; bool error = false; QStringList urls = fileUrls.split( QRegExp( "\n" ), QString::SkipEmptyParts ); @@ -488,13 +486,13 @@ DropJob::handleXspfs( const QString& fileUrls ) if ( xspfFile.exists() ) { l = new XSPFLoader( dropAction() == Create, this ); - tDebug( LOGINFO ) << "Loading local xspf " << xspfFile.fileName(); + tDebug( LOGINFO ) << "Loading local XSPF" << xspfFile.fileName(); l->load( xspfFile ); } else if ( QUrl( url ).isValid() ) { l = new XSPFLoader( dropAction() == Create, this ); - tDebug( LOGINFO ) << "Loading remote xspf " << url; + tDebug( LOGINFO ) << "Loading remote XSPF" << url; l->load( QUrl( url ) ); } else @@ -505,7 +503,7 @@ DropJob::handleXspfs( const QString& fileUrls ) if ( dropAction() == Append && !error && l ) { - qDebug() << Q_FUNC_INFO << "Trying to append xspf"; + qDebug() << Q_FUNC_INFO << "Trying to append XSPF"; connect( l, SIGNAL( tracks( QList ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) ); } diff --git a/src/libtomahawk/utils/shortenedlinkparser.cpp b/src/libtomahawk/utils/shortenedlinkparser.cpp index 986f7b114..0e196449d 100644 --- a/src/libtomahawk/utils/shortenedlinkparser.cpp +++ b/src/libtomahawk/utils/shortenedlinkparser.cpp @@ -52,6 +52,10 @@ ShortenedLinkParser::handlesUrl( const QString& url ) url.contains( "bit.ly" ) || url.contains( "j.mp" ) || url.contains( "spoti.fi" ) || + url.contains( "ow.ly" ) || + url.contains( "fb.me" ) || + url.contains( "itun.es" ) || + url.contains( "tinyurl.com" ) || url.contains( "rd.io" ) ); }