streaming playlists support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@284 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 223 insertions, 218 deletions

diff --git a/src/ui/fileloader.cpp b/src/ui/fileloader.cpp
index 89926f883..fcc8f6feb 100644
--- a/src/ui/fileloader.cpp
+++ b/src/ui/fileloader.cpp
@@ -23,86 +23,86 @@
 #include "mediafile.h"
 
 FileLoader::FileLoader(QObject *parent)
-	: QThread(parent),m_files_to_load(),m_directory()
+        : QThread(parent),m_files_to_load(),m_directory()
 {
-   m_filters = Decoder::nameFilters();
-	m_finished = false;
+    m_filters = Decoder::nameFilters();
+    m_finished = false;
 }
 
 
 FileLoader::~FileLoader()
 {
-	qWarning("FileLoader::~FileLoader()");
+    qWarning("FileLoader::~FileLoader()");
 }
 
 
 void FileLoader::addFiles(const QStringList &files)
 {
-	if (files.isEmpty ())
-		return;
-	
-	foreach(QString s, files)
-	{
-		if (Decoder::supports(s))
-			emit newMediaFile(new MediaFile(s));
-		if(m_finished) return;
-	}
+    if (files.isEmpty ())
+        return;
+
+    foreach(QString s, files)
+    {
+        if (s.startsWith("http://") || Decoder::supports(s))
+            emit newMediaFile(new MediaFile(s));
+        if (m_finished) return;
+    }
 }
 
 
 void FileLoader::addDirectory(const QString& s)
