Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-06 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Samba Listing classes

Introduces classes:
             SmbListWorker which is a IORequest and will build a list of samba items to the model
             SmbLocationDirIterator which is a implementation of Qt QDirIterator class for Samba

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:393
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/478/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2344
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/100

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/478/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

If you can, revert changes to po/com.ubuntu.filemanager.pot

review: Approve

[lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-06]

393. By Carlos Jose Mazieri on 2015-04-29

Introduces classes:
             SmbListWorker which is a IORequest and will build a list of samba items to the model
             SmbLocationDirIterator which is a implementation of Qt QDirIterator class for Samba

[Carlos Jose Mazieri (carlos-mazieri)]

po/com.ubuntu.filemanager.pot reverted

=== modified file 'src/plugin/folderlistmodel/CMakeLists.txt'
--- src/plugin/folderlistmodel/CMakeLists.txt	2015-03-14 17:38:50 +0000
+++ src/plugin/folderlistmodel/CMakeLists.txt	2015-04-29 22:35:22 +0000
@@ -58,11 +58,15 @@
     trash/trashiteminfo.cpp
     trash/trashiteminfo.h
     trash/trashlocation.cpp
-    trash/trashlocation.h          
+    trash/trashlocation.h 
+    smb/smblistworker.cpp
+    smb/smblistworker.h
     smb/qsambaclient/src/smbutil.cpp
     smb/qsambaclient/src/smbutil.h
     smb/qsambaclient/src/smbiteminfo.cpp
     smb/qsambaclient/src/smbiteminfo.h
+    smb/qsambaclient/src/smblocationdiriterator.cpp
+    smb/qsambaclient/src/smblocationdiriterator.h
     smb/qsambaclient/src/smbobject.cpp
     smb/qsambaclient/src/smbobject.h
     net/netauthenticationdata.cpp

=== modified file 'src/plugin/folderlistmodel/iorequest.h'
--- src/plugin/folderlistmodel/iorequest.h	2015-03-01 15:32:42 +0000
+++ src/plugin/folderlistmodel/iorequest.h	2015-04-29 22:35:22 +0000
@@ -48,7 +48,8 @@
     enum RequestType
     {
         DirList,
-        DirListExternalFSChanges
+        DirListExternalFSChanges,
+        SambaList
     };
     virtual void run() = 0;
     RequestType  type() const;

=== added file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp	2015-04-29 22:35:22 +0000
@@ -0,0 +1,136 @@
+/**************************************************************************
+ *
+ * Copyright 2015 Canonical Ltd.
+ * Copyright 2015 Carlos J Mazieri <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File: smblocationdiriterator.cpp
+ * Date: 10/01/2015
+ */
+
+#include "smblocationdiriterator.h"
+#include "smbiteminfo.h"
+#include "smbutil.h"
+
+#define INIT_ATTR(path,smb) SmbObject(path,smb), m_curItem(-1)
+
+#define GOOD_INDEX() (m_curItem >= 0 && m_curItem < m_urlItems.count())
+
+
+SmbLocationDirIterator::SmbLocationDirIterator(const QString &path,
+                                               const QStringList &nameFilters,
+                                               QDir::Filters filters,
+                                               QDirIterator::IteratorFlags flags,
+                                               Const_SmbUtil_Ptr smb)
+        : LocationItemDirIterator(path, nameFilters, filters, flags)
+        , INIT_ATTR(path, smb)
+{
+    bool recursive = flags == QDirIterator::Subdirectories ? true : false;
+    m_urlItems = smbObj()->listContent(path, recursive, filters, nameFilters);
+}
+
+
+SmbLocationDirIterator::SmbLocationDirIterator(const QString &path,
+                                               QDir::Filters filters,
+                                               QDirIterator::IteratorFlags flags,
+                                               Const_SmbUtil_Ptr smb)
+     : LocationItemDirIterator(path,filters,flags)
+     , INIT_ATTR(path, smb)
+{
+    bool recursive = flags == QDirIterator::Subdirectories ? true : false;
+    m_urlItems = smbObj()->listContent(path, recursive, filters);
+}
+
+
+SmbLocationDirIterator::SmbLocationDirIterator(const QString &path,
+                                               QDirIterator::IteratorFlags flags,
+                                               Const_SmbUtil_Ptr smb)
+       : LocationItemDirIterator(path,flags)
+       , INIT_ATTR(path, smb)
+{
+    bool recursive = flags == QDirIterator::Subdirectories ? true : false;
+    m_urlItems = smbObj()->listContent(path, recursive);
+}
+
+
+SmbLocationDirIterator::~SmbLocationDirIterator()
+{
+
+}
+
+
+QString SmbLocationDirIterator::next()
+{
+    QString ret;
+    if (hasNext())
+    {
+        ret = m_urlItems.at(++m_curItem);
+    }
+    return ret;
+}
+
+
+bool SmbLocationDirIterator::hasNext() const
+{
+    return m_urlItems.count() > 0 && m_curItem < (m_urlItems.count() -1);
+}
+
+
+DirItemInfo SmbLocationDirIterator::fileInfo() const
+{
+    if (GOOD_INDEX())
+    {
+        SmbItemInfo  info(m_urlItems.at(m_curItem), m_smb);
+        return info;
+    }
+    return SmbItemInfo();
+}
+
+
+QString SmbLocationDirIterator::fileName() const
+{
+    QString file;
+    if (GOOD_INDEX())
+    {
+        QStringList paths = UrlItemInfo::separatePathFilename(m_urlItems.at(m_curItem));
+        if (paths.count() == 2)
+        {
+            file = paths.at(1);
+        }
+    }
+    return file;
+}
+
+
+QString SmbLocationDirIterator::path() const
+{
+    QString ret;
+    QStringList separated =  UrlItemInfo::separatePathFilename(cleanUrl());
+    if (separated.count() > 0)
+    {
+        ret = separated.at(0);
+    }
+    return ret;
+}
+
+
+QString SmbLocationDirIterator::filePath() const
+{
+    QString fullpathname;
+    if (GOOD_INDEX())
+    {
+        fullpathname = m_urlItems.at(m_curItem);
+    }
+    return fullpathname;
+}

