Merge lp:~michihenning/thumbnailer/snap into lp:thumbnailer/devel

[Michi Henning]

Adjust paths when running in a snap. Decision whether to adjust paths is now made at compile time. Also consolidated all the environment variable accesses into an EnvVar helper class.
Added home interface to service and admin tool for the time being. This allows local thumbnailing to work (but the apparmor credentials check is currently not doing the right thing).
videos don't thumbnail yet because we are not bundling the gstreamer codecs, I suspect.

Adjust paths when running in a snap.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:373
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/22/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1577
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1584
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1362
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1362/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/22/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:374
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/23/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1578
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1585
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1363
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1363/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/23/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:375
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1579
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1586
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1364/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1364/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1364/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1364/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1364/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1364
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1364/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/24/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/thumbnailer/snap]

376. By Michi Henning on 2017-02-01

Added home interface to enable thumbnailing local files.
Also add this to the thumbnailer-admin command, because it is a royal
pain not to be able to use it for local media files.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:376
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/25/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1580
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1587
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1365/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1365/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1365/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1365/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1365/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1365
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1365/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/25/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

I've noted a few small issues as inline comments.

review: Needs Fixing

[lp:~michihenning/thumbnailer/snap]

377. By Michi Henning on 2017-02-03

Review comments from James.

[Michi Henning (michihenning)]

Thanks for that! I think I've addressed all the issues. Tests pass for normal and -DSNAP_BUILD.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:377
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/26/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1593
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1600
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1378/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1378/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1378/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1378/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1378/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1378
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1378/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/26/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks close enough. I expected you to call the cmake option SNAP_BUILD, since that's the variable you were already using (and setting in snapcraft.yaml). That can be addressed with a future MP though.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-16 05:12:01 +0000
+++ CMakeLists.txt	2017-02-03 07:36:24 +0000
@@ -47,6 +47,11 @@
 
 add_definitions(-DQT_NO_KEYWORDS)
 
+option(SnapBuild "Build for snap release")
+if(${SnapBuild} OR "${SNAP_BUILD}")
+    add_definitions(-DSNAP_BUILD=1)
+endif()
+
 include(GNUInstallDirs)
 
 # libthumbnailer-qt version

=== modified file 'doc/libthumbnailer-qt/examples/qt_example_test.cpp'
--- doc/libthumbnailer-qt/examples/qt_example_test.cpp	2017-01-17 04:13:01 +0000
+++ doc/libthumbnailer-qt/examples/qt_example_test.cpp	2017-02-03 07:36:24 +0000
@@ -146,7 +146,7 @@
         setenv("XDG_CACHE_HOME", (tempdir->path() + "/cache").toUtf8().data(), true);
 
         // set 3 seconds as max idle time
-        setenv(unity::thumbnailer::internal::MAX_IDLE, "1000", true);
+        setenv(unity::thumbnailer::internal::EnvVars::MAX_IDLE, "1000", true);
 
         dbus_.reset(new DBusServer());
     }
@@ -155,7 +155,7 @@
     {
         dbus_.reset();
 
-        unsetenv(unity::thumbnailer::internal::MAX_IDLE);
+        unsetenv(unity::thumbnailer::internal::EnvVars::MAX_IDLE);
         unsetenv("XDG_CACHE_HOME");
         tempdir.reset();
     }
