Merge branch 'multiFileKdaemon' of github.com:/adventurist/ky_gui into multiFileKdaemon

headers/instatask.fbs

@@ -12,6 +12,7 @@ table IGTask {
   link_bio: string;
   is_video: bool;
   mask: int;
+  header: string;
 }
 
 root_type IGTask;

headers/instatask_generated.h

@@ -22,7 +22,8 @@ struct IGTask FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
     VT_PROMOTE_SHARE = 18,
     VT_LINK_BIO = 20,
     VT_IS_VIDEO = 22,
-    VT_MASK = 24
+    VT_MASK = 24,
+    VT_HEADER = 26
   };
   int32_t id() const {
     return GetField<int32_t>(VT_ID, 0);
@@ -57,6 +58,9 @@ struct IGTask FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   int32_t mask() const {
     return GetField<int32_t>(VT_MASK, 0);
   }
+  const flatbuffers::String *header() const {
+    return GetPointer<const flatbuffers::String *>(VT_HEADER);
+  }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<int32_t>(verifier, VT_ID) &&
@@ -78,6 +82,8 @@ struct IGTask FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            verifier.VerifyString(link_bio()) &&
            VerifyField<uint8_t>(verifier, VT_IS_VIDEO) &&
            VerifyField<int32_t>(verifier, VT_MASK) &&
+           VerifyOffset(verifier, VT_HEADER) &&
+           verifier.VerifyString(header()) &&
            verifier.EndTable();
   }
 };
