Add multi threading support so the library initialize faster and make…

… the application using it starting quicker.
pasnox · Sep 15, 2012 · 2a3fc79 · 2a3fc79
1 parent 629e219
commit 2a3fc79
Show file tree

Hide file tree

Showing 11 changed files with 653 additions and 485 deletions.
diff --git a/QodeEdit.pro b/QodeEdit.pro
@@ -85,7 +85,9 @@ HEADERS *=  \
     src/syntax/Model.h \
     src/syntax/Highlighter.h \
     src/syntax/ComboBox.h \
-    src/theme/Theme.h
+    src/theme/Theme.h \
+    src/Threading.h \
+    src/Manager.h
 
 SOURCES *=  \
     src/QodeEdit.cpp \
@@ -119,4 +121,6 @@ SOURCES *=  \
     src/syntax/Model.cpp \
     src/syntax/Highlighter.cpp \
     src/syntax/ComboBox.cpp \
-    src/theme/Theme.cpp
+    src/theme/Theme.cpp \
+    src/Threading.cpp \
+    src/Manager.cpp
diff --git a/src/Manager.cpp b/src/Manager.cpp
@@ -0,0 +1,281 @@
+#include "Manager.h"
+#include "QodeEditConfig.h"
+#include "Threading.h"
+#include "Tools.h"
+#include "syntax/Document.h"
+#include "syntax/Model.h"
+#include "syntax/Highlighter.h"
+#include "theme/Theme.h"
+
+#include <QStringList>
+#include <QDir>
+#include <QDesktopServices>
+#include <QMimeDatabase>
+#include <QHash>
+#include <QPointer>
+#include <QFutureWatcher>
+
+class QodeEdit::ManagerData : public QObject {
+    Q_OBJECT
+
+public:
+    QodeEdit::Manager* manager;
+    QString userSharedDataFilePath;
+    QMimeDatabase mimeDatabase;
+    QHash<QString, Syntax::Document> documents;
+    //
+    QPointer<QFutureWatcher<QHash<QString, Syntax::Document> > > syntaxesFilesWatcher;
+    QPointer<QFutureWatcher<QStringList> > schemasFilesWatcher;
+
+    ManagerData( QodeEdit::Manager* _manager )
+        : QObject( _manager ),
+            manager( _manager )
+    {
+    }
+
+    void initialize() {
+        if ( syntaxesFilesWatcher || schemasFilesWatcher ) {
+            return;
+        }
+
+        // update syntaxes
+        syntaxesFilesWatcher = new QFutureWatcher<QHash<QString, Syntax::Document> >( this );
+        connect( syntaxesFilesWatcher, SIGNAL( finished() ), this, SLOT( syntaxesFilesParsed() ) );
+
+        syntaxesFilesWatcher->setFuture( QodeEdit::Threading::parseSyntaxesFiles( manager->syntaxDefinitionFilePaths() ) );
+
+        // update schemas
+        /*schemasFilesWatcher = new QFutureWatcher<QStringList>( this );
+        connect( syntaxesFilesWatcher, SIGNAL( finished() ), this, SLOT( syntaxesFilesParsed() ) );
+        
+        const QFuture<QStringList> future = QodeEdit::Threading::listFilesInPaths( manager->syntaxDefinitionFilePaths(), QStringList( "*.xml" ), true );
+        syntaxesFilesWatcher->setFuture( future );*/
+    }
+
+public slots:
+    void syntaxesFilesParsed() {
+        documents = syntaxesFilesWatcher->future().result();
+        syntaxesFilesWatcher->deleteLater();
+        emit manager->syntaxesUpdated();
+
+        if ( !schemasFilesWatcher ) {
+            emit manager->updated();
+        }
+    }
+
+    void schemasFilesParsed() {
+        /*schemasFilesWatcher = new QFutureWatcher<QStringList>( this );
+        schemasFilesWatcher->deleteLater();
+        emit manager->schemasUpdated();
+        
+        if ( !syntaxesFilesWatcher ) {
+            emit manager->updated();
+        }*/
+    }
+};
+
+QodeEdit::Manager::Manager( QObject* parent )
+    : QObject( parent ),
+        d( new QodeEdit::ManagerData( this ) )
+{
+}
+
+QodeEdit::Manager::~Manager()
+{
+    deinitialize();
+}
+
+void QodeEdit::Manager::initialize()
+{
+    d->initialize();
+}
+
+void QodeEdit::Manager::deinitialize()
+{
+    d->documents.clear();
+}
+
+QString QodeEdit::Manager::userSharedDataFilePath( const QString& extended ) const
+{
+    return d->userSharedDataFilePath.isEmpty()
+        ? QDir::cleanPath( QString( "%1/%2/%3" )
+            .arg( QDesktopServices::storageLocation( QDesktopServices::DataLocation ) )
+            .arg( QString::fromUtf8( PACKAGE_NAME ) )
+            .arg( extended ) )
+        : d->userSharedDataFilePath
+    ;
+}
+
+void QodeEdit::Manager::setUserSharedDataFilePath( const QString& filePath )
+{
+    d->userSharedDataFilePath = filePath;
+}
+
+QString QodeEdit::Manager::userSchemaDefinitionFilePath() const
+{
+    return QodeEdit::Manager::userSharedDataFilePath( "schemas" );
+}
+
+QString QodeEdit::Manager::userSyntaxDefinitionFilePath() const
+{
+    return QodeEdit::Manager::userSharedDataFilePath( "syntax" );
+}
+
+QStringList QodeEdit::Manager::schemaDefinitionFilePaths() const
+{
+    return QStringList()
+        << QodeEdit::Manager::schemaDefinitionFilePath()
+        << QodeEdit::Manager::userSchemaDefinitionFilePath()
+    ;
+}
+
+QStringList QodeEdit::Manager::syntaxDefinitionFilePaths() const
+{
+    return QStringList()
+        << QodeEdit::Manager::syntaxDefinitionFilePath()
+        << QodeEdit::Manager::userSyntaxDefinitionFilePath()
+    ;
+}
+
+QString QodeEdit::Manager::mimeTypeForFile( const QString& fileName ) const
+{
+    return d->mimeDatabase.mimeTypeForFile( fileName ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForFile( const QFileInfo& fileInfo ) const
+{
+    return d->mimeDatabase.mimeTypeForFile( fileInfo ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForData( const QByteArray& data ) const
+{
+    return d->mimeDatabase.mimeTypeForData( data ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForData( QIODevice* device ) const
+{
+    return d->mimeDatabase.mimeTypeForData( device ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForFileNameAndData( const QString& fileName, QIODevice* device ) const
+{
+    return d->mimeDatabase.mimeTypeForFileNameAndData( fileName, device ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForFileNameAndData( const QString& fileName, const QByteArray& data ) const
+{
+    return d->mimeDatabase.mimeTypeForFileNameAndData( fileName, data ).name();
+}
+
+QString QodeEdit::Manager::mimeTypeForUrl( const QUrl& url ) const
+{
+    return d->mimeDatabase.mimeTypeForUrl( url ).name();
+}
+
+QStringList QodeEdit::Manager::mimeTypesForFileName( const QString& fileName ) const
+{
+    const QList<QMimeType> mimeTypes = d->mimeDatabase.mimeTypesForFileName( fileName );
+    QStringList names;
+
+    for ( int i = 0; i < mimeTypes.count(); i++ ) {
+        names << mimeTypes[ i ].name();
+    }
+
+    return names;
+}
+
+QStringList QodeEdit::Manager::availableSyntaxes() const
+{
+    QStringList syntaxes = d->documents.keys();
+    qSort( syntaxes.begin(), syntaxes.end(), QodeEdit::Tools::localeAwareStringLessThan );
+    return syntaxes;
+}
+
+QHash<QString, Syntax::Document> QodeEdit::Manager::availableDocuments() const
+{
+    return d->documents;
+}
+
+Syntax::Document QodeEdit::Manager::document( const QString& name )
+{
+    return d->documents.value( name );
+}
+
+Syntax::Model* QodeEdit::Manager::model( QObject* parent )
+{
+    return new Syntax::Model( this, parent );
+}
+
+Syntax::Highlighter* QodeEdit::Manager::highlighter( const QString& syntaxName, const QString& syntaxThemeName, TextDocument* textDocument ) const
+{
+    Q_UNUSED( syntaxThemeName );
+    #warning update me after having themes factory
+    return new Syntax::Highlighter( d->documents.value( syntaxName ), Theme::Schema(), textDocument );
+}
+
+Syntax::Highlighter* QodeEdit::Manager::highlighterForFilePath( const QString& filePath, TextDocument* textDocument ) const
+{
+    QMap<int, Syntax::Document*> documents;
+
+    foreach ( const QString& name, d->documents.keys() ) {
+        Syntax::Document& document = d->documents[ name ];
+
+        if ( QDir::match( document.extensions().toList(), filePath ) ) {
+            documents[ document.priority() ] = &document;
+        }
+    }
+
+    if ( documents.isEmpty() ) {
+        return 0;
+    }
+
+    return QodeEdit::Manager::highlighter( ( documents.end() -1 ).value()->name(), QString::null, textDocument );
+}
+
+Syntax::Highlighter* QodeEdit::Manager::highlighterForMimeType( const QString& mimeType, TextDocument* textDocument ) const
+{
+    QMap<int, Syntax::Document*> documents;
+
+    foreach ( const QString& name, d->documents.keys() ) {
+        Syntax::Document& document = d->documents[ name ];
+
+        if ( document.mimeType().contains( mimeType ) ) {
+            documents[ document.priority() ] = &document;
+        }
+    }
+
+    if ( documents.isEmpty() ) {
+        return 0;
+    }
+
+    return QodeEdit::Manager::highlighter( ( documents.end() -1 ).value()->name(), QString::null, textDocument );
+}
+
+const char* QodeEdit::Manager::version()
+{
+    return PACKAGE_VERSION;
+}
+
+QString QodeEdit::Manager::versionString()
+{
+    return PACKAGE_VERSION;
+}
+
+QString QodeEdit::Manager::sharedDataFilePath( const QString& extended )
+{
+    return QDir::cleanPath( QString( "%1/%2" )
+        .arg( QString::fromUtf8( PACKAGE_ABSOLUTE_DATA_DIR ) )
+        .arg( extended ) );
+}
+
+QString QodeEdit::Manager::schemaDefinitionFilePath()
+{
+    return QodeEdit::Manager::sharedDataFilePath( "schemas" );
+}
+
+QString QodeEdit::Manager::syntaxDefinitionFilePath()
+{
+    return QodeEdit::Manager::sharedDataFilePath( "syntax" );
+}
+
+#include "Manager.moc"
diff --git a/src/Manager.h b/src/Manager.h
@@ -0,0 +1,85 @@
+#ifndef MANAGER_H
+#define MANAGER_H
+
+#include <QObject>
+#include <QMetaObject>
+#include <QHash>
+
+class QStringList;
+class QFileInfo;
+class QIODevice;
+class QUrl;
+
+class TextDocument;
+
+namespace Syntax {
+    class Document;
+    class Highlighter;
+    class Model;
+};
+
+namespace QodeEdit {
+
+class ManagerData;
+
+class Manager : public QObject
+{
+    Q_OBJECT
+    friend class QodeEdit::ManagerData;
+
+private:
+    QodeEdit::ManagerData* d;
+
+public:
+    Manager( QObject* parent = 0 );
+    virtual ~Manager();
+
+    void initialize();
+    void deinitialize();
+
+    QString userSharedDataFilePath( const QString& extended = QString::null ) const;
+    void setUserSharedDataFilePath( const QString& filePath );
+
+    QString userSchemaDefinitionFilePath() const;
+    QString userSyntaxDefinitionFilePath() const;
+
+    QStringList schemaDefinitionFilePaths() const;
+    QStringList syntaxDefinitionFilePaths() const;
+
+    QString mimeTypeForFile( const QString& fileName ) const;
+    QString mimeTypeForFile( const QFileInfo& fileInfo ) const;
+    QString mimeTypeForData( const QByteArray& data ) const;
+    QString mimeTypeForData( QIODevice* device ) const;
+    QString mimeTypeForFileNameAndData( const QString& fileName, QIODevice* device ) const;
+    QString mimeTypeForFileNameAndData( const QString& fileName, const QByteArray& data ) const;
+    QString mimeTypeForUrl( const QUrl& url ) const;
+    QStringList mimeTypesForFileName( const QString& fileName ) const;
+
+    QStringList availableSyntaxes() const;
+
+    QHash<QString, Syntax::Document> availableDocuments() const;
+    Syntax::Document document( const QString& name );
+
+    Syntax::Model* model( QObject* parent = 0 );
+
+    Syntax::Highlighter* highlighter( const QString& syntaxName, const QString& syntaxThemeName = QString::null, TextDocument* textDocument = 0 ) const;
+    Syntax::Highlighter* highlighterForFilePath( const QString& filePath, TextDocument* textDocument = 0 ) const;
+    Syntax::Highlighter* highlighterForMimeType( const QString& mimeType, TextDocument* textDocument = 0 ) const;
+
+    static QString sharedDataFilePath( const QString& extended = QString::null );
+    static QString schemaDefinitionFilePath();
+    static QString syntaxDefinitionFilePath();
+
+    static const char* version();
+    static QString versionString();
+
+signals:
+    void syntaxesUpdated();
+    void schemasUpdated();
+    void updated();
+    void error( const QString& message );
+};
+
+}; // QodeEdit
+
+#endif // MANAGER_H