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

[Carlos Jose Mazieri]

Removed static_cast from SmbLocationItemFile::size()
Fixed SmbUtil::getStatInfo() to set "Not exist" for items such as smb://host_does_not_exist

Removed static_cast from SmbLocationItemFile::size() when using SmbUtil::getStat() and SmbUtil::getFstat() as stated in https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-05/+merge/275164

Fixed SmbUtil::getStatInfo() to set "Not exist" for items such as smb://host_does_not_exist

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:493
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/30/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/99/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:493
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/572/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/194

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp	2015-10-28 01:07:56 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp	2015-11-02 20:41:45 +0000
@@ -229,21 +229,13 @@
 {
     qint64 size = 0;
     struct stat  st;
-    SmbUtil::StatReturn  ret  = SmbUtil::StatInvalid;
-    if (isOpen())
-    {       
-        ret = static_cast<SmbUtil::StatReturn> (smbObj()->getFstat(m_context,m_fd,&st));
-    }
-    else
+    bool ok = isOpen() ? smbObj()->getFstat(m_context,m_fd,&st) == 0 : false;
+    if (!isOpen())
     {
-        if (m_context != 0) {
-            ret = static_cast<SmbUtil::StatReturn> (smbObj()->getStat(m_context,cleanUrl(),&st));
-        }
-        else {
-            ret = smbObj()->getStatInfo(cleanUrl(),&st);
-        }
+        ok = m_context != 0 ? smbObj()->getStat(m_context,cleanUrl(),&st) == 0 :
+                              smbObj()->getStatInfo(cleanUrl(),&st) == SmbUtil::StatDone;
     }
-    if(ret == SmbUtil::StatDone)
+    if(ok)
     {
         size = static_cast<qint64> (st.st_size);
     }

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-10-28 01:23:07 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-11-02 20:41:45 +0000
@@ -361,7 +361,7 @@
             (void)getStat(context,smb_path,st);
         }
     }
-    else if (errno != EACCES && errno != ECONNREFUSED) // perhaps is a file
+    else if (errno != EACCES && errno != ECONNREFUSED && slashes >= URL_SLASHES_NUMBER_FOR_SHARES) // perhaps is a file
     {
         errno = 0;
         ret = static_cast<SmbUtil::StatReturn> (getStat(context, smb_path,st));