-{	
-	QDir dir(s);
-	dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-	dir.setSorting(QDir::Name);
-	QFileInfoList l = dir.entryInfoList(m_filters);
-	for (int i = 0; i < l.size(); ++i)
-	{
-		QFileInfo fileInfo = l.at(i);
-		QString suff = fileInfo.completeSuffix(); 
-		list << fileInfo;
-		  
-		if (Decoder::supports(fileInfo.absoluteFilePath ()))
-			emit newMediaFile(new MediaFile(fileInfo.absoluteFilePath ()));
-		if(m_finished) return;
-	}
-	dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-	dir.setSorting(QDir::Name);
-	l.clear();
-	l = dir.entryInfoList();
-	if (l.size() > 0)
-		for (int i = 0; i < l.size(); ++i)
-	{
-		QFileInfo fileInfo = l.at(i);
-		addDirectory(fileInfo.absoluteFilePath ());
-		if(m_finished) return;
-	}
+{
+    QDir dir(s);
+    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    dir.setSorting(QDir::Name);
+    QFileInfoList l = dir.entryInfoList(m_filters);
+    for (int i = 0; i < l.size(); ++i)
+    {
+        QFileInfo fileInfo = l.at(i);
+        QString suff = fileInfo.completeSuffix();
+        list << fileInfo;
+
+        if (Decoder::supports(fileInfo.absoluteFilePath ()))
+            emit newMediaFile(new MediaFile(fileInfo.absoluteFilePath ()));
+        if (m_finished) return;
+    }
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    dir.setSorting(QDir::Name);
+    l.clear();
+    l = dir.entryInfoList();
+    if (l.size() > 0)
+        for (int i = 0; i < l.size(); ++i)
+        {
+            QFileInfo fileInfo = l.at(i);
+            addDirectory(fileInfo.absoluteFilePath ());
+            if (m_finished) return;
+        }
 }
 
 
 void FileLoader::run()
 {
-	if(!m_files_to_load.isEmpty())
-		addFiles(m_files_to_load);
-	else if(!m_directory.isEmpty())
-		addDirectory(m_directory);
+    if (!m_files_to_load.isEmpty())
+        addFiles(m_files_to_load);
+    else if (!m_directory.isEmpty())
+        addDirectory(m_directory);
 }
 
 
 
 void FileLoader::setFilesToLoad(const QStringList & l)
 {
-	m_files_to_load = l;
-	m_directory = QString();
+    m_files_to_load = l;
+    m_directory = QString();
 }
 
 void FileLoader::setDirectoryToLoad(const QString & d)
 {
-	m_directory = d;
-	m_files_to_load.clear();
+    m_directory = d;
+    m_files_to_load.clear();
 }
 
 void FileLoader::finish()
 {
-	m_finished = true;
+    m_finished = true;
 }
diff --git a/src/ui/playlistformat.cpp b/src/ui/playlistformat.cpp
index d9ce45b77..dc80d95c8 100644
--- a/src/ui/playlistformat.cpp
+++ b/src/ui/playlistformat.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2006 by Ilya Kotov                                      *
+*   Copyright (C) 2006-2008 by Ilya Kotov                                 *
 *   forkotov02@hotmail.ru                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -21,10 +21,10 @@
 #include <QFileInfo>
 
 #ifndef XSPF_PLUGIN
-	#include <QDomDocument>
-	#include <QDomElement>
-	#include <QUrl>
-	#include "version.h"
+#include <QDomDocument>
+#include <QDomElement>
+#include <QUrl>
+#include "version.h"
 #endif
 
 #include "playlistformat.h"
@@ -33,74 +33,79 @@
 
 bool PLSPlaylistFormat::hasFormat(const QString & f)
 {
-	foreach(QString s,m_supported_formats)
-		if(f == s)
-			return true;
+    foreach(QString s,m_supported_formats)
+    if (f == s)
+        return true;
 
-	return false;
+    return false;
 }
 
 QStringList PLSPlaylistFormat::getExtensions() const
 {
-	return m_supported_formats;
+    return m_supported_formats;
 }
 
 PLSPlaylistFormat::PLSPlaylistFormat()
 {
-	m_supported_formats << "pls";
+    m_supported_formats << "pls";
 }
 
 QString PLSPlaylistFormat::name() const
 {
-	return "PLSPlaylistFormat";
+    return "PLSPlaylistFormat";
 }
 
 
 QStringList PLSPlaylistFormat::decode(const QString & contents)
 {
-	QStringList out;
-	QStringList splitted = contents.split("\n");
-	if(!splitted.isEmpty())
-	{
-		if(splitted.takeAt(0).toLower().contains("[playlist]"))
-		{
-			foreach(QString str, splitted)
-			{
-				if(str.startsWith("File"))
-				{
-					QString unverified = str.remove(0,str.indexOf(QChar('=')) + 1);
-					if(QFileInfo(unverified).exists())
-						out << QFileInfo(unverified).absoluteFilePath();
-					else
-						qWarning("File %s does not exist",unverified.toLocal8Bit().data());
-				}
-			}
-			return out;
-		}
-	}
-	else
-		qWarning("Error parsing PLS format");
-
-	return QStringList();
+    QStringList out;
+    QStringList splitted = contents.split("\n");
+    if (!splitted.isEmpty())
+    {
+        if (splitted.takeAt(0).toLower().contains("[playlist]"))
+        {
+            foreach(QString str, splitted)
+            {
+                if (str.startsWith("File"))
+                {
+                    QString unverified = str.remove(0,str.indexOf(QChar('=')) + 1);
+                    unverified = unverified.trimmed();
+                    if (unverified.startsWith("http://"))
+                    {
+                        out << unverified;
+                    }
+                    else if (QFileInfo(unverified).exists())
+                        out << QFileInfo(unverified).absoluteFilePath();
+                    else
+                        qWarning("File %s does not exist", qPrintable(unverified));
+                }
+            }
+            return out;
+        }
+    }
+    else
+        qWarning("Error parsing PLS format");
+
+    return QStringList();
 }
 
 QString PLSPlaylistFormat::encode(const QList< MediaFile * > & contents)
 {
-	QStringList out;
-	out << QString("[playlist]");
-	int counter = 1;
-	foreach(MediaFile* f,contents)
-	{
-		QString begin = "File" + QString::number(counter) + "=";
-		out.append(begin + f->path());
-		begin = "Title" + QString::number(counter) + "=";
-		out.append(begin + f->title());
-		begin = "Length" + QString::number(counter) + "=";
-		out.append(begin + QString::number(f->length()));
-		counter ++;
-	}
-	out << "NumberOfEntries=" + QString::number(contents.count());
-	return out.join("\n");
+    QStringList out;
+    out << QString("[playlist]");
+    int counter = 1;
+    foreach(MediaFile* f,contents)
+    {
+        QString begin = "File" + QString::number(counter) + "=";
+        out.append(begin + f->path());
+        begin = "Title" + QString::number(counter) + "=";
+        out.append(begin + f->title());
+        begin = "Length" + QString::number(counter) + "=";
+        out.append(begin + QString::number(f->length()));
+        counter ++;
+    }
+    out << "NumberOfEntries=" + QString::number(contents.count());
+    return out.join("\n");
 }
 
 
@@ -108,65 +113,65 @@ QString PLSPlaylistFormat::encode(const QList< MediaFile * > & contents)
 
 bool M3UPlaylistFormat::hasFormat(const QString & f)
 {
-	foreach(QString s,m_supported_formats)
-		if(f == s)
-			return true;
+    foreach(QString s,m_supported_formats)
+    if (f == s)
+        return true;
 
-	return false;
+    return false;
 }
 
 QStringList M3UPlaylistFormat::getExtensions() const
 {
-	return m_supported_formats;
+    return m_supported_formats;
 }
 
 M3UPlaylistFormat::M3UPlaylistFormat()
 {
-	m_supported_formats << "m3u";
+    m_supported_formats << "m3u";
 }
 
 QStringList M3UPlaylistFormat::decode(const QString & contents)
 {
-	QStringList out;
-	QStringList splitted = contents.split("\n");
-	if(!splitted.isEmpty())
-	{
-		if(splitted.takeAt(0).contains("#EXTM3U"))
-		{
-			foreach(QString str, splitted)
-			{
-				if(str.startsWith("#EXTINF:"))
-					;//TODO: Let's skip it for now...
-				else if(QFileInfo(str).exists())
-					out << QFileInfo(str).absoluteFilePath();
-				else
-					qWarning("File %s does not exist",str.toLocal8Bit().data());
-			}
-			return out;
-		}
-	}
-	else
-		qWarning("Error parsing M3U format");
-
-	return QStringList();
+    QStringList out;
+    QStringList splitted = contents.split("\n");
+    if (!splitted.isEmpty())
+    {
+        foreach(QString str, splitted)
+        {
+            str = str.trimmed ();
+            if (str.startsWith("#EXTM3U") || str.startsWith("#EXTINF:") || str.isEmpty())
+                ;//TODO: Let's skip it for now...
+            else if (str.startsWith("http://"))
+                out << str;
+            else if (QFileInfo(str).exists())
+                out << QFileInfo(str).absoluteFilePath();
+            else
+                qWarning("File %s does not exist", qPrintable(str));
+        }
+        return out;
+    }
+    else
+        qWarning("Error parsing M3U format");
+
+    return QStringList();
 }
 
 QString M3UPlaylistFormat::encode(const QList< MediaFile * > & contents)
 {
-	QStringList out;
-	out << QString("#EXTM3U");
-	foreach(MediaFile* f,contents)
-	{
-		QString info = "#EXTINF:" + QString::number(f->length()) + "," + f->title();
-		out.append(info);
-		out.append(f->path());
-	}
-	return out.join("\n");
+    QStringList out;
+    out << QString("#EXTM3U");
+    foreach(MediaFile* f,contents)
+    {
+        QString info = "#EXTINF:" + QString::number(f->length()) + "," + f->title();
+        out.append(info);
+        out.append(f->path());
+    }
+    return out.join("\n");
 }
 
 QString M3UPlaylistFormat::name() const
 {
-	return "M3UPlaylistFormat";
+    return "M3UPlaylistFormat";
 }
 
 
@@ -174,111 +179,111 @@ QString M3UPlaylistFormat::name() const
 
 QStringList XSPFPlaylistFormat::decode(const QString & contents)
 {
-	QStringList out;
-	QDomDocument doc;
-	QString errorMsg;
-	int errorCol;
-	int errorRow;
-	bool ok = doc.setContent(contents, &errorMsg, &errorRow, &errorCol);
-
-	if(!ok)
-		qDebug("Parse Error: %s\tRow:%d\tCol%d", 
-				 qPrintable(errorMsg), errorRow, errorCol );
-
-	QDomElement rootElement = doc.firstChildElement("playlist");
-	if(rootElement.isNull()) 
-		qWarning("Error parsing XSPF: can't find 'playlist' element");
-	
-	QDomElement tracklistElement = rootElement.firstChildElement("trackList");
-	if(tracklistElement.isNull()) 
-		qWarning("Error parsing XSPF: can't find 'trackList' element");
-	
-	QDomElement child = tracklistElement.firstChildElement("track");
-
-	while (!child.isNull())
-	{	
-		QString str = QUrl(child.firstChildElement("location").text()).toString(QUrl::RemoveScheme);
-		out << str;
-		child = child.nextSiblingElement();
-	}
-	
-	return out;
+    QStringList out;
+    QDomDocument doc;
+    QString errorMsg;
+    int errorCol;
+    int errorRow;
+    bool ok = doc.setContent(contents, &errorMsg, &errorRow, &errorCol);
+
+    if (!ok)
+        qDebug("Parse Error: %s\tRow:%d\tCol%d",
+               qPrintable(errorMsg), errorRow, errorCol );
+
+    QDomElement rootElement = doc.firstChildElement("playlist");
+    if (rootElement.isNull())
+        qWarning("Error parsing XSPF: can't find 'playlist' element");
+
+    QDomElement tracklistElement = rootElement.firstChildElement("trackList");
+    if (tracklistElement.isNull())
+        qWarning("Error parsing XSPF: can't find 'trackList' element");
+
+    QDomElement child = tracklistElement.firstChildElement("track");
+
+    while (!child.isNull())
+    {
+        QString str = QUrl(child.firstChildElement("location").text()).toString(QUrl::RemoveScheme);
+        out << str;
+        child = child.nextSiblingElement();
+    }
+
+    return out;
 }
 
 // Needs more work - it's better use libSpiff there and put it as plugin.
 
 QString XSPFPlaylistFormat::encode(const QList< MediaFile * > & files)
 {
-	QDomDocument doc;
-	QDomElement root = doc.createElement("playlist");
-	root.setAttribute("version",QString("1"));
-	root.setAttribute("xmlns",QString("http://xspf.org/ns/0"));
-	
-	QDomElement creator = doc.createElement("creator");
-	QDomText text = doc.createTextNode("qmmp-" + QString(QMMP_STR_VERSION));
-	creator.appendChild(text);
-	root.appendChild(creator);
-	
-	QDomElement tracklist = doc.createElement("trackList");
-
-	int counter = 1;
-	foreach(MediaFile* f,files)
-	{	
-		QDomElement track = doc.createElement("track");
-
-		QDomElement ch = doc.createElement("location");
-		QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->path()).absoluteFilePath());
-		ch.appendChild(text);
-		track.appendChild(ch);
-		
-		ch = doc.createElement("title");
-		text = doc.createTextNode(f->title());
-		ch.appendChild(text);
-		track.appendChild(ch);
-		
-		ch = doc.createElement("trackNum");
-		text = doc.createTextNode(QString::number(counter));
-		ch.appendChild(text);
-		track.appendChild(ch);
-		
-		ch = doc.createElement("year");
-		text = doc.createTextNode(QString::number(f->year()));
-		ch.appendChild(text);
-		track.appendChild(ch);
-		
-		tracklist.appendChild(track);
-		counter ++;
-	}
-	
-	root.appendChild(tracklist);
-	doc.appendChild( root );
-	QString xml_header("<?xml version='1.0' encoding='UTF-8'?>\n");
-	return doc.toString().prepend(xml_header);
+    QDomDocument doc;
+    QDomElement root = doc.createElement("playlist");
+    root.setAttribute("version",QString("1"));
+    root.setAttribute("xmlns",QString("http://xspf.org/ns/0"));
+
+    QDomElement creator = doc.createElement("creator");
+    QDomText text = doc.createTextNode("qmmp-" + QString(QMMP_STR_VERSION));
+    creator.appendChild(text);
+    root.appendChild(creator);
+
+    QDomElement tracklist = doc.createElement("trackList");
+
+    int counter = 1;
+    foreach(MediaFile* f,files)
+    {
+        QDomElement track = doc.createElement("track");
+
+        QDomElement ch = doc.createElement("location");
+        QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->path()).absoluteFilePath());
+        ch.appendChild(text);
+        track.appendChild(ch);
+
+        ch = doc.createElement("title");
+        text = doc.createTextNode(f->title());
+        ch.appendChild(text);
+        track.appendChild(ch);
+
+        ch = doc.createElement("trackNum");
+        text = doc.createTextNode(QString::number(counter));
+        ch.appendChild(text);
+        track.appendChild(ch);
+
+        ch = doc.createElement("year");
+        text = doc.createTextNode(QString::number(f->year()));
+        ch.appendChild(text);
+        track.appendChild(ch);
+
+        tracklist.appendChild(track);
+        counter ++;
+    }
+
+    root.appendChild(tracklist);
+    doc.appendChild( root );
+    QString xml_header("<?xml version='1.0' encoding='UTF-8'?>\n");
+    return doc.toString().prepend(xml_header);
 }
 
 XSPFPlaylistFormat::XSPFPlaylistFormat()
 {
-	m_supported_formats << "xspf";
+    m_supported_formats << "xspf";
 }
 
 bool XSPFPlaylistFormat::hasFormat(const QString & f)
 {
-	foreach(QString s,m_supported_formats)
-		if(f == s)
-			return true;
+    foreach(QString s,m_supported_formats)
+    if (f == s)
+        return true;
 
-	return false;
+    return false;
 }
 
 QStringList XSPFPlaylistFormat::getExtensions() const
 {
-	return m_supported_formats;
+    return m_supported_formats;
 }
 
 
 QString XSPFPlaylistFormat::name() const
 {
-	return "XSPFPlaylistFormat";
+    return "XSPFPlaylistFormat";
 }