@@ -192,7 +192,7 @@
     QCoreApplication app(argc, argv);
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(unity::thumbnailer::internal::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(unity::thumbnailer::internal::EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'include/internal/env_vars.h'
--- include/internal/env_vars.h	2015-12-14 04:43:11 +0000
+++ include/internal/env_vars.h	2017-02-03 07:36:24 +0000
@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include <map>
-#include <string>
+#include <internal/config.h>
+
+#include <QString>
 
 namespace unity
 {
@@ -30,10 +31,25 @@
 namespace internal
 {
 
-constexpr char const* MAX_IDLE = "THUMBNAILER_MAX_IDLE";
-constexpr char const* UBUNTU_SERVER_URL = "THUMBNAILER_UBUNTU_SERVER_URL";
-constexpr char const* UTIL_DIR = "THUMBNAILER_UTIL_DIR";
-constexpr char const* LOG_LEVEL = "THUMBNAILER_LOG_LEVEL";
+struct EnvVars
+{
+    static int get_max_idle();
+    static QString get_ubuntu_server_url();
+    static QString get_util_dir();
+    static int get_log_level();
+    static std::string get_cache_dir();
+
+    static constexpr char const* MAX_IDLE = "THUMBNAILER_MAX_IDLE";
+    static constexpr int DFLT_MAX_IDLE = 30000;
+
+    static constexpr char const* UBUNTU_SERVER_URL = "THUMBNAILER_UBUNTU_SERVER_URL";
+    static constexpr char const* DFLT_UBUNTU_SERVER_URL = "https://dash.ubuntu.com";
+
+    static constexpr char const* UTIL_DIR = "THUMBNAILER_UTIL_DIR";
+    static constexpr char const* DFLT_UTIL_DIR = SHARE_PRIV_ABS;
+
+    static constexpr char const* LOG_LEVEL = "THUMBNAILER_LOG_LEVEL";
+};
 
 }  // namespace internal
 

=== modified file 'man/thumbnailer-service.1'
--- man/thumbnailer-service.1	2016-04-07 01:18:31 +0000
+++ man/thumbnailer-service.1	2017-02-03 07:36:24 +0000
@@ -55,7 +55,7 @@
 .B THUMBNAILER_UTIL_DIR
 The directory in which to look for the \fBvs\-thumb\fP executable, which is used
 to extract images from streaming media. If not set, the program is expected to be in
-\fB/usr/lib/\fP\fI<arch>\fP\fB/thumbnailer\fP.
+\fB$/usr/lib/\fP\fI<arch>\fP\fB/thumbnailer\fP.
 .TP
 .B THUMBNAILER_MAX_IDLE
 The service exits once it has been idle for the number of milliseconds specified by this variable. If not set,

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-01-30 03:00:30 +0000
+++ snapcraft.yaml	2017-02-03 07:36:24 +0000
@@ -44,6 +44,7 @@
       # See https://bugs.launchpad.net/snappy/+bug/1600154
       # For now, the service uses default settings because it's gsettings lookups fail.
       - gsettings
+      - home
     slots:
       - thumbnailer
   thumbnailer-admin:
@@ -51,10 +52,13 @@
     plugs:
       - platform
       - thumbnails
+      - home
 
 parts:
   thumbnailer:
     plugin: cmake
+    configflags:
+      - -DSNAP_BUILD=1
     source: .
     after:
       - desktop-ubuntu-app-platform

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-14 23:42:00 +0000
+++ src/CMakeLists.txt	2017-02-03 07:36:24 +0000
@@ -18,6 +18,7 @@
     artdownloader.cpp
     backoff_adjuster.cpp
     check_access.cpp
+    env_vars.cpp
     file_io.cpp
     file_lock.cpp
     image.cpp

=== added file 'src/env_vars.cpp'
--- src/env_vars.cpp	1970-01-01 00:00:00 +0000
+++ src/env_vars.cpp	2017-02-03 07:36:24 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#include <internal/env_vars.h>
+
+#include <internal/config.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include <glib.h>
+#pragma GCC diagnostic pop
+#include <QDebug>
+#include <sstream>
+
+using namespace std;
+
+namespace unity
+{
+
+namespace thumbnailer
+{
+
+namespace internal
+{
+
+int EnvVars::get_max_idle()
+{
+    char const* c_idle_time = getenv(MAX_IDLE);
+    if (c_idle_time)
+    {
+        std::string str_idle_time(c_idle_time);
+        try
+        {
+            int env_value = std::stoi(str_idle_time);
+            if (env_value < 1000)
+            {
+                std::ostringstream s;
+                s << "Value for env variable THUMBNAILER_MAX_IDLE \"" << env_value << "\" must be >= 1000.";
+                throw std::invalid_argument(s.str());
+            }
+            return env_value;
+        }
+        catch (std::exception& e)
+        {
+            std::ostringstream s;
+            s << "Value for env variable THUMBNAILER_MAX_IDLE \"" << str_idle_time << "\" must be >= 1000.";
+            throw std::invalid_argument(s.str());
+        }
+    }
+    return DFLT_MAX_IDLE;
+}
+
+QString EnvVars::get_ubuntu_server_url()
+{
+    char const* override_url = getenv(UBUNTU_SERVER_URL);
+    if (override_url && *override_url)
+    {
+        return override_url;
+    }
+    return DFLT_UBUNTU_SERVER_URL;
+}
+
+QString EnvVars::get_util_dir()
+{
+    char const* utildir = getenv(UTIL_DIR);
+    if (utildir && *utildir)
+    {
+        return utildir;
+    }
+
+#ifdef SNAP_BUILD
+    char const* snapdir = getenv("SNAP");
+    if (!snapdir || !*snapdir)
+    {
+        throw std::runtime_error("Environment variable SNAP is not set or empty.");
+    }
+    return QString(snapdir) + "/" + SHARE_PRIV_ABS;
+#else
+    return SHARE_PRIV_ABS;
+#endif
+}
+
+int EnvVars::get_log_level()
+{
+    char const* level = getenv(LOG_LEVEL);
+    if (level && *level)
+    {
+        int l;
+        try
+        {
+            l = std::stoi(level);
+        }
+        catch (std::exception const& e)
+        {
+            qCritical() << "Environment variable" << LOG_LEVEL << "has invalid setting:" << level
+                        << "(expected value in range 0..2) - variable ignored";
+            return -1;
+        }
+        if (l < 0 || l > 2)
+        {
+            qCritical() << "Environment variable" << LOG_LEVEL << "has invalid setting:" << level
+                        << "(expected value in range 0..2) - variable ignored";
+            return -1;
+        }
+        return l;
+    }
+    return -1;
+}
+
+string EnvVars::get_cache_dir()
+{
+    string cache_dir = g_get_user_cache_dir();  // Always returns something, even HOME and XDG_CACHE_HOME are not set.
+
+#ifdef SNAP_BUILD
+    // When running in a snap, g_get_user_cache_dir() returns $SNAP_USER_DATA (not shared among snap versions),
+    // but we want $SNAP_USER_COMMON, which is shared. PersistentCache automatically deals with versioning
+    // changes in the database, so reverting to a snap with an earlier DB schema is safe.
+    char const* user_common = getenv("SNAP_USER_COMMON");
+    if (user_common && *user_common)
+    {
+        return user_common;
+    }
+    setenv("SNAP_USER_COMMON", cache_dir.c_str(), 1);
+#endif
+
+    return cache_dir;
+}
+
+}  // namespace internal
+
+}  // namespace thumbnailer
+
+}  // namespace unity

=== modified file 'src/file_io.cpp'
--- src/file_io.cpp	2015-12-02 12:48:12 +0000
+++ src/file_io.cpp	2017-02-03 07:36:24 +0000
@@ -90,7 +90,7 @@
     int fd = mkstemp(&tmp_path[0]);
     if (fd == -1)
     {
-        string s = string("write_file(): mkstemp() failed for " + tmp_path + ": ") + safe_strerror(errno);
+        string s = string("write_file(): cannot create temp file in " + dir.native() + ": ") + safe_strerror(errno);
         throw runtime_error(s);
     }
 

=== modified file 'src/imageextractor.cpp'
--- src/imageextractor.cpp	2016-03-18 22:49:32 +0000
+++ src/imageextractor.cpp	2017-02-03 07:36:24 +0000
@@ -20,7 +20,6 @@
 
 #include <internal/imageextractor.h>
 
-#include <internal/config.h>
 #include <internal/env_vars.h>
 #include <internal/safe_strerror.h>
 
@@ -102,9 +101,7 @@
 {
     // Gstreamer video pipelines are unstable so we need to run an
     // external helper executable.
-    char* utildir = getenv(UTIL_DIR);
-    exe_path_ = utildir ? utildir : SHARE_PRIV_ABS;
-    exe_path_ += QLatin1String("/vs-thumb");
+    exe_path_ = EnvVars::get_util_dir() + "/vs-thumb";
     QUrl in_url = QUrl::fromLocalFile(filename_.c_str());
     QUrl out_url;
     out_url.setScheme("fd");

=== modified file 'src/service/inactivityhandler.cpp'
--- src/service/inactivityhandler.cpp	2015-12-12 02:06:41 +0000
+++ src/service/inactivityhandler.cpp	2017-02-03 07:36:24 +0000
@@ -28,44 +28,6 @@
 #include <sstream>
 #include <string>
 
-const int MAX_INACTIVITY_TIME = 30000;  // max inactivity time before exiting the app, in milliseconds
-
-namespace
-{
-
-int get_env_inactivity_time(int default_value)
-{
-    using namespace unity::thumbnailer::internal;
-
-    char const* c_idle_time = getenv(MAX_IDLE);
-    if (c_idle_time)
-    {
-        std::string str_idle_time(c_idle_time);
-        try
-        {
-            int env_value = std::stoi(str_idle_time);
-            if (env_value < 1000)
-            {
-                std::ostringstream s;
-                s << "InactivityHandler::InactivityHandler(): Value for env variable THUMBNAILER_MAX_IDLE \""
-                  << env_value << "\" must be >= 1000.";
-                throw std::invalid_argument(s.str());
-            }
-            return env_value;
-        }
-        catch (std::exception& e)
-        {
-            std::ostringstream s;
-            s << "InactivityHandler::InactivityHandler(): Value for env variable THUMBNAILER_MAX_IDLE \""
-              << str_idle_time << "\" must be >= 1000.";
-            throw std::invalid_argument(s.str());
-        }
-    }
-    return default_value;
-}
-
-}  // namespace
-
 namespace unity
 {
 
@@ -81,7 +43,7 @@
 {
     assert(timer_func);
     connect(&timer_, &QTimer::timeout, this, &InactivityHandler::timer_expired);
-    timer_.setInterval(get_env_inactivity_time(MAX_INACTIVITY_TIME));
+    timer_.setInterval(internal::EnvVars::get_max_idle());
 }
 
 InactivityHandler::~InactivityHandler()

=== modified file 'src/settings.cpp'
--- src/settings.cpp	2016-01-11 07:33:57 +0000
+++ src/settings.cpp	2017-02-03 07:36:24 +0000
@@ -139,26 +139,9 @@
     using namespace unity::thumbnailer::internal;
 
     int log_level = get_positive_or_zero_int("log-level", LOG_LEVEL_DEFAULT);
-    char const* level = getenv(LOG_LEVEL);
-    if (level && *level)
+    int l = EnvVars::get_log_level();
+    if (l != -1)
     {
-        int l;
-        try
-        {
-            l = std::stoi(level);
-        }
-        catch (std::exception const& e)
-        {
-            qCritical() << "Environment variable" << LOG_LEVEL << "has invalid setting:" << level
-                        << "(expected value in range 0..2) - variable ignored";
-            return log_level;
-        }
-        if (l < 0 || l > 2)
-        {
-            qCritical() << "Environment variable" << LOG_LEVEL << "has invalid setting:" << level
-                        << "(expected value in range 0..2) - variable ignored";
-            return log_level;
-        }
         log_level = l;
     }
     return log_level;

=== modified file 'src/thumbnailer.cpp'
--- src/thumbnailer.cpp	2017-01-30 08:24:44 +0000
+++ src/thumbnailer.cpp	2017-02-03 07:36:24 +0000
@@ -23,6 +23,7 @@
 #include <internal/artreply.h>
 #include <internal/cachehelper.h>
 #include <internal/check_access.h>
+#include <internal/env_vars.h>
 #include <internal/image.h>
 #include <internal/imageextractor.h>
 #include <internal/local_album_art.h>
@@ -744,8 +745,7 @@
 Thumbnailer::Thumbnailer()
     : downloader_(new UbuntuServerDownloader())
 {
-    string xdg_base = g_get_user_cache_dir();  // Always returns something, even HOME and XDG_CACHE_HOME are not set.
-    string cache_dir = xdg_base + "/unity-thumbnailer";
+    string cache_dir = EnvVars::get_cache_dir() + "/unity-thumbnailer";
     make_directories(cache_dir, 0700);
 
     try

=== modified file 'src/ubuntuserverdownloader.cpp'
--- src/ubuntuserverdownloader.cpp	2016-01-05 07:00:49 +0000
+++ src/ubuntuserverdownloader.cpp	2017-02-03 07:36:24 +0000
@@ -99,17 +99,6 @@
     return key;
 }
 
-char const* server_url()
-{
-    char const* server_url = DFLT_SERVER_URL;
-    char const* override_url = getenv(thumbnailer::internal::UBUNTU_SERVER_URL);
-    if (override_url && *override_url)
-    {
-        server_url = override_url;
-    }
-    return server_url;
-}
-
 }  // namespace
 
 class UbuntuServerArtReply : public ArtReply
@@ -279,7 +268,7 @@
                                                             QString const& album,
                                                             chrono::milliseconds timeout)
 {
-    auto url = make_art_url(server_url(), ALBUM_ART_BASE_URL, artist, album, api_key_);
+    auto url = make_art_url(EnvVars::get_ubuntu_server_url(), ALBUM_ART_BASE_URL, artist, album, api_key_);
     return download_url(url, timeout);
 }
 
@@ -287,7 +276,7 @@
                                                              QString const& album,
                                                              chrono::milliseconds timeout)
 {
-    auto url = make_art_url(server_url(), ARTIST_ART_BASE_URL, artist, album, api_key_);
+    auto url = make_art_url(EnvVars::get_ubuntu_server_url(), ARTIST_ART_BASE_URL, artist, album, api_key_);
     return download_url(url, timeout);
 }
 

=== modified file 'tests/dbus/dbus_test.cpp'
--- tests/dbus/dbus_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/dbus/dbus_test.cpp	2017-02-03 07:36:24 +0000
@@ -74,8 +74,8 @@
         tempdir.reset(new QTemporaryDir(TESTBINDIR "/dbus-test.XXXXXX"));
         setenv("XDG_CACHE_HOME", (tempdir->path() + "/cache").toUtf8().data(), true);
 
-        setenv(MAX_IDLE, "1000", true);
-        setenv(LOG_LEVEL, "2", true);  // For coverage
+        setenv(EnvVars::MAX_IDLE, "1000", true);
+        setenv(EnvVars::LOG_LEVEL, "2", true);  // For coverage
 
         dbus_.reset(new DBusServer());
     }
@@ -90,7 +90,7 @@
         dbus_.reset();
         art_server_.reset();
 
-        unsetenv(MAX_IDLE);
+        unsetenv(EnvVars::MAX_IDLE);
         unsetenv("XDG_CACHE_HOME");
         tempdir.reset();
     }
@@ -318,7 +318,7 @@
     QTemporaryDir tempdir(TESTBINDIR "/dbus-test.XXXXXX");
     setenv("XDG_CACHE_HOME", (tempdir.path() + "/cache").toUtf8().data(), true);
 
-    EnvVarGuard ev_guard(MAX_IDLE, "bad_value");
+    EnvVarGuard ev_guard(EnvVars::MAX_IDLE, "bad_value");
     try
     {
         unique_ptr<DBusServer> dbus(new DBusServer());
@@ -341,7 +341,7 @@
     QTemporaryDir tempdir(TESTBINDIR "/dbus-test.XXXXXX");
     setenv("XDG_CACHE_HOME", (tempdir.path() + "/cache").toUtf8().data(), true);
 
-    EnvVarGuard ev_guard(MAX_IDLE, "999");
+    EnvVarGuard ev_guard(EnvVars::MAX_IDLE, "999");
     try
     {
         unique_ptr<DBusServer> dbus(new DBusServer());
@@ -359,7 +359,7 @@
     QTemporaryDir tempdir(TESTBINDIR "/dbus-test.XXXXXX");
     setenv("XDG_CACHE_HOME", (tempdir.path() + "/cache").toUtf8().data(), true);
 
-    EnvVarGuard ev_guard(MAX_IDLE, nullptr);
+    EnvVarGuard ev_guard(EnvVars::MAX_IDLE, nullptr);
     unique_ptr<DBusServer> dbus(new DBusServer());  // For coverage with default timeout.
 }
 
@@ -623,7 +623,7 @@
 
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/download/download_test.cpp'
--- tests/download/download_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/download/download_test.cpp	2017-02-03 07:36:24 +0000
@@ -234,7 +234,7 @@
     QCoreApplication qt_app(argc, argv);
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UBUNTU_SERVER_URL, "http://127.0.0.1", true);
+    setenv(EnvVars::UBUNTU_SERVER_URL, "http://127.0.0.1", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/file_io/file_io_test.cpp'
--- tests/file_io/file_io_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/file_io/file_io_test.cpp	2017-02-03 07:36:24 +0000
@@ -113,7 +113,7 @@
     {
         chmod(dir.c_str(), 0700);
         string msg = e.what();
-        EXPECT_TRUE(boost::starts_with(msg, "write_file(): mkstemp() failed for ")) << msg;
+        EXPECT_TRUE(boost::starts_with(msg, "write_file(): cannot create temp file in ")) << msg;
     }
 
     try

=== modified file 'tests/image-provider/image-provider_test.cpp'
--- tests/image-provider/image-provider_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/image-provider/image-provider_test.cpp	2017-02-03 07:36:24 +0000
@@ -40,7 +40,6 @@
 
 using namespace std;
 using namespace unity::thumbnailer::qml;
-using unity::thumbnailer::internal::UTIL_DIR;
 using unity::thumbnailer::qt::Thumbnailer;
 
 class ProviderTest : public ::testing::Test
@@ -214,7 +213,7 @@
     QGuiApplication app(argc, argv);
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(unity::thumbnailer::internal::EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp'
--- tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp	2017-02-03 07:36:24 +0000
@@ -82,7 +82,7 @@
         tempdir.reset(new QTemporaryDir(TESTBINDIR "/libthumbnailer-qt.XXXXXX"));
         setenv("XDG_CACHE_HOME", (tempdir->path() + "/cache").toUtf8().data(), true);
 
-        setenv(MAX_IDLE, "10000", true);
+        setenv(EnvVars::MAX_IDLE, "10000", true);
 
         dbus_.reset(new DBusServer());
     }
@@ -97,7 +97,7 @@
         dbus_.reset();
         art_server_.reset();
 
-        unsetenv(MAX_IDLE);
+        unsetenv(EnvVars::MAX_IDLE);
         unsetenv("XDG_CACHE_HOME");
         tempdir.reset();
     }
@@ -794,7 +794,7 @@
 
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
 
     // Turn on trace so we get coverage on those parts of the code.
     gobj_ptr<GSettings> gsettings(g_settings_new("com.canonical.Unity.Thumbnailer"));

=== modified file 'tests/qml/qml_test.cpp'
--- tests/qml/qml_test.cpp	2016-09-26 00:30:42 +0000
+++ tests/qml/qml_test.cpp	2017-02-03 07:36:24 +0000
@@ -78,7 +78,7 @@
 
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(unity::thumbnailer::internal::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(unity::thumbnailer::internal::EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
     qmlRegisterSingletonType("testconfig", 1, 0, "Config", make_test_config);
     qmlProtectModule("testconfig", 1);
 

=== modified file 'tests/settings/settings_test.cpp'
--- tests/settings/settings_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/settings/settings_test.cpp	2017-02-03 07:36:24 +0000
@@ -188,7 +188,7 @@
 
 TEST(Settings, log_level_env_override)
 {
-    EnvVarGuard ev_guard(LOG_LEVEL, "0");
+    EnvVarGuard ev_guard(EnvVars::LOG_LEVEL, "0");
 
     Settings settings;
     EXPECT_EQ(0, settings.log_level());
@@ -196,7 +196,7 @@
 
 TEST(Settings, log_level_env_bad_setting)
 {
-    EnvVarGuard ev_guard(LOG_LEVEL, "abc");
+    EnvVarGuard ev_guard(EnvVars::LOG_LEVEL, "abc");
 
     Settings settings;
     EXPECT_EQ(1, settings.log_level());
@@ -204,7 +204,7 @@
 
 TEST(Settings, log_level_out_of_range)
 {
-    EnvVarGuard ev_guard(LOG_LEVEL, "3");
+    EnvVarGuard ev_guard(EnvVars::LOG_LEVEL, "3");
 
     Settings settings;
     EXPECT_EQ(1, settings.log_level());

=== modified file 'tests/slow-vs-thumb/slow-vs-thumb_test.cpp'
--- tests/slow-vs-thumb/slow-vs-thumb_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/slow-vs-thumb/slow-vs-thumb_test.cpp	2017-02-03 07:36:24 +0000
@@ -82,7 +82,7 @@
     QCoreApplication app(argc, argv);
 
     // Run fake vs-thumb that does nothing for 20 seconds.
-    setenv(UTIL_DIR, TESTSRCDIR "/slow-vs-thumb/slow", true);
+    setenv(EnvVars::UTIL_DIR, TESTSRCDIR "/slow-vs-thumb/slow", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/stress/stress_test.cpp'
--- tests/stress/stress_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/stress/stress_test.cpp	2017-02-03 07:36:24 +0000
@@ -163,7 +163,7 @@
         tempdir.reset(new QTemporaryDir(TESTBINDIR "/stress-test.XXXXXX"));
         setenv("XDG_CACHE_HOME", (tempdir->path() + "/cache").toUtf8().data(), true);
 
-        setenv(MAX_IDLE, "30000", true);
+        setenv(EnvVars::MAX_IDLE, "30000", true);
 
         dbus_.reset(new DBusServer());
         thumbnailer_.reset(new unity::thumbnailer::qt::Thumbnailer(dbus_->connection()));
@@ -224,7 +224,7 @@
         dbus_.reset();
         art_server_.reset();
 
-        unsetenv(MAX_IDLE);
+        unsetenv(EnvVars::MAX_IDLE);
         unsetenv("XDG_CACHE_HOME");
         tempdir.reset();
 
@@ -612,8 +612,8 @@
 #endif
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
-    setenv(LOG_LEVEL, "0", true);
+    setenv(EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(EnvVars::LOG_LEVEL, "0", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/thumbnailer-admin/thumbnailer-admin_test.cpp'
--- tests/thumbnailer-admin/thumbnailer-admin_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/thumbnailer-admin/thumbnailer-admin_test.cpp	2017-02-03 07:36:24 +0000
@@ -48,7 +48,7 @@
         ASSERT_NE(-1, chdir(temp_dir().c_str()));
         setenv("XDG_CACHE_HOME", qPrintable(tempdir->path() + "/cache"), true);
 
-        setenv(MAX_IDLE, "3000", true);
+        setenv(EnvVars::MAX_IDLE, "3000", true);
 
         dbus_.reset(new DBusServer());
     }
@@ -62,7 +62,7 @@
     {
         dbus_.reset();
 
-        unsetenv(MAX_IDLE);
+        unsetenv(EnvVars::MAX_IDLE);
         unsetenv("XDG_CACHE_HOME");
         tempdir.reset();
     }
@@ -723,7 +723,7 @@
 {
     QCoreApplication app(argc, argv);
 
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
     setenv("LC_ALL", "C", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();

=== modified file 'tests/thumbnailer/thumbnailer_test.cpp'
--- tests/thumbnailer/thumbnailer_test.cpp	2017-01-17 04:13:01 +0000
+++ tests/thumbnailer/thumbnailer_test.cpp	2017-02-03 07:36:24 +0000
@@ -447,7 +447,7 @@
 TEST_F(ThumbnailerTest, vs_thumb_exec_failure)
 {
     // Cause vs-thumb exec failure.
-    EnvVarGuard ev_guard(UTIL_DIR, "no_such_directory");
+    EnvVarGuard ev_guard(EnvVars::UTIL_DIR, "no_such_directory");
 
     Thumbnailer tn;
 
@@ -468,7 +468,7 @@
 TEST_F(ThumbnailerTest, vs_thumb_exit_1)
 {
     // Run fake vs-thumb that exits with status 1
-    EnvVarGuard ev_guard(UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-1");
+    EnvVarGuard ev_guard(EnvVars::UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-1");
 
     Thumbnailer tn;
 
@@ -489,7 +489,7 @@
 TEST_F(ThumbnailerTest, vs_thumb_exit_2)
 {
     // Run fake vs-thumb that exits with status 2
-    EnvVarGuard ev_guard(UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-2");
+    EnvVarGuard ev_guard(EnvVars::UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-2");
 
     Thumbnailer tn;
 
@@ -510,7 +510,7 @@
 TEST_F(ThumbnailerTest, vs_thumb_exit_99)
 {
     // Run fake vs-thumb that exits with status 99
-    EnvVarGuard ev_guard(UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-99");
+    EnvVarGuard ev_guard(EnvVars::UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-exit-99");
 
     Thumbnailer tn;
 
@@ -531,7 +531,7 @@
 TEST_F(ThumbnailerTest, vs_thumb_crash)
 {
     // Run fake vs-thumb that kills itself with SIGTERM
-    EnvVarGuard ev_guard(UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-crash");
+    EnvVarGuard ev_guard(EnvVars::UTIL_DIR, TESTSRCDIR "/thumbnailer/vs-thumb-crash");
 
     Thumbnailer tn;
 
@@ -1011,7 +1011,7 @@
 TEST_F(RemoteServer, dead_server)
 {
     // Dead server won't reply.
-    EnvVarGuard ev_guard(UBUNTU_SERVER_URL, "http://deadserver.invalid");
+    EnvVarGuard ev_guard(EnvVars::UBUNTU_SERVER_URL, "http://deadserver.invalid");
 
     Thumbnailer tn;
 
@@ -1032,8 +1032,8 @@
     QCoreApplication app(argc, argv);
     setenv("GSETTINGS_BACKEND", "memory", true);
     setenv("GSETTINGS_SCHEMA_DIR", GSETTINGS_SCHEMA_DIR, true);
-    setenv(UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
-    setenv(UBUNTU_SERVER_URL, "http://127.0.0.1", true);
+    setenv(EnvVars::UTIL_DIR, TESTBINDIR "/../src/vs-thumb", true);
+    setenv(EnvVars::UBUNTU_SERVER_URL, "http://127.0.0.1", true);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

=== modified file 'tests/utils/artserver.cpp'
--- tests/utils/artserver.cpp	2016-01-11 08:20:51 +0000
+++ tests/utils/artserver.cpp	2017-02-03 07:36:24 +0000
@@ -79,7 +79,7 @@
     {
         qCritical() << "Failed to terminate fake art server";
     }
-    unsetenv(unity::thumbnailer::internal::UBUNTU_SERVER_URL);
+    unsetenv(unity::thumbnailer::internal::EnvVars::UBUNTU_SERVER_URL);
 }
 
 std::string const& ArtServer::server_url() const
@@ -108,5 +108,5 @@
 
 void ArtServer::update_env()
 {
-    setenv(unity::thumbnailer::internal::UBUNTU_SERVER_URL, server_url().c_str(), true);
+    setenv(unity::thumbnailer::internal::EnvVars::UBUNTU_SERVER_URL, server_url().c_str(), true);
 }