Refactor: Adjust code structure

Author: jinwuwu001

exporter/src/aecommand/AECommand.cpp

@@ -18,7 +18,7 @@
 
 #include "AECommand.h"
 #include "utils/AEHelper.h"
-#include "utils/AEResourceManager.h"
+#include "utils/AEResource.h"
 
 namespace exporter {
 
@@ -30,7 +30,8 @@ AEGP_Command AECommand::PAGPreviewCMD = 0L;
 A_Err AECommand::OnUpdateMenu(AEGP_GlobalRefcon /*globalRefcon*/,
                               AEGP_UpdateMenuRefcon /*menuRefcon*/,
                               AEGP_WindowType /*windowType*/) {
-  A_Err err = A_Err_NONE, err2 = A_Err_NONE;
+  A_Err err = A_Err_NONE;
+  A_Err err2 = A_Err_NONE;
   const auto& suites = AEHelper::GetSuites();
   AEGP_ItemH active_itemH = AEHelper::GetActiveCompositionItem();
   if (active_itemH) {
@@ -42,7 +43,7 @@ A_Err AECommand::OnUpdateMenu(AEGP_GlobalRefcon /*globalRefcon*/,
   }
 
   ERR(suites->CommandSuite1()->AEGP_EnableCommand(PAGConfigCMD));
-  if (AEResourceManager::HasCompositionResource()) {
+  if (exporter::HasCompositionResource()) {
     ERR(suites->CommandSuite1()->AEGP_EnableCommand(PAGPanelCMD));
   } else {
     ERR2(suites->CommandSuite1()->AEGP_DisableCommand(PAGPanelCMD));

exporter/src/main.cpp

@@ -26,10 +26,10 @@
 extern "C" DllExport A_Err EntryPointFunc(struct SPBasicSuite* suite, A_long /*majorVersion*/,
                                           A_long /*minorVersion*/, AEGP_PluginID pluginID,
                                           AEGP_GlobalRefcon* /*globalRefcon*/) {
-  exporter::AEHelper::SetSuitesAndPluginID(suite, pluginID);
+  AEHelper::SetSuitesAndPluginID(suite, pluginID);
   A_Err err = A_Err_NONE;
   A_Err err2 = A_Err_NONE;
-  const auto& suites = exporter::AEHelper::GetSuites();
+  const auto& suites = AEHelper::GetSuites();
 
   // PAG Config...
   ERR(suites->CommandSuite1()->AEGP_GetUniqueCommand(&exporter::AECommand::PAGConfigCMD));

exporter/src/platform/mac/PlatformHelper.mm

@@ -17,6 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 #include "platform/PlatformHelper.h"
 #import <Foundation/Foundation.h>
+namespace exporter {
 std::string GetRoamingPath() {
   NSArray* arr =
       NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
@@ -31,10 +32,15 @@
   NSFileManager* fileManager = [NSFileManager defaultManager];
   NSString* nsPath = [NSString stringWithUTF8String:path.c_str()];
   if (![fileManager fileExistsAtPath:nsPath]) {
-    [fileManager createDirectoryAtPath:nsPath
-           withIntermediateDirectories:YES
-                            attributes:nil
-                                 error:nil];
+    NSError* error = nil;
+    if (![fileManager createDirectoryAtPath:nsPath
+                withIntermediateDirectories:YES
+                                 attributes:nil
+                                      error:&error]) {
+      NSLog(@"Failed to create directory: %@", error);
+      return "";
+    }
   }
   return path;
-}
+}
+}  // namespace exporter

exporter/src/platform/win/PlatformHelper.cpp

@@ -37,10 +37,15 @@ std::string GetRoamingPath() {
   return path + "\\";
 }
 
-void CreateFolder(const std::string& path) {
+bool CreateFolder(const std::string& path) {
   if (!fs::exists(path)) {
-    fs::create_directories(path);
+    std::error_code errorCode;
+    if (!fs::create_directories(path, errorCode)) {
+      printf("Create %s failed: %s\n", path.c_str(), errorCode.message().c_str());
+      return false;
+    }
   }
+  return true;
 }
 
 std::string GetConfigPath() {
@@ -50,7 +55,9 @@ std::string GetConfigPath() {
   }
 
   path += "PAGExporter\\";
-  CreateFolder(path);
+  if (!CreateFolder(path)) {
+    return "";
+  }
   return path;
 }
 

exporter/src/utils/AEHelper.cpp

@@ -18,17 +18,17 @@
 
 #include "AEHelper.h"
 
-namespace exporter {
+namespace AEHelper {
 
-AEGP_PluginID AEHelper::PluginID = 0L;
-std::shared_ptr<AEGP_SuiteHandler> AEHelper::Suites = nullptr;
+AEGP_PluginID PluginID = 0L;
+std::shared_ptr<AEGP_SuiteHandler> Suites = nullptr;
 
-void AEHelper::SetSuitesAndPluginID(SPBasicSuite* basicSuite, AEGP_PluginID id) {
-  Suites = std::make_unique<AEGP_SuiteHandler>(basicSuite);
+void SetSuitesAndPluginID(SPBasicSuite* basicSuite, AEGP_PluginID id) {
+  Suites = std::make_shared<AEGP_SuiteHandler>(basicSuite);
   PluginID = id;
 }
 
-AEGP_ItemH AEHelper::GetActiveCompositionItem() {
+AEGP_ItemH GetActiveCompositionItem() {
   const auto& suites = GetSuites();
   AEGP_ItemH activeItemH = nullptr;
   suites->ItemSuite6()->AEGP_GetActiveItem(&activeItemH);
@@ -48,4 +48,12 @@ AEGP_ItemH AEHelper::GetActiveCompositionItem() {
   return activeItemH;
 }
 
-}  // namespace exporter
+AEGP_PluginID GetPluginID() {
+  return PluginID;
+}
+
+std::shared_ptr<AEGP_SuiteHandler> GetSuites() {
+  return Suites;
+}
+
+}  // namespace AEHelper

exporter/src/utils/AEHelper.h

@@ -22,21 +22,14 @@
 #include "AEGP_SuiteHandler.h"
 #include "AE_GeneralPlug.h"
 
-namespace exporter {
+namespace AEHelper {
 
-class AEHelper {
- public:
-  static AEGP_ItemH GetActiveCompositionItem();
-  static void SetSuitesAndPluginID(SPBasicSuite* basicSuite, AEGP_PluginID id);
-  static std::shared_ptr<AEGP_SuiteHandler> GetSuites() {
-    return Suites;
-  }
-  static AEGP_PluginID GetPluginID() {
-    return PluginID;
-  }
+AEGP_ItemH GetActiveCompositionItem();
 
- private:
-  static AEGP_PluginID PluginID;
-  static std::shared_ptr<AEGP_SuiteHandler> Suites;
-};
-}  // namespace exporter
+void SetSuitesAndPluginID(SPBasicSuite* basicSuite, AEGP_PluginID id);
+
+std::shared_ptr<AEGP_SuiteHandler> GetSuites();
+
+AEGP_PluginID GetPluginID();
+
+}  // namespace AEHelper

exporter/src/utils/AEResourceManager.cpp renamed to exporter/src/utils/AEResource.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "AEResourceManager.h"
+#include "AEResource.h"
 #include "AEHelper.h"
 
 namespace exporter {
@@ -48,7 +48,7 @@ static AEResourceType GetResourceType(const std::shared_ptr<AEGP_SuiteHandler>&
   return AEResourceType::Unknown;
 }
 
-bool AEResourceManager::HasCompositionResource() {
+bool HasCompositionResource() {
   const auto& suites = AEHelper::GetSuites();
   A_long numProjects = 0;
   suites->ProjSuite6()->AEGP_GetNumProjects(&numProjects);

exporter/src/utils/AEResourceManager.h renamed to exporter/src/utils/AEResource.h

@@ -22,8 +22,6 @@ namespace exporter {
 
 enum class AEResourceType { Unknown, Folder, Composition, Image };
 
-class AEResourceManager {
- public:
-  static bool HasCompositionResource();
-};
+bool HasCompositionResource();
+
 }  // namespace exporter