Small refactoring of OutputGenerator

zenden2k · Jul 10, 2024 · 8896f7c · 8896f7c
1 parent 38b8116
commit 8896f7c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 25 deletions.
diff --git a/Source/Core/OutputGenerator/AbstractCodeGenerator.cpp b/Source/Core/OutputGenerator/AbstractCodeGenerator.cpp
@@ -2,7 +2,7 @@
 
 namespace ImageUploader::Core::OutputGenerator {
 
-std::string AbstractCodeGenerator::generate(const std::vector<UploadObject>& items) {
+std::string AbstractCodeGenerator::doGenerate(const std::vector<UploadObject>& items) {
     std::string result;
     std::vector<std::string> groups;
     std::vector<std::string> fileNames;

diff --git a/Source/Core/OutputGenerator/AbstractCodeGenerator.h b/Source/Core/OutputGenerator/AbstractCodeGenerator.h
@@ -10,9 +10,9 @@ namespace ImageUploader::Core::OutputGenerator {
 
 class AbstractCodeGenerator: public AbstractOutputGenerator {
     public:
-        AbstractCodeGenerator() = default;
-        std::string generate(const std::vector<UploadObject>& items) override;
+        AbstractCodeGenerator() = default; 
     protected:
+        std::string doGenerate(const std::vector<UploadObject>& items) override;
         virtual std::string generateCodeForItem(const UploadObject& item, int index);
         virtual std::string image(const std::string& url, const std::string& alt);
         virtual std::string link(const std::string& url, const std::string& body);

diff --git a/Source/Core/OutputGenerator/AbstractOutputGenerator.cpp b/Source/Core/OutputGenerator/AbstractOutputGenerator.cpp
@@ -61,15 +61,15 @@ bool AbstractOutputGenerator::loadTemplate(const std::string& templateFileName){
     return true;
 }
 
-std::string AbstractOutputGenerator::generateWithTemplate(const std::vector<UploadObject>& items) {
+std::string AbstractOutputGenerator::generate(const std::vector<UploadObject>& items, bool withTemplate /*= true*/) {
     std::string res;
-    if (templateHead_) {
+    if (withTemplate && templateHead_) {
         res += *templateHead_;
     }
 
-    res += generate(items);
+    res += doGenerate(items);
 
-    if (templateFoot_) {
+    if (withTemplate && templateFoot_) {
         res += *templateFoot_;
     }
     return res;

diff --git a/Source/Core/OutputGenerator/AbstractOutputGenerator.h b/Source/Core/OutputGenerator/AbstractOutputGenerator.h
@@ -69,13 +69,13 @@ class AbstractOutputGenerator
     void setItemsPerLine(int n);
     virtual GeneratorID id() const = 0;
     bool loadTemplate(const std::string& templateFileName);
-    std::string generateWithTemplate(const std::vector<UploadObject>& items);
-    virtual std::string generate(const std::vector<UploadObject>& items) = 0;
+    std::string generate(const std::vector<UploadObject>& items, bool withTemplate = true);
 protected:
     CodeType codeType_;
     bool preferDirectLinks_ = true, shortenUrl_ = false, groupByFile_ = false;
     int itemsPerLine_ = 4;
     std::optional<std::string> templateHead_, templateFoot_;
+    virtual std::string doGenerate(const std::vector<UploadObject>& items) = 0;
 };
 
 }
diff --git a/Source/Core/OutputGenerator/JSONGenerator.cpp b/Source/Core/OutputGenerator/JSONGenerator.cpp
@@ -5,7 +5,7 @@
 
 namespace ImageUploader::Core::OutputGenerator {
 
-std::string JSONGenerator::generate(const std::vector<UploadObject>& items) {
+std::string JSONGenerator::doGenerate(const std::vector<UploadObject>& items) {
     Json::Value arrValue(Json::arrayValue);
 
     for (const auto& item : items) {

diff --git a/Source/Core/OutputGenerator/JSONGenerator.h b/Source/Core/OutputGenerator/JSONGenerator.h
@@ -12,7 +12,8 @@ class JSONGenerator : public AbstractOutputGenerator {
 public:
     JSONGenerator() = default;
     GeneratorID id() const override;
-    std::string generate(const std::vector<UploadObject>& items) override;
+protected:
+    std::string doGenerate(const std::vector<UploadObject>& items) override;
 private:
 };
 

diff --git a/Source/Core/OutputGenerator/XmlTemplateGenerator.cpp b/Source/Core/OutputGenerator/XmlTemplateGenerator.cpp
@@ -11,7 +11,7 @@ XmlTemplateGenerator::XmlTemplateGenerator(XmlTemplateList* templateList): templ
 
 }
 
-std::string XmlTemplateGenerator::generate(const std::vector<UploadObject>& items) {
+std::string XmlTemplateGenerator::doGenerate(const std::vector<UploadObject>& items) {
     std::string res;
     std::string itemsStr;
     std::unordered_map<std::string, std::string> vars;

diff --git a/Source/Core/OutputGenerator/XmlTemplateGenerator.h b/Source/Core/OutputGenerator/XmlTemplateGenerator.h
@@ -14,12 +14,12 @@ class XmlTemplateGenerator : public AbstractOutputGenerator {
 public:
     explicit XmlTemplateGenerator(XmlTemplateList* templateList);
     GeneratorID id() const override;
-    std::string generate(const std::vector<UploadObject>& items) override;
     void setTemplateIndex(size_t index);
 private:
     std::string replaceVars(const std::string& text, const std::unordered_map<std::string, std::string>& vars);
     XmlTemplateList* templateList_;
     size_t templateIndex_ = 0;
+    std::string doGenerate(const std::vector<UploadObject>& items) override;
 };
 
 }
diff --git a/Source/Gui/Dialogs/FloatingWindow.cpp b/Source/Gui/Dialogs/FloatingWindow.cpp
@@ -932,11 +932,8 @@ void CFloatingWindow::ShowImageUploadedMessage(UploadTask* task, const CString&
             auto xmlTemplateGenerator = dynamic_cast<XmlTemplateGenerator*>(generator.get());
             xmlTemplateGenerator->setTemplateIndex(templateIndex);
         }
-        if (settings->UseTxtTemplate) {
-            code = U2W(generator->generateWithTemplate(objects));
-        } else {
-            code = U2W(generator->generate(objects));
-        }
+
+        code = U2W(generator->generate(objects, settings->UseTxtTemplate));
     }
     WinUtils::CopyTextToClipboard(code);
     CString trimmedUrl = WinUtils::TrimString(code, 70);

diff --git a/Source/Gui/Dialogs/ResultsPanel.cpp b/Source/Gui/Dialogs/ResultsPanel.cpp
@@ -222,7 +222,7 @@ std::string CResultsPanel::GenerateOutput()
 {
     namespace OG = ImageUploader::Core::OutputGenerator;
     auto* settings = ServiceLocator::instance()->settings<WtlGuiSettings>();
-    std::string Buffer;
+
     if (!Toolbar.m_hWnd) return {};
     int Index = GetCodeType();
 
@@ -264,13 +264,8 @@ std::string CResultsPanel::GenerateOutput()
         auto xmlTemplateGenerator = dynamic_cast<OG::XmlTemplateGenerator*>(generator);
         xmlTemplateGenerator->setTemplateIndex(templateIndex);
     }
-    if (UseTemplate) {
-        Buffer += generator->generateWithTemplate(UrlList);
-    } else {
-        Buffer += generator->generate(UrlList);
-    }
 
-    return Buffer;
+    return generator->generate(UrlList, UseTemplate);
 }
 
 void CResultsPanel::UpdateOutput(bool immediately)