Finish Android assets support

Add support for directories, implement QAbstractFileEngineIterator

FEATURE: 276766

src/plugins/platforms/android/src/qandroidassetsfileenginehandler.cpp

@@ -31,12 +31,73 @@
 #include <QCoreApplication>
 #include <QDateTime>
 
+class AndroidAbstractFileEngineIterator: public QAbstractFileEngineIterator
+{
+public:
+    AndroidAbstractFileEngineIterator( QDir::Filters filters, const QStringList & nameFilters, AAssetDir* asset, const QString & path ):
+        QAbstractFileEngineIterator(filters, nameFilters )
+    {
+        AAssetDir_rewind(asset);
+        const char * fileName;
+        while((fileName=AAssetDir_getNextFileName(asset)))
+            m_items<<fileName;
+        m_index = -1;
+        m_path = path;
+    }
+
+    virtual QFileInfo currentFileInfo() const
+    {
+        return QFileInfo(QFile(currentFilePath()));
+    }
+
+    virtual QString currentFileName() const
+    {
+        if (m_index < 0 || m_index >= m_items.size())
+            return QString();
+        return m_items[m_index];
+    }
+
+    virtual QString currentFilePath() const
+    {
+        return m_path+currentFileName();
+    }
+
+    virtual bool hasNext() const
+    {
+        return m_items.size()&&(m_index<m_items.size()-1);
+    }
+
+    virtual QString next()
+    {
+        if (!hasNext())
+            return QString();
+        m_index++;
+        return currentFileName();
+    }
+
+private:
+    QString     m_path;
+    QStringList m_items;
+    int         m_index;
+};
+
 class AndroidAbstractFileEngine : public QAbstractFileEngine
 {
 public:
-    AndroidAbstractFileEngine(AAsset* asset)
+    explicit AndroidAbstractFileEngine(AAsset* asset, const QString & fileName)
+    {
+        m_assetDir = 0;
+        m_assetFile = asset;
+        m_fileName =  fileName;
+    }
+
+    explicit AndroidAbstractFileEngine(AAssetDir* asset, const QString & fileName)
     {
-        m_asset = asset;
+        m_assetFile = 0;
+        m_assetDir = asset;
+        m_fileName =  fileName;
+        if (!m_fileName.endsWith(QChar(QLatin1Char('/'))))
+            m_fileName+="/";
     }
 
     ~AndroidAbstractFileEngine()
@@ -46,17 +107,23 @@ public:
 
     virtual bool open(QIODevice::OpenMode openMode)
     {
-        if (m_asset)
+        if (m_assetFile)
             return openMode&QIODevice::ReadOnly;
         return false;
     }
 
     virtual bool close()
     {
-        if (m_asset)
+        if (m_assetFile)
         {
-            AAsset_close(m_asset);
-            m_asset = 0;
+            AAsset_close(m_assetFile);
+            m_assetFile = 0;
+            return true;
+        }
+        if (m_assetDir)
+        {
+            AAssetDir_close(m_assetDir);
+            m_assetDir = 0;
             return true;
         }
         return false;
@@ -64,29 +131,29 @@ public:
 
     virtual qint64 size() const
     {
-        if (m_asset)
-            return AAsset_getLength(m_asset);
+        if (m_assetFile)
+            return AAsset_getLength(m_assetFile);
         return -1;
     }
 
     virtual qint64 pos() const
     {
-        if (m_asset)
-            return AAsset_seek(m_asset, 0, SEEK_CUR);
+        if (m_assetFile)
+            return AAsset_seek(m_assetFile, 0, SEEK_CUR);
         return -1;
     }
 
     virtual bool seek(qint64 pos)
     {
-        if (m_asset)
-            return pos==AAsset_seek(m_asset, pos, SEEK_SET);
+        if (m_assetFile)
+            return pos==AAsset_seek(m_assetFile, pos, SEEK_SET);
         return false;
     }
 
     virtual qint64 read(char *data, qint64 maxlen)
     {
-        if (m_asset)
-            return AAsset_read(m_asset, data, maxlen);
+        if (m_assetFile)
+            return AAsset_read(m_assetFile, data, maxlen);
         return -1;
     }
 
@@ -105,10 +172,64 @@ public:
         return false;
     }
 
+    virtual FileFlags fileFlags(FileFlags type=FileInfoAll) const
+    {
+        FileFlags flags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
+        if (m_assetFile)
+            flags|=FileType;
+        if(m_assetDir)
+            flags|=DirectoryType;
+        return type&flags;
+    }
+
+    virtual QString fileName(FileName file=DefaultName) const
+    {
+        int pos;
+        switch(file)
+        {
+        case DefaultName:
+        case AbsoluteName:
+        case CanonicalName:
+                return m_fileName;
+        case BaseName:
+            if((pos=m_fileName.lastIndexOf(QChar(QLatin1Char('/'))))!=-1)
+                return m_fileName.mid(pos);
+            else
+                return m_fileName;
+        case PathName:
+        case AbsolutePathName:
+        case CanonicalPathName:
+            if((pos=m_fileName.lastIndexOf(QChar(QLatin1Char('/'))))!=-1)
+                return m_fileName.left(pos);
+            else
+                return m_fileName;
+        default:
+            return QString();
+        }
+    }
+
+    virtual void setFileName(const QString &file)
+    {
+        if ( file == m_fileName )
+            return;
+        m_fileName = file;
+        close();
+    }
+
+    virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames)
+    {
+        if (m_assetDir)
+            return new AndroidAbstractFileEngineIterator(filters, filterNames, m_assetDir, m_fileName);
+        return 0;
+    }
+
 private:
-    AAsset* m_asset;
+    AAsset* m_assetFile;
+    AAssetDir* m_assetDir;
+    QString m_fileName;
 };
 
+
 AndroidAssetsFileEngineHandler::AndroidAssetsFileEngineHandler()
 {
     m_assetManager = QtAndroid::assetManager();
@@ -130,6 +251,24 @@ QAbstractFileEngine * AndroidAssetsFileEngineHandler::create ( const QString & f
     else
         asset=AAssetManager_open(m_assetManager, fileName.toUtf8().constData(), AASSET_MODE_BUFFER);
     if (asset)
-        return new AndroidAbstractFileEngine(asset);
+        return new AndroidAbstractFileEngine(asset, fileName);
+
+    if (!fileName.endsWith(QChar(QLatin1Char('/'))))
+        return 0;
+    QString dirName;
+    if (fileName[0]==QChar(QLatin1Char('/')))
+        dirName = fileName.mid(1, fileName.size()-2);
+    else
+        dirName = fileName.left(fileName.size()-1);
+
+    AAssetDir* assetDir;
+    assetDir=AAssetManager_openDir(m_assetManager, dirName.toUtf8().constData());
+    if (assetDir)
+    {
+        if (AAssetDir_getNextFileName(assetDir))
+            return new AndroidAbstractFileEngine(assetDir, fileName);
+        else
+            AAssetDir_close(assetDir);
+    }
     return 0;
 }