=== added file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h	1970-01-01 00:00:00 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h	2015-04-29 22:35:22 +0000
@@ -0,0 +1,48 @@
+/**************************************************************************
+ *
+ * Copyright 2015 Canonical Ltd.
+ * Copyright 2015 Carlos J Mazieri <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File: smblocationdiriterator.h
+ * Date: 10/01/2015
+ */
+
+#ifndef SMBLOCATIONDIRITERATOR_H
+#define SMBLOCATIONDIRITERATOR_H
+
+#include "locationitemdiriterator.h"
+#include "smbobject.h"
+
+class SmbLocationDirIterator: public LocationItemDirIterator, public SmbObject
+{
+public:
+      ~SmbLocationDirIterator();
+public:
+   virtual DirItemInfo	fileInfo() const;
+   virtual QString	    fileName() const;
+   virtual QString	    filePath() const;
+   virtual bool	        hasNext()  const;
+   virtual QString	    next()          ;
+   virtual QString	    path()     const;
+public:
+   SmbLocationDirIterator(const QString & path, QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags, Const_SmbUtil_Ptr  smb  = 0);
+   SmbLocationDirIterator(const QString & path, QDir::Filters filters, QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags, Const_SmbUtil_Ptr  smb  = 0);
+   SmbLocationDirIterator(const QString & path, const QStringList & nameFilters, QDir::Filters filters = QDir::NoFilter, QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags, Const_SmbUtil_Ptr  smb  = 0);
+private:
+   QStringList  m_urlItems;
+   int          m_curItem;
+};
+
+#endif // SMBLOCATIONDIRITERATOR_H

=== added file 'src/plugin/folderlistmodel/smb/smblistworker.cpp'
--- src/plugin/folderlistmodel/smb/smblistworker.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/folderlistmodel/smb/smblistworker.cpp	2015-04-29 22:35:22 +0000
@@ -0,0 +1,63 @@
+/**************************************************************************
+ *
+ * Copyright 2015 Canonical Ltd.
+ * Copyright 2015 Carlos J Mazieri <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File: smblistworker.cpp
+ * Date: 17/01/2015
+ */
+
+#include "smblistworker.h"
+#include "smblocationdiriterator.h"
+
+SmbListWorker::SmbListWorker(const QString &pathName,
+                             QDir::Filter filter,
+                             const bool isRecursive,
+                             bool parentIsHost,
+                             Const_SmbUtil_Ptr smb)
+   : DirListWorker(pathName, filter, isRecursive)  
+   , SmbObject(pathName, smb)
+   , m_parentIsHost(parentIsHost)
+{
+    mLoaderType =  NetworkLoader;
+}
+
+/*!
+ * \brief SmbListWorker::getNetworkContent() it fills a \ref DirItemInfoList with samba (share/directory) content
+ * \return the list of \ref SmbItemInfo items
+ */
+DirItemInfoList SmbListWorker::getNetworkContent()
+{
+    DirItemInfoList smbContent;
+
+    QDirIterator::IteratorFlags flags = mIsRecursive ?
+                                        QDirIterator::Subdirectories :
+                                        QDirIterator::NoIteratorFlags;
+
+    SmbLocationDirIterator dir(mPathName, mFilter, flags, m_smb);
+    while (dir.hasNext())
+    {
+        QString next = dir.next();
+        SmbItemInfo item (next, m_smb);
+        if (m_parentIsHost)
+        {
+            item.setAsShare();
+        }
+        smbContent.append(item);
+    }
+
+    return smbContent;
+}
+

=== added file 'src/plugin/folderlistmodel/smb/smblistworker.h'
--- src/plugin/folderlistmodel/smb/smblistworker.h	1970-01-01 00:00:00 +0000
+++ src/plugin/folderlistmodel/smb/smblistworker.h	2015-04-29 22:35:22 +0000
@@ -0,0 +1,40 @@
+/**************************************************************************
+ *
+ * Copyright 2015 Canonical Ltd.
+ * Copyright 2015 Carlos J Mazieri <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File: smblistworker.h
+ * Date: 17/01/2015
+ */
+
+#ifndef SMBLISTWORKER_H
+#define SMBLISTWORKER_H
+
+#include "iorequestworker.h"
+#include "smbiteminfo.h"
+
+class SmbListWorker : public DirListWorker, public SmbObject
+{
+    Q_OBJECT
+public:
+    explicit SmbListWorker(const QString &pathName, QDir::Filter filter, const bool isRecursive, bool parentIsHost, Const_SmbUtil_Ptr smb);
+
+private:
+    DirItemInfoList getNetworkContent();
+private:
+    bool               m_parentIsHost;
+};
+
+#endif // SMBLISTWORKER_H