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

* Allow empty titled XSPFs to be imported if they contain tracks at least.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2010-12-07 14:49:29 +01:00
parent e4f9e936ed
commit 7aaf3eb98c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/xspfloader.cpp
View File

@@ -76,17 +76,14 @@ XSPFLoader::gotBody()
xmldoc.setContent( m_body ); xmldoc.setContent( m_body );
QDomElement docElement( xmldoc.documentElement() ); QDomElement docElement( xmldoc.documentElement() );
QString title, info, creator; QString origTitle, title, info, creator;
title = docElement.firstChildElement( "title" ).text(); origTitle = docElement.firstChildElement( "title" ).text();
info = docElement.firstChildElement( "creator" ).text(); info = docElement.firstChildElement( "creator" ).text();
creator = docElement.firstChildElement( "info" ).text(); creator = docElement.firstChildElement( "info" ).text();
title = origTitle;
if ( title.isEmpty() ) if ( title.isEmpty() )
{ title = tr( "New Playlist" );
QMessageBox::critical( APP->mainWindow(), tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
deleteLater();
return;
}
m_playlist = Playlist::create( APP->sourcelist().getLocal(), m_playlist = Playlist::create( APP->sourcelist().getLocal(),
uuid(), uuid(),
@@ -118,6 +115,13 @@ XSPFLoader::gotBody()
entries << p; entries << p;
} }
if ( origTitle.isEmpty() && entries.isEmpty() )
{
QMessageBox::critical( APP->mainWindow(), tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
deleteLater();
return;
}
m_playlist->createNewRevision( uuid(), m_playlist->currentrevision(), entries ); m_playlist->createNewRevision( uuid(), m_playlist->currentrevision(), entries );
emit ok( m_playlist ); emit ok( m_playlist );