Merge lp:~michihenning/unity-scopes-api/registry-noise into lp:unity-scopes-api

[Michi Henning]

Removed a bunch of noise that was logged by the registry if the scope installation dirs contained unexpected files or files without permission.

Simplified FindFiles.cpp by using boost::filesystem instead of dirent.

Removed a bunch of noise that was logged by the registry if the scope installation dirs contained unexpected files or files without permission.

Simplified FindFiles.cpp by using boost::filesystem instead of dirent.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/534/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/61/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/534/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/539/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/539/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good. We need to make sure it doesn't cause any regression with broken click scopes (such as sbbscope - swiss transport scope). +1

review: Approve

=== modified file 'scoperegistry/FindFiles.cpp'
--- scoperegistry/FindFiles.cpp	2014-11-25 04:35:11 +0000
+++ scoperegistry/FindFiles.cpp	2015-01-20 06:21:41 +0000
@@ -18,19 +18,13 @@
 
 #include "FindFiles.h"
 
-#include <unity/scopes/internal/safe_strerror.h>
 #include <unity/UnityExceptions.h>
-#include <unity/util/ResourcePtr.h>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 #include <map>
 
-#include <dirent.h>
-#include <string.h>
-#include <sys/stat.h>
-
 using namespace std;
 using namespace unity;
 using namespace boost;
@@ -39,44 +33,38 @@
 {
 
 // Return all paths underneath the given dir that are of the given type
-// or are a symbolic link.
+// or are a symbolic link to the given type.
 
 vector<string> find_entries(string const& install_dir, EntryType type)
 {
-    DIR* d = opendir(install_dir.c_str());
-    if (d == NULL)
-    {
-        throw FileException("cannot open scope installation directory \"" + install_dir + "\": "
-                                + scopes::internal::safe_strerror(errno),
-                            errno);
-    }
-    util::ResourcePtr<DIR*, decltype(&closedir)> dir_ptr(d, closedir);  // Clean up automatically
-
     vector<string> entries;
 
-    struct dirent* entry;
-    while ((entry = readdir(dir_ptr.get())) != NULL)
-    {
-        string name = entry->d_name;
-        if (name == "." || name == "..")
-        {
-            continue;   // Ignore current and parent dir
-        }
-        struct stat st;
-        int rc = lstat((install_dir + "/" + name).c_str(), &st);
-        if (rc == -1)
-        {
-            continue;   // We ignore errors, such as a file having been unlinked in the mean time.
-        }
-        if (type == File && !S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
-        {
-            continue;   // Not a regular file or symbolic link
-        }
-        else if (type == Directory && !S_ISDIR(st.st_mode) && !S_ISLNK(st.st_mode))
-        {
-            continue;   // Not a directory or symbolic link
-        }
-        entries.emplace_back(install_dir + "/" + name);
+    if (!filesystem::is_directory(install_dir))
+    {
+        return entries;
+    }
+
+    auto end_it = filesystem::directory_iterator();
+    try
+    {
+        for (filesystem::directory_iterator dir_it(install_dir); dir_it != end_it; ++dir_it)
+        {
+            if (type == File && !filesystem::is_regular_file(*dir_it))
+            {
+                continue;
+            }
+            if (type == Directory && !filesystem::is_directory(*dir_it))
+            {
+                continue;
+            }
+            entries.emplace_back(install_dir + "/" + dir_it->path().filename().native());
+        }
+    }
+    catch (std::exception const&)
+    {
+        // Ignore permission errors and the like.
+        // If a scope installation directory lacks permission, we still get
+        // get an error later, when we try to establish a watch for the install dir.
     }
 
     return entries;

=== modified file 'scoperegistry/ScopesWatcher.cpp'
--- scoperegistry/ScopesWatcher.cpp	2014-12-10 02:05:26 +0000
+++ scoperegistry/ScopesWatcher.cpp	2015-01-20 06:21:41 +0000
@@ -166,7 +166,10 @@
         // Add a watch for this directory (ignore exception if already exists)
         try
         {
-            add_watch(dir);
+            if (filesystem::is_directory(dir))
+            {
+                add_watch(dir);  // Avoid noise if someone drops a file in here
+            }
         }
         catch (unity::LogicException const&) {}