Ubuntu File Manager App

Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-05 into lp:ubuntu-filemanager-app

  1. samba-improvements-05
  2. Merge into trunk
Proposed by Carlos Jose Mazieri
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 478
Merged at revision: 489
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-05
Merge into: lp:ubuntu-filemanager-app
Diff against target: 98 lines (+24/-12)
3 files modified
src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp (+7/-4)
src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp (+15/-6)
src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h (+2/-2)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-05
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Arto Jalkanen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+275164@code.launchpad.net

Commit message

changed SmbUtil::getStat() and SmbUtil::getFstat() to return int as they do not handle items from SmbUtil::StatReturn, they are just a wrapper to libsmbclient stat functions, is SmbUtil::getStatInfo() which does handle SmbUtil::StatReturn

Description of the change

changed SmbUtil::getStat() and SmbUtil::getFstat() to return int as they do not handle items from SmbUtil::StatReturn, they are just a wrapper to libsmbclient stat functions, is SmbUtil::getStatInfo() which does handle SmbUtil::StatReturn

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:478
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/564/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/186

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

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:478
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/14/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/50/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/14/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

getStat()'s return value is always casted to StatReturn, so it would seem to me that it'd be better to have getStat() rturn always StatReturn so that the casting would be in one place and not dispersed around code.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/1/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/4/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/2/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Blast that libsmbclient . . . I'll keep working on it guys! In the interim, I've disabled builds so you can land using the old bot. hopefully tomorrow will find success.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

I'll note, I only disabled the autolanding job, so it will still try and build. you can ignore any failures. Top approving will allow it to land.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp 2015-08-15 18:38:28 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp 2015-10-21 11:04:00 +0000
@@ -232,13 +232,16 @@
232 SmbUtil::StatReturn ret = SmbUtil::StatInvalid;232 SmbUtil::StatReturn ret = SmbUtil::StatInvalid;
233 if (isOpen())233 if (isOpen())
234 { 234 {
235 ret = smbObj()->getFstat(m_context,m_fd, &st);235 ret = static_cast<SmbUtil::StatReturn> (smbObj()->getFstat(m_context,m_fd,&st));
236 }236 }
237 else237 else
238 {238 {
239 SmbLocationItemFile *mySelf = const_cast<SmbLocationItemFile*> (this);239 if (m_context != 0) {
240 mySelf->createContext();240 ret = static_cast<SmbUtil::StatReturn> (smbObj()->getStat(m_context,cleanUrl(),&st));
241 ret = smbObj()->getStat(m_context,cleanUrl(), &st);241 }
242 else {
243 ret = smbObj()->getStatInfo(cleanUrl(),&st);
244 }
242 }245 }
243 if(ret == SmbUtil::StatDone)246 if(ret == SmbUtil::StatDone)
244 {247 {
245248
=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp 2015-10-04 16:02:27 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp 2015-10-21 11:04:00 +0000
@@ -38,11 +38,17 @@
3838
39#if defined(SHOW_MESSAGES)39#if defined(SHOW_MESSAGES)
40# define DBG(more_items) qDebug() << Q_FUNC_INFO more_items40# define DBG(more_items) qDebug() << Q_FUNC_INFO more_items
41# define DBG_STAT(ret) qDebug() << Q_FUNC_INFO \
42 << "return:" << ret \
43 << "mode:" << st->st_mode \
44 << "mtime:" << st->st_mtime \
45 << "size:" << st->st_size
41#else46#else
42#define DBG(none)47#define DBG(none)
48#define DBG_STAT(ret)
43#endif49#endif
4450
45#define SHOW_ERRNO(path) if (errno != 0 && errno != ENOENT) \51#define SHOW_ERRNO(path) if (errno != 0) \
46 { \52 { \
47 qWarning() << Q_FUNC_INFO << "path:" << path << "errno:" << errno << strerror(errno); \53 qWarning() << Q_FUNC_INFO << "path:" << path << "errno:" << errno << strerror(errno); \
48 }54 }
@@ -358,7 +364,7 @@
358 else if (errno != EACCES && errno != ECONNREFUSED) // perhaps is a file364 else if (errno != EACCES && errno != ECONNREFUSED) // perhaps is a file
359 {365 {
360 errno = 0;366 errno = 0;
361 ret = getStat(context, smb_path,st);367 ret = static_cast<SmbUtil::StatReturn> (getStat(context, smb_path,st));
362 }368 }
363369
364 if (errno != 0)370 if (errno != 0)
@@ -740,19 +746,22 @@
740}746}
741747
742748
743SmbUtil::StatReturn749int
744SmbUtil::getFstat(Smb::Context context, Smb::FileHandler fd, struct stat* st)750SmbUtil::getFstat(Smb::Context context, Smb::FileHandler fd, struct stat* st)
745{751{
746 ::memset(st,0,sizeof(struct stat));752 ::memset(st,0,sizeof(struct stat));
747 int ret = ::smbc_getFunctionFstat(context)(context,fd, st);753 int ret = ::smbc_getFunctionFstat(context)(context,fd, st);
748 return static_cast<SmbUtil::StatReturn> (ret);754 DBG_STAT(ret);
755 return ret;
749}756}
750757
751758
752SmbUtil::StatReturn759int
753SmbUtil::getStat(Smb::Context context, const QString& smb_path, struct stat* st)760SmbUtil::getStat(Smb::Context context, const QString& smb_path, struct stat* st)
754{761{
755 ::memset(st,0,sizeof(struct stat));762 ::memset(st,0,sizeof(struct stat));
763 DBG(<< smb_path);
756 int ret = ::smbc_getFunctionStat(context)(context,smb_path.toLocal8Bit().constData(), st);764 int ret = ::smbc_getFunctionStat(context)(context,smb_path.toLocal8Bit().constData(), st);
757 return static_cast<SmbUtil::StatReturn> (ret);765 DBG_STAT(ret);
766 return ret;
758}767}
759768
=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h 2015-07-15 13:00:56 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h 2015-10-21 11:04:00 +0000
@@ -94,8 +94,8 @@
94 bool recursive = false,94 bool recursive = false,
95 QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot,95 QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot,
96 const QStringList& filterNames = QStringList());96 const QStringList& filterNames = QStringList());
97 StatReturn getFstat(Smb::Context context, Smb::FileHandler fd, struct stat* st);97 int getFstat(Smb::Context context, Smb::FileHandler fd, struct stat* st);
98 StatReturn getStat(Smb::Context context, const QString& smb_path, struct stat* st);98 int getStat(Smb::Context context, const QString& smb_path, struct stat* st);
9999
100private: 100private:
101 StatReturn guessDirType(Smb::Context context, Smb::FileHandler fd);101 StatReturn guessDirType(Smb::Context context, Smb::FileHandler fd);

Subscribers

People subscribed via source and target branches