From 9f20e5829d67f594f605fadb29fc7bbb2f8c002a Mon Sep 17 00:00:00 2001
From: Alexis Lopez Zubieta <azubieta90@gmail.com>
Date: Mon, 5 Nov 2018 21:26:48 -0600
Subject: [PATCH] Restructure the code in order to make it more clear

---
 src/core.cpp | 82 ++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 44 deletions(-)

diff --git a/src/core.cpp b/src/core.cpp
index 7d9f532..bdb2fa1 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -11,71 +11,65 @@ using namespace linuxdeploy::core::log;
 namespace bf = boost::filesystem;
 
 namespace linuxdeploy {
+    class DeployError : public std::runtime_error {
+    public:
+        explicit DeployError(const std::string& what) : std::runtime_error(what) {};
+    };
+
     /**
-     * Resolved the 'MAIN' desktop file from all the available.
+     * Resolve the 'MAIN' desktop file from all the available.
      *
      * @param desktopFilePaths
      * @param deployedDesktopFiles
      * @return the MAIN DesktopFile
-     * @throw std::runtime_error in case of error
+     * @throw DeployError in case of 'deployed desktop file not found'
      */
     desktopfile::DesktopFile getMainDesktopFile(const std::vector<std::string>& desktopFilePaths,
                                                 const std::vector<desktopfile::DesktopFile>& deployedDesktopFiles) {
-        desktopfile::DesktopFile desktopFile;
-
-        if (deployedDesktopFiles.empty()) {
-            ldLog() << LD_WARNING
-                    << "Could not find desktop file in AppDir, cannot create links for AppRun, desktop file and icon in AppDir root"
-                    << std::endl;
-            throw std::runtime_error("Can't find desktop files in AppDir.");
-        } else {
-            if (!desktopFilePaths.empty()) {
-                auto firstDeployedDesktopFileName = boost::filesystem::path(
-                    desktopFilePaths.front()).filename().string();
-
-                auto desktopFileMatchingName = find_if(
-                    deployedDesktopFiles.begin(),
-                    deployedDesktopFiles.end(),
-                    [&firstDeployedDesktopFileName](const desktopfile::DesktopFile& desktopFile) {
-                        auto fileName = desktopFile.path().filename().string();
-                        return fileName == firstDeployedDesktopFileName;
-                    }
-                );
-
-                if (desktopFileMatchingName != deployedDesktopFiles.end()) {
-                    desktopFile = *desktopFileMatchingName;
-                } else {
-                    ldLog() << LD_ERROR << "Could not find desktop file deployed earlier any more:"
-                            << firstDeployedDesktopFileName << std::endl;
-                    throw std::runtime_error("Old desktop file is not reachable.");
-                }
-            } else {
-                desktopFile = deployedDesktopFiles[0];
-                ldLog() << LD_WARNING << "No desktop file specified, using first desktop file found:"
-                        << desktopFile.path() << std::endl;
-            }
-
+        if (desktopFilePaths.empty()) {
+            ldLog() << LD_WARNING << "No desktop file specified, using first desktop file found:"
+                    << deployedDesktopFiles[0].path() << std::endl;
+            return deployedDesktopFiles[0];
+        }
+
+        auto firstDeployedDesktopFileName = boost::filesystem::path(
+            desktopFilePaths.front()).filename().string();
+
+        auto desktopFileMatchingName = find_if(
+            deployedDesktopFiles.begin(),
+            deployedDesktopFiles.end(),
+            [&firstDeployedDesktopFileName](const desktopfile::DesktopFile& desktopFile) {
+                auto fileName = desktopFile.path().filename().string();
+                return fileName == firstDeployedDesktopFileName;
+            }
+        );
+
+        if (desktopFileMatchingName != deployedDesktopFiles.end()) {
+            return  *desktopFileMatchingName;
+        } else {
+            ldLog() << LD_ERROR << "Could not find desktop file deployed earlier any more:"
+                    << firstDeployedDesktopFileName << std::endl;
+            throw DeployError("Old desktop file is not reachable.");
         }
-        return desktopFile;
     }
 
     bool deployAppDirRootFiles(std::vector<std::string> desktopFilePaths,
                                std::string customAppRunPath, appdir::AppDir& appDir) {
-        // search for desktop file and deploy it to AppDir root
         ldLog() << std::endl << "-- Deploying files into AppDir root directory --" << std::endl;
 
         auto deployedDesktopFiles = appDir.deployedDesktopFiles();
+        if (deployedDesktopFiles.empty()) {
+            ldLog() << LD_WARNING << "Could not find desktop file in AppDir, cannot create links for AppRun, "
+                                     "desktop file and icon in AppDir root" << std::endl;
+            return true;
+        }
 
         try {
             desktopfile::DesktopFile desktopFile = getMainDesktopFile(desktopFilePaths, deployedDesktopFiles);
             ldLog() << "Deploying desktop file:" << desktopFile.path() << std::endl;
-            if (!appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath))
-                return false;
-
-        } catch (const std::runtime_error& er) {
+            return appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath);
+        } catch (const DeployError& er) {
             return false;
         }
-
-        return true;
     }
 }