Merge pull request #94 from AppImage/code-style

Code style improvements

Author: azubieta

include/appimage/appimage.h

@@ -85,10 +85,12 @@ int appimage_unregister_in_system(const char *path, bool verbose);
 
 
 #ifdef LIBAPPIMAGE_THUMBNAILER_ENABLED
-/* Create AppImage thumbnail according to
+/*
+ * Create AppImage thumbnail according to
  * https://specifications.freedesktop.org/thumbnail-spec/0.8.0/index.html
+ * Returns true on success, false otherwise.
  */
-void appimage_create_thumbnail(const char* appimage_file_path, bool verbose);
+bool appimage_create_thumbnail(const char* appimage_file_path, bool verbose);
 #endif // LIBAPPIMAGE_THUMBNAILER_ENABLED
 
 #endif // LIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED

src/libappimage/desktop_integration/integrator/Integrator.cpp

@@ -275,19 +275,19 @@ namespace appimage {
             };
 
             Integrator::Integrator(const AppImage& appImage, const bf::path& xdgDataHome)
-                : priv(new Priv(appImage, xdgDataHome)) {}
+                : d(new Priv(appImage, xdgDataHome)) {}
 
             Integrator::~Integrator() = default;
 
             void Integrator::integrate() {
                 // an unedited desktop entry is required to identify the resources to be deployed
-                priv->assertItShouldBeIntegrated();
+                d->assertItShouldBeIntegrated();
 
                 // Must be executed before deployDesktopEntry because it changes the icon names
-                priv->deployIcons();
-                priv->deployDesktopEntry();
-                priv->deployMimeTypePackages();
-                priv->setExecutionPermission();
+                d->deployIcons();
+                d->deployDesktopEntry();
+                d->deployMimeTypePackages();
+                d->setExecutionPermission();
             }
         }
     }

src/libappimage/desktop_integration/integrator/Integrator.h

@@ -44,7 +44,7 @@ namespace appimage {
 
             private:
                 class Priv;
-                std::unique_ptr<Priv> priv;   // opaque pointer
+                std::unique_ptr<Priv> d;   // opaque pointer
             };
         }
 

src/libappimage/libappimage.cpp

@@ -287,12 +287,15 @@ bool appimage_is_registered_in_system(const char* path) {
 /* Create AppImage thumbanil according to
  * https://specifications.freedesktop.org/thumbnail-spec/0.8.0/index.html
  */
-void appimage_create_thumbnail(const char* appimage_file_path, bool verbose) {
+bool appimage_create_thumbnail(const char* appimage_file_path, bool verbose) {
     CATCH_ALL(
         AppImage appImage(appimage_file_path);
         IntegrationManager manager;
         manager.generateThumbnails(appImage);
+        return true;
     );
+
+    return false;
 }
 
 #endif // LIBAPPIMAGE_THUMBNAILER_ENABLED

src/libappimage/utils/IconHandle.cpp

@@ -420,23 +420,23 @@ namespace appimage {
             }
         };
 
-        IconHandle::IconHandle(std::vector<char>& data) : priv(new Priv(data)) {}
+        IconHandle::IconHandle(std::vector<char>& data) : d(new Priv(data)) {}
 
-        int IconHandle::getSize() { return priv->getIconSize(); }
+        int IconHandle::getSize() { return d->getIconSize(); }
 
-        std::string IconHandle::format() { return priv->getImageFormat(); }
+        std::string IconHandle::format() { return d->getImageFormat(); }
 
-        void IconHandle::setSize(int size) { priv->setIconSize(size); }
+        void IconHandle::setSize(int size) { d->setIconSize(size); }
 
         void IconHandle::save(const std::string& path, const std::string& format) {
             bf::path bPath(path);
             try { bf::create_directories(bPath.parent_path()); }
             catch (const bf::filesystem_error&) { throw IconHandleError("Unable to create parent path"); }
 
-            priv->save(bPath, format);
+            d->save(bPath, format);
         }
 
-        IconHandle::IconHandle(const std::string& path) : priv(new Priv(path)) {}
+        IconHandle::IconHandle(const std::string& path) : d(new Priv(path)) {}
 
         IconHandle::~IconHandle() = default;
 

src/libappimage/utils/IconHandle.h

@@ -61,7 +61,7 @@ namespace appimage {
         private:
             class Priv;
 
-            std::unique_ptr<Priv> priv;
+            std::unique_ptr<Priv> d;
         };
 
         class IconHandleError : public std::runtime_error {

tests/libappimage/legacy/test_libappimage.cpp

@@ -560,7 +560,7 @@ TEST_F(LibAppImageTest, test_appimage_shall_not_integrate) {
 #ifdef LIBAPPIMAGE_THUMBNAILER_ENABLED
 
 TEST_F(LibAppImageTest, create_thumbnail_appimage_type_1) {
-    appimage_create_thumbnail(appImage_type_1_file_path.c_str(), false);
+    EXPECT_TRUE(appimage_create_thumbnail(appImage_type_1_file_path.c_str(), false));
 
     gchar* sum = appimage_get_md5(appImage_type_1_file_path.c_str());
 
@@ -579,7 +579,7 @@ TEST_F(LibAppImageTest, create_thumbnail_appimage_type_1) {
 }
 
 TEST_F(LibAppImageTest, create_thumbnail_appimage_type_2) {
-    appimage_create_thumbnail(appImage_type_2_file_path.c_str(), false);
+    EXPECT_TRUE(appimage_create_thumbnail(appImage_type_2_file_path.c_str(), false));
 
     gchar* sum = appimage_get_md5(appImage_type_2_file_path.c_str());