[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
The proposal to merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 -- Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Review: Approve continuous-integration -- https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
The proposal to merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 -- Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Review: Needs Fixing continuous-integration FAILED: Autolanding. Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot. https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/23/ Executed test runs: None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1445/console -- https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Review: Approve continuous-integration -- https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
The proposal to merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 -- Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Review: Needs Fixing continuous-integration FAILED: Autolanding. Unapproved changes made after approval. https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/22/ Executed test runs: None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1444/console -- https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
I will fix that, thanks. -- https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
The proposal to merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388 -- Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app. -- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Review: Approve
Some spelling mistakes in comments
Diff comments:
>
> === modified file 'src/plugin/folderlistmodel/locationitemdiriterator.h'
> --- src/plugin/folderlistmodel/locationitemdiriterator.h 2015-03-01
> 15:32:42 +
> +++ src/plugin/folderlistmodel/locationitemdiriterator.h 2015-12-12
> 15:44:23 +
> @@ -29,14 +29,22 @@
> * \brief The LocationItemDirIterator class is an abstract similar to Qt
> QDirIterator
> *
> * Different protocols supported by filemanager (different Locations) must
> provide a class like that.
> + *
> + * The \ref LoadLater can used in the constructor to indicate to the
> constructor to NOT load the path/url, instead \ref load() can called later to
> do that.
> */
>
> class LocationItemDirIterator
> {
> public:
> + enum LoadMode
> + {
> + LoadOnConstructor, //!< loads the entire directory or url in the
> constructor as Qt QDirIterator does
> + LoadLater //!< do NOT load the entire directory or url, \ref
> load() method should be responsabile to do that.
responsabile -> responsible
> + };
> +
> virtual ~LocationItemDirIterator();
> public:
> - virtual bool hasNext() const = 0;
> + virtual bool hasNext() const = 0;
> virtual QString next() = 0;
>
> virtual DirItemInfo fileInfo() const = 0;
> @@ -50,18 +58,43 @@
> * \brief filePath()
> * \return the full pathname of the current item
> */
> - virtual QString filePath() const = 0;
> + virtual QString filePath() const = 0;
>
> /*!
> * \brief path()
> * \return the base directory of the iterator path (not the current item)
> */
> - virtual QString path() const = 0;
> -
> -protected:
> - LocationItemDirIterator(const QString & path, QDirIterator::IteratorFlags
> flags = QDirIterator::NoIteratorFlags);
> - LocationItemDirIterator(const QString & path, QDir::Filters filters,
> QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags);
> - LocationItemDirIterator(const QString & path, const QStringList &
> nameFilters, QDir::Filters filters = QDir::NoFilter,
> QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags);
> + virtual QString path() const;
> +
> + /*!
> +* \brief load() reponsable to load the entire directory or url when
> \ref LoadLater is passed to the constructor
responsable -> responsible
> +*/
> + virtual void load() ;
> +
> + QDir::Filtersfilters() const;
> + QDirIterator::IteratorFlags flags() const;
> +
> +protected:
> + LocationItemDirIterator(const QString & path,
> + QDirIterator::IteratorFlags flags =
> QDirIterator::NoIteratorFlags,
> + LocationItemDirIterator::LoadMode loadmode =
> LocationItemDirIterator::LoadOnConstructor);
> +
> + LocationItemDirIterator(const QString & path,
> + QDir::Filters filters,
> + QDirIterator::IteratorFlags flags =
> QDirIterator::NoIteratorFlags,
> + LocationItemDirIterator::LoadMode loadmode =
> LocationItemDirIterator::LoadOnConstructor);
> +
> + LocationItemDirIterator(const QString & path,
> + const QStringList & nameFilters,
> + QDir::Filters filters = QDir::NoFilter,
> + QDirIterator::IteratorFlags flags =
> QDirIterator::NoIteratorFlags,
> + LocationItemDirIterator::LoadMode loadmode =
> LocationItemDirIterator::LoadOnConstructor);
> +
> +protected:
> + QString m_path;
> + QStringList m_nameFilters;
> + QDir::Filters m_filters;
> + QDirIterator::IteratorFlags m_flags;
> };
>
>
--
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388
Your team Ubuntu File Manager Developers is subscribed to branch
lp:ubuntu-filemanager-app.
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Carlos Jose Mazieri has proposed merging
lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into
lp:ubuntu-filemanager-app with
lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-01 as a
prerequisite.
Commit message:
LocationItemDirIterator descendants classes now perform the loading inside the
constructor according to the new constructor flag
LocationItemDirIterator::LoadMode.
LocationItemDirIterator::LoadLater allows LocationItemDirIterator::load() be
called later, that is how Network Locations should put the loading inside the
secondary thread specific for loading.
For Disk loading, that means in DiskLocationItemDirIterator class it was not
implemented because QDir is used directly inside the secondary thread.
Requested reviews:
Ubuntu File Manager Developers (ubuntu-filemanager-dev)
For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02/+merge/280388
LocationItemDirIterator descendants classes now perform the loading inside the
constructor according to the new constructor flag
LocationItemDirIterator::LoadMode.
LocationItemDirIterator::LoadLater allows LocationItemDirIterator::load() be
called later, that is how Network Locations should put the loading inside the
secondary thread specific for loading.
For Disk loading, that means in DiskLocationItemDirIterator class it was not
implemented because QDir is used directly inside the secondary thread.
--
Your team Ubuntu File Manager Developers is requested to review the proposed
merge of lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02
into lp:ubuntu-filemanager-app.
=== modified file 'src/plugin/folderlistmodel/disk/disklocation.cpp'
--- src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-08 16:55:41 +
+++ src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-12 15:44:23 +
@@ -192,8 +192,10 @@
LocationItemDirIterator *
DiskLocation::newDirIterator(const QString ,
QDir::Filters filters,
- QDirIterator::IteratorFlags flags)
+ QDirIterator::IteratorFlags flags,
+ LocationItemDirIterator::LoadMode loadmode)
{
+Q_UNUSED(loadmode);
return new DiskLocationItemDirIterator(path, filters, flags);
}
=== modified file 'src/plugin/folderlistmodel/disk/disklocation.h'
--- src/plugin/folderlistmodel/disk/disklocation.h 2015-12-08 16:55:41 +
+++ src/plugin/folderlistmodel/disk/disklocation.h 2015-12-12 15:44:23 +
@@ -65,7 +65,8 @@
const bool isRecursive);
virtual LocationItemDirIterator * newDirIterator(const QString & path,
QDir::Filters filters,
- QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags);
+ QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags,
+ LocationItemDirIterator::LoadMode loadmode = LocationItemDirIterator::LoadOnConstructor);
virtual LocationItemFile * newFile(const QString & path);
virtual LocationItemDir* newDir(const QString & dir = QLatin1String(0));
virtual boolisThereDiskSpace(const QString& pathname, qint64 requiredSize);
=== modified file 'src/plugin/folderlistmodel/location.h'
--- src/plugin/folderlistmodel/location.h 2015-12-08 16:55:41 +
+++ src/plugin/folderlistmodel/location.h 2015-12-12 15:44:23 +
@@ -23,6 +23,7 @@
#define LOCATION_H
#include "diriteminfo.h"
+#include "locationitemdiriterator.h"
#include
#include
@@ -124,7 +125,8 @@
*/
virtual LocationItemDirIterator * newDirIterator(const QString & path,
QDir::Filters filters,
- QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags) = 0;
+ QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags,
+ LocationItemDirIterator::LoadMode loadmode = LocationItemDirIterator::LoadOnConstructor) = 0;
/*!
* \brief newFile() creates a LocationItemFile object which is similar to Qt QFile object
*
=== modified file 'src/plugin/folderlistmodel/locationitemdiriterator.cpp'
--- src/plugin/folderlistmodel/locationitemdiriterator.cpp 2015-03-01 15:32:42 +
+++ src/plugin/folderlistmodel/locationitemdiriterator.cpp 2015-12-12 15:44:23 +
@@ -21,19 +21,40 @@
#include "locationitemdiriterator.h"
-LocationItemDirIterator::LocationItemDirIterator(const QString &, const QStringList &, QDir::Filters, QDirIterator::IteratorFlags )
-{
-}
-
-
-LocationItemDirIterator::LocationItemDirIterator(const QString &, QDir::Filters ,