@@ -118,6 +124,9 @@ struct IGTaskBuilder {
   void add_mask(int32_t mask) {
     fbb_.AddElement<int32_t>(IGTask::VT_MASK, mask, 0);
   }
+  void add_header(flatbuffers::Offset<flatbuffers::String> header) {
+    fbb_.AddOffset(IGTask::VT_HEADER, header);
+  }
   explicit IGTaskBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
@@ -142,8 +151,10 @@ inline flatbuffers::Offset<IGTask> CreateIGTask(
     flatbuffers::Offset<flatbuffers::String> promote_share = 0,
     flatbuffers::Offset<flatbuffers::String> link_bio = 0,
     bool is_video = false,
-    int32_t mask = 0) {
+    int32_t mask = 0,
+    flatbuffers::Offset<flatbuffers::String> header = 0) {
   IGTaskBuilder builder_(_fbb);
+  builder_.add_header(header);
   builder_.add_mask(mask);
   builder_.add_link_bio(link_bio);
   builder_.add_promote_share(promote_share);
@@ -170,7 +181,8 @@ inline flatbuffers::Offset<IGTask> CreateIGTaskDirect(
     const char *promote_share = nullptr,
     const char *link_bio = nullptr,
     bool is_video = false,
-    int32_t mask = 0) {
+    int32_t mask = 0,
+    const char *header = nullptr) {
   auto file_info__ = file_info ? _fbb.CreateString(file_info) : 0;
   auto time__ = time ? _fbb.CreateString(time) : 0;
   auto description__ = description ? _fbb.CreateString(description) : 0;
@@ -179,6 +191,7 @@ inline flatbuffers::Offset<IGTask> CreateIGTaskDirect(
   auto requested_by_phrase__ = requested_by_phrase ? _fbb.CreateString(requested_by_phrase) : 0;
   auto promote_share__ = promote_share ? _fbb.CreateString(promote_share) : 0;
   auto link_bio__ = link_bio ? _fbb.CreateString(link_bio) : 0;
+  auto header__ = header ? _fbb.CreateString(header) : 0;
   return IGData::CreateIGTask(
       _fbb,
       id,
@@ -191,7 +204,8 @@ inline flatbuffers::Offset<IGTask> CreateIGTaskDirect(
       promote_share__,
       link_bio__,
       is_video,
-      mask);
+      mask,
+      header__);
 }
 
 inline const IGData::IGTask *GetIGTask(const void *buf) {

include/argdialog.h

@@ -8,9 +8,11 @@
 #include <QPushButton>
 #include <string_view>
 #include <unordered_map>
+#include <QKeyEvent>
 #include <headers/util.hpp>
 
 namespace Args {
+const QString HEADER_TYPE = "header";
 const QString DESCRIPTION_TYPE = "description";
 const QString HASHTAG_TYPE = "hashtag";
 const QString PROMOTE_TYPE = "promote/share";
@@ -32,18 +34,18 @@ typedef struct KFile {
 } KFile;
 
 typedef struct IGPost {
+  std::string header = "Learn to speak like native Korean speakers 🙆‍♀️🇰🇷";
   std::string description;
   std::string datetime;
-  std::string promote_share = "Promote share";
-//  std::string link_in_bio = u8"Download a FREE PDF of basic 245 verbs (link 🔗 in bio 👆)";
-  std::string link_in_bio = "Link inbio";
+  std::string promote_share = "Share the post through IG story if you enjoy the phrase 🙋‍♀️";
+  std::string link_in_bio = "Subscribe to my YouTube channel (link 🔗in bio) to learn more about Korean language and culture ❤";
   std::vector<std::string> hashtags;
   std::vector<std::string> requested_by;
   const char *requested_by_phrase = "The phrase was requested by ";
   std::vector<KFile> files;
   bool is_video;
   bool isReady() {
-    return description.size() > 0 && datetime.size() > 0 &&
+      return header.size() > 0 && description.size() > 0 && datetime.size() > 0 &&
            promote_share.size() > 0 && link_in_bio.size() > 0 &&
              hashtags.size() > 0 && requested_by.size() > 0 && !files.empty() &&
              files.at(0).path.size() > 0;
@@ -59,6 +61,7 @@ class ArgDialog : public QDialog {
 
  public:
   explicit ArgDialog(QWidget *parent = nullptr);
+  virtual void keyPressEvent(QKeyEvent* e);
   ~ArgDialog();
 
  signals:
@@ -67,6 +70,7 @@ class ArgDialog : public QDialog {
 
  private:
   void clearPost();
+  void defaultPost();
   void clearTask();
   void addToArgList(QString value, QString type);
   void addOrReplaceInArgList(QString value, QString type);

src/argdialog.cpp

@@ -116,6 +116,7 @@ ArgDialog::ArgDialog(QWidget *parent) :
 
                 emit ArgDialog::taskRequestReady(m_task, true);
             }
+            defaultPost(); // reset m_ig_post to default values
         }
     });
 
@@ -174,6 +175,7 @@ void ArgDialog::setTaskArguments() {
     m_task.args.push_back(m_ig_post.promote_share);
     m_task.args.push_back(m_ig_post.link_in_bio);
     m_task.args.push_back(std::to_string(m_ig_post.is_video));
+    m_task.args.push_back(m_ig_post.header);
 }
 
 void ArgDialog::addItem(QString value, QString type) {
@@ -200,6 +202,7 @@ void ArgDialog::addFile(QString path) {
 
 void ArgDialog::clearPost() {
     m_ig_post.files.clear();
+    m_ig_post.header = "";
     m_ig_post.datetime = "";
     m_ig_post.hashtags = {};
     m_ig_post.description = "";
@@ -209,6 +212,18 @@ void ArgDialog::clearPost() {
     m_ig_post.requested_by_phrase = "";
 }
 
+void ArgDialog::defaultPost() {
+    m_ig_post.files.clear();
+    m_ig_post.header = "Learn to speak like native Korean speakers 🙆‍♀️🇰🇷";
+    m_ig_post.datetime = "";
+    m_ig_post.hashtags.clear();
+    m_ig_post.description = "";
+    m_ig_post.link_in_bio = "Subscribe to my YouTube channel (link 🔗in bio) to learn more about Korean language and culture ❤";
+    m_ig_post.requested_by.clear();
+    m_ig_post.promote_share = "Share the post through IG story if you enjoy the phrase 🙋‍♀️";
+    m_ig_post.requested_by_phrase = "The phrase was requested by ";
+}
+
 void ArgDialog::clearTask() {
     m_task.args = {};
     m_task.mask = -1;
@@ -276,6 +291,18 @@ void ArgDialog::addHashtag(QString tag) {
     }
 }
 
+void ArgDialog::keyPressEvent(QKeyEvent *e) {
+    if (Qt::ControlModifier) {
+        if(e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter) {
+            ui->addArgument->clicked();
+            auto idx = ui->argType->currentIndex();
+            if (idx != (ui->argType->count() - 1)) {
+                ui->argType->setCurrentIndex(idx + 1);
+            }
+        }
+    }
+}
+
 ArgDialog::~ArgDialog()
 {
     delete ui;

src/client.cpp

@@ -235,7 +235,7 @@ std::string getTaskFileInfo(std::vector<SentFile> files) {
  */
 void Client::sendTaskEncoded(TaskType type, std::vector<std::string> args) {
     if (type == TaskType::INSTAGRAM) {
-        if (args.size() < 6) {
+        if (args.size() < 7) {
             qDebug() << "Not enough arguments to send an IGTask";
             return;
         }
@@ -248,8 +248,9 @@ void Client::sendTaskEncoded(TaskType type, std::vector<std::string> args) {
         auto promote_share = builder.CreateString(args.at(5).c_str(), args.at(5).size());
         auto link_bio = builder.CreateString(args.at(6).c_str(), args.at(6).size());
         auto is_video = args.at(7) == "1";
+        auto header = builder.CreateString(args.at(8).c_str(), args.at(8).size());
 
-        flatbuffers::Offset<IGTask> ig_task = CreateIGTask(builder, 96, file_info, time, description, hashtags, requested_by, requested_by_phrase, promote_share, link_bio, is_video, 16);
+        flatbuffers::Offset<IGTask> ig_task = CreateIGTask(builder, 96, file_info, time, description, hashtags, requested_by, requested_by_phrase, promote_share, link_bio, is_video, 16, header);
 
         builder.Finish(ig_task);
 

src/mainwindow.cpp

@@ -231,7 +231,10 @@ void MainWindow::updateMessages(int t, const QString& message, StringVec v) {
                 if (message == "Process Result") {
                     event_message += "\n";
                     auto app_name = q_client->getAppName(std::stoi(v.at(0).toUtf8().constData()));
-                    if (v.at(1).length() > 0) {
+                    auto process_it = std::find_if(m_processes.begin(), m_processes.end(), [v](const Process& process) {
+                        return process.id == v.at(1);
+                    });
+                    if (process_it != m_processes.end()) {
                         updateProcessResult(v.at(1), v.at(2));
                     } else { // new process, from scheduled task
                         Process new_process{ .name=app_name, .state=ProcessState::SUCCEEDED, .start=getTime(), .id="Scheduled task" };
@@ -270,6 +273,7 @@ void MainWindow::updateProcessResult(QString id, QString result) { // We need to
             return;
         }
     }
+    // If we didn't return, it's a new process:
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *e) {