diff --git a/include/tomahawk/infosystem.h b/include/tomahawk/infosystem.h index 93a9b1745..30c43f5d2 100644 --- a/include/tomahawk/infosystem.h +++ b/include/tomahawk/infosystem.h @@ -165,7 +165,7 @@ private: } -Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoGenericMap ) +Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoGenericMap ); Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoCustomDataHash ); #endif // TOMAHAWK_INFOSYSTEM_H diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index f45c391a3..b2e54fcc7 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -16,6 +16,7 @@ set( libSources sourcelist.cpp pipeline.cpp + aclsystem.cpp artist.cpp album.cpp collection.cpp @@ -155,6 +156,7 @@ set( libHeaders pipeline.h functimeout.h + aclsystem.h collection.h query.h resolver.h diff --git a/src/libtomahawk/aclsystem.cpp b/src/libtomahawk/aclsystem.cpp new file mode 100644 index 000000000..73ceff6ae --- /dev/null +++ b/src/libtomahawk/aclsystem.cpp @@ -0,0 +1,72 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "aclsystem.h" + +#include + +#include + +ACLSystem::ACLSystem( QObject* parent ) + : QObject( parent ), + m_saveTimer( this ) +{ + //TODO: read from settings file into cache + m_saveTimer.setSingleShot( false ); + m_saveTimer.setInterval( 60000 ); + connect( &m_saveTimer, SIGNAL( timeout() ), this, SLOT( saveTimerFired() ) ); +} + +ACLSystem::~ACLSystem() +{ + //TODO: save from cache into settings file +} + +void +ACLSystem::authorize( const QString& dbid, const QString& path, ACLType type ) +{ + TomahawkSettings *s = TomahawkSettings::instance(); + if ( !s->scannerPath().contains( path ) ) + { + qDebug() << "path selected is not in our scanner path!"; + return; + } + QHash< QString, ACLType > peerHash; + if ( m_cache.contains( "dbid" ) ) + peerHash = m_cache["dbid"]; + peerHash[path] = type; +} + +bool +ACLSystem::isAuthorized( const QString& dbid, const QString& path ) +{ + if ( !m_cache.contains( "dbid" ) ) + return false; + + QHash< QString, ACLType > peerHash = m_cache["dbid"]; + if ( !peerHash.contains( path ) ) + return false; + + return peerHash[path] == ACLSystem::Allow; +} + +void +ACLSystem::saveTimerFired() +{ + //TODO: save from cache into settings file +} \ No newline at end of file diff --git a/src/libtomahawk/aclsystem.h b/src/libtomahawk/aclsystem.h new file mode 100644 index 000000000..8a6cf9d33 --- /dev/null +++ b/src/libtomahawk/aclsystem.h @@ -0,0 +1,54 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef TOMAHAWK_ACLSYSTEM_H +#define TOMAHAWK_ACLSYSTEM_H + +#include +#include +#include +#include + +#include "dllmacro.h" + +class DLLEXPORT ACLSystem : public QObject +{ + Q_OBJECT + + enum ACLType { + Allow, + Deny + }; + +public: + + ACLSystem( QObject *parent = 0 ); + ~ACLSystem(); + + bool isAuthorized( const QString &dbid, const QString &path ); + void authorize( const QString &dbid, const QString &path, ACLType type ); + +private slots: + void saveTimerFired(); + +private: + QHash< QString, QHash< QString, ACLType> > m_cache; + QTimer m_saveTimer; +}; + +#endif // TOMAHAWK_ACLSYSTEM_H diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp index a4008388b..fe307bd20 100644 --- a/src/libtomahawk/tomahawksettings.cpp +++ b/src/libtomahawk/tomahawksettings.cpp @@ -65,19 +65,19 @@ TomahawkSettings::~TomahawkSettings() } -QString +QStringList TomahawkSettings::scannerPath() const { #ifndef TOMAHAWK_HEADLESS - return value( "scannerpath", QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ).toString(); + return value( "scannerpath", QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ).toStringList(); #else - return value( "scannerpath", "" ).toString(); + return value( "scannerpath", "" ).toStringList(); #endif } void -TomahawkSettings::setScannerPath( const QString& path ) +TomahawkSettings::setScannerPath( const QStringList& path ) { setValue( "scannerpath", path ); } diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h index f7f5e2922..fc1995049 100644 --- a/src/libtomahawk/tomahawksettings.h +++ b/src/libtomahawk/tomahawksettings.h @@ -41,8 +41,8 @@ public: void applyChanges() { emit changed(); } /// General settings - QString scannerPath() const; /// QDesktopServices::MusicLocation by default - void setScannerPath( const QString& path ); + QStringList scannerPath() const; /// QDesktopServices::MusicLocation by default + void setScannerPath( const QStringList& path ); bool hasScannerPath() const; bool acceptedLegalWarning() const; diff --git a/src/musicscanner.cpp b/src/musicscanner.cpp index 220baa1a7..a97171416 100644 --- a/src/musicscanner.cpp +++ b/src/musicscanner.cpp @@ -70,9 +70,9 @@ DirLister::scanDir( QDir dir, int depth ) } -MusicScanner::MusicScanner( const QString& dir, quint32 bs ) +MusicScanner::MusicScanner( const QStringList& dirs, quint32 bs ) : QObject() - , m_dir( dir ) + , m_dirs( dirs ) , m_batchsize( bs ) , m_dirLister( 0 ) , m_dirListerThreadController( 0 ) @@ -122,7 +122,8 @@ MusicScanner::startScan() m_skippedFiles.clear(); // trigger the scan once we've loaded old mtimes for dirs below our path - DatabaseCommand_DirMtimes* cmd = new DatabaseCommand_DirMtimes( m_dir ); + //FIXME: MULTIPLECOLLECTIONDIRS + DatabaseCommand_DirMtimes* cmd = new DatabaseCommand_DirMtimes( m_dirs.first() ); connect( cmd, SIGNAL( done( QMap ) ), SLOT( setMtimes( QMap ) ) ); connect( cmd, SIGNAL( done( QMap ) ), @@ -148,7 +149,9 @@ MusicScanner::scan() SLOT( commitBatch( QVariantList ) ), Qt::DirectConnection ); m_dirListerThreadController = new QThread( this ); - m_dirLister = new DirLister( QDir( m_dir, 0 ), m_dirmtimes ); + + //FIXME: MULTIPLECOLLECTIONDIRS + m_dirLister = new DirLister( QDir( m_dirs.first(), 0 ), m_dirmtimes ); m_dirLister->moveToThread( m_dirListerThreadController ); connect( m_dirLister, SIGNAL( fileToScan( QFileInfo ) ), diff --git a/src/musicscanner.h b/src/musicscanner.h index 8fbca2739..c4fc5bb5b 100644 --- a/src/musicscanner.h +++ b/src/musicscanner.h @@ -69,7 +69,7 @@ class MusicScanner : public QObject Q_OBJECT public: - MusicScanner( const QString& dir, quint32 bs = 0 ); + MusicScanner( const QStringList& dirs, quint32 bs = 0 ); ~MusicScanner(); signals: @@ -92,7 +92,7 @@ private slots: void commitBatch( const QVariantList& ); private: - QString m_dir; + QStringList m_dirs; QMap m_ext2mime; // eg: mp3 -> audio/mpeg unsigned int m_scanned; unsigned int m_skipped; diff --git a/src/scanmanager.cpp b/src/scanmanager.cpp index ebbe0eabb..017dc8171 100644 --- a/src/scanmanager.cpp +++ b/src/scanmanager.cpp @@ -89,9 +89,10 @@ ScanManager::onSettingsChanged() void -ScanManager::runManualScan( const QString& path ) +ScanManager::runManualScan( const QStringList& path ) { qDebug() << Q_FUNC_INFO; + if ( !m_musicScannerThreadController && !m_scanner ) //still running if these are not zero { m_musicScannerThreadController = new QThread( this ); diff --git a/src/scanmanager.h b/src/scanmanager.h index 0a115b444..a20d9990f 100644 --- a/src/scanmanager.h +++ b/src/scanmanager.h @@ -20,6 +20,7 @@ #define SCANMANAGER_H #include +#include #include "dllmacro.h" @@ -36,7 +37,7 @@ public: explicit ScanManager( QObject* parent = 0 ); virtual ~ScanManager(); - void runManualScan( const QString& path ); + void runManualScan( const QStringList& path ); signals: void finished(); @@ -53,7 +54,7 @@ private: MusicScanner* m_scanner; QThread* m_musicScannerThreadController; - QString m_currScannerPath; + QStringList m_currScannerPath; }; #endif diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 8baadd6e9..bafcb3ba3 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -86,7 +86,8 @@ SettingsDialog::SettingsDialog( QWidget *parent ) } // MUSIC SCANNER - ui->lineEditMusicPath->setText( s->scannerPath() ); + //FIXME: MULTIPLECOLLECTIONDIRS + ui->lineEditMusicPath->setText( s->scannerPath().first() ); // LAST FM ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() ); @@ -133,7 +134,7 @@ SettingsDialog::~SettingsDialog() s->setExternalHostname( ui->staticHostName->text() ); s->setExternalPort( ui->staticPort->value() ); - s->setScannerPath( ui->lineEditMusicPath->text() ); + s->setScannerPath( QStringList( ui->lineEditMusicPath->text() ) ); s->setScrobblingEnabled( ui->checkBoxEnableLastfm->isChecked() ); s->setLastFmUsername( ui->lineEditLastfmUsername->text() );