cleaned up the edit stage mess

there should really be just two processing stages: preprocessed and
processed, that postprocessing flag was just confusing

Author: benapetr

src/huggle_core/editqueue.cpp

@@ -145,5 +145,5 @@ bool EditQueue_UnprocessedEdit::IsPostProcessing()
 {
     if (this->Edit == nullptr)
         return false;
-    return this->Edit->Status != WEStatus::StatusPostProcessed;
+    return this->Edit->Status != WEStatus::StatusProcessed;
 }

src/huggle_core/hugglequeuefilter.cpp

@@ -164,7 +164,7 @@ bool HuggleQueueFilter::Matches(WikiEdit *edit)
         if (this->Self == HuggleQueueFilterMatchRequire && edit->User->Username.toLower() == Configuration::HuggleConfiguration->SystemConfig_UserName.toLower())
             return false;
     }
-    if (edit->IsPostProcessed())
+    if (edit->IsProcessed())
     {
         if (hcfg->SystemConfig_CatScansAndWatched)
         {

src/huggle_core/querypool.cpp

@@ -78,9 +78,9 @@ void QueryPool::PreProcessEdit(WikiEdit *edit)
 {
     if (edit == nullptr)
         throw new Huggle::NullPointerException("WikiEdit *edit", BOOST_CURRENT_FUNCTION);
-    if (edit->Status == StatusProcessed)
+    if (edit->Status == StatusPreProcessed)
         return;
-    if (edit->Status == StatusPostProcessed)
+    if (edit->Status == StatusProcessed)
         throw new Huggle::Exception("Pre process of edit that was already post processed", BOOST_CURRENT_FUNCTION);
     if (edit->User == nullptr)
         throw new Huggle::NullPointerException("edit->User", BOOST_CURRENT_FUNCTION);
@@ -115,7 +115,7 @@ void QueryPool::PreProcessEdit(WikiEdit *edit)
     if (hcfg->UserConfig->RemoveAfterTrustedEdit && edit->User->IsWhitelisted() && EditQueue::Primary)
         EditQueue::Primary->DeleteOlder(edit);
 
-    edit->Status = StatusProcessed;
+    edit->Status = StatusPreProcessed;
     Hooks::EditAfterPreProcess(edit);
 }
 

src/huggle_core/revertquery.cpp

@@ -258,7 +258,7 @@ void RevertQuery::preflightCheck()
         while (index < WikiEdit::EditList.count())
         {
             WikiEdit *w = WikiEdit::EditList.at(index++);
-            if (!w->IsPostProcessed())
+            if (!w->IsProcessed())
                 continue;
             if (w != this->editToBeReverted)
             {

src/huggle_core/wikiedit.cpp

@@ -617,14 +617,14 @@ void WikiEdit::PostProcess()
         throw new Huggle::NullPointerException("local WikiPage Page", BOOST_CURRENT_FUNCTION);
     if (this->Status == Huggle::StatusNone)
     {
-        Exception::ThrowSoftException("Processing edit to " + this->Page->PageName + "which was requested to be post processed,"\
-                                      " but wasn't processed yet", BOOST_CURRENT_FUNCTION);
+        Exception::ThrowSoftException("Processing edit of " + this->Page->PageName + " which was requested to be post-processed,"\
+                                      " but wasn't pre-processed yet", BOOST_CURRENT_FUNCTION);
         QueryPool::HugglePool->PreProcessEdit(this);
     }
-    if (this->Status == Huggle::StatusPostProcessed)
-        throw new Huggle::Exception("Unable to post process an edit that is already processed", BOOST_CURRENT_FUNCTION);
-    if (this->Status != Huggle::StatusProcessed)
-        throw new Huggle::Exception("Unable to post process an edit that wasn't in processed status", BOOST_CURRENT_FUNCTION);
+    if (this->Status == Huggle::StatusProcessed)
+        throw new Huggle::Exception("Unable to process an edit that is already processed", BOOST_CURRENT_FUNCTION);
+    if (this->Status != Huggle::StatusPreProcessed)
+        throw new Huggle::Exception("Unable to process an edit that wasn't in preprocessed status", BOOST_CURRENT_FUNCTION);
     this->postProcessing = true;
 #ifndef HUGGLE_SDK
     // Send info to other functions
@@ -899,5 +899,5 @@ void WikiEdit_ProcessorThread::Process(WikiEdit *edit)
     // Hooks::EditAfterPostProcess(edit);
     edit->postProcessing = false;
     edit->processedByWorkerThread = true;
-    edit->Status = StatusPostProcessed;
+    edit->Status = StatusProcessed;
 }

src/huggle_core/wikiedit.hpp

@@ -38,8 +38,8 @@ namespace Huggle
     enum WEStatus
     {
         StatusNone,
-        StatusProcessed,
-        StatusPostProcessed
+        StatusPreProcessed,
+        StatusProcessed
     };
 
     class Query;
@@ -71,9 +71,10 @@ namespace Huggle
 
 	//! That means each edit has has one of 3 basic states in its lifecycle:
 	//! None - edit was just created and is not suitable for use elsewhere in the program as many attributes may be missing, these attributes are inserted during processing and post processing
-	//! Processed - edit was processed, that means the basic informations about the edit were properly set by various helper functions.
-	//!				Processing is a very quick operation, it happens within the program, no external API calls are needed. It fills up most of essential properties, but not all of them.
-	//! Postprocessed - edit was processed by the processor thread which handles various API calls asynchronously in order to fetch all available detailed information about the edit and the detailed information.
+    //! PreProcessed - edit was preprocessed, that means the basic informations about the edit were properly set by various helper functions.
+    //!				   Preprocessing is only a very quick operation, it happens within the main thread, no external API calls are needed. It fills up only most of the essential properties, but not all of them.
+    //! Processed -    edit was fully processed by the edit processing thread which handles various API calls, and regex parsing asynchronously in order to fetch all available detailed
+    //!                information about the edit and the detailed information.
 
 	//! Edits are heavily cached across Huggle in order to avoid unnecessary API calls
 
@@ -103,7 +104,7 @@ namespace Huggle
             QString GetFullUrl();
             bool IsRangeOfEdits();
             //! Return true in case this edit was post processed already
-            bool IsPostProcessed();
+            bool IsProcessed();
             //! If edit is ready to be added to queue
             bool IsReady();
             //! Processes all score words in text
@@ -163,7 +164,7 @@ namespace Huggle
             long Score = 0;
             //! This score is used to determine if edit was done in good faith, even if it wasn't OK
             long GoodfaithScore = 0;
-            //! Function to call when post processing of edit is finished
+            //! Function to call when processing of edit is finished
             WEPostprocessedCallback PostprocessCallback = nullptr;
             void *PostprocessCallback_Owner = nullptr;
             QHash<QString, QVariant> PropertyBag;
@@ -181,10 +182,11 @@ namespace Huggle
             bool processingRevs;
             bool processingEditInfo;
             bool processingDiff = false;
-            //! This variable is used by worker thread and needs to be public so that it is working
+
+            // These 2 variables are used by worker thread
             bool postProcessing;
-            //! This variable is used by worker thread and needs to be public so that it is working
             bool processedByWorkerThread;
+
             Collectable_SmartPtr<ApiQuery> qTalkpage;
             //! This is a query used to retrieve information about the user
             Collectable_SmartPtr<ApiQuery> qUser;
@@ -208,9 +210,9 @@ namespace Huggle
         return QDateTime::fromMSecsSinceEpoch(0);
     }
 
-    inline bool WikiEdit::IsPostProcessed()
+    inline bool WikiEdit::IsProcessed()
     {
-        return (this->Status == StatusPostProcessed);
+        return (this->Status == StatusProcessed);
     }
 
     inline long WikiEdit::GetSize()

src/huggle_ui/history.cpp

@@ -274,7 +274,7 @@ void History::Display()
     if (this->DisplayedEdit == nullptr)
         return;
 
-    if (!this->DisplayedEdit->IsPostProcessed())
+    if (!this->DisplayedEdit->IsProcessed())
         return;
 
     MainWindow::HuggleMain->DisplayEdit(this->DisplayedEdit);
@@ -372,7 +372,7 @@ void History::ShowEdit()
         case HistoryProtect:
             return;
     }
-    if (!edit->IsPostProcessed())
+    if (!edit->IsProcessed())
     {
         // now we need to display it
         QueryPool::HugglePool->PreProcessEdit(edit);

src/huggle_ui/historyform.cpp

@@ -136,7 +136,7 @@ void HistoryForm::onTick01()
 
     if (this->RetrievingEdit && this->RetrievedEdit != nullptr)
     {
-        if (this->RetrievedEdit->IsPostProcessed())
+        if (this->RetrievedEdit->IsProcessed())
         {
             MainWindow::HuggleMain->DisplayEdit(this->RetrievedEdit, false, true);
             this->RetrievingEdit = false;

src/huggle_ui/hugglequeue.cpp

@@ -43,7 +43,7 @@ void HuggleQueue::AddItem(WikiEdit *edit)
     if (edit == nullptr)
         throw new Huggle::NullPointerException("WikiEdit *page", BOOST_CURRENT_FUNCTION);
 
-    if (!edit->IsPostProcessed())
+    if (!edit->IsProcessed())
         throw new Huggle::Exception("Insert of non processed edit to queue", BOOST_CURRENT_FUNCTION);
 
     if (!edit->IsValid)
@@ -95,7 +95,7 @@ void HuggleQueue::AddItem(WikiEdit *edit)
         {
             // retrieve the edit
             WikiEdit *current_edit = Huggle::WikiEdit::EditList.at(i++);
-            if (!current_edit->IsPostProcessed())
+            if (!current_edit->IsProcessed())
                 continue;
             // if this is a same edit we can go next
             if (current_edit == edit)

src/huggle_ui/huggletool.cpp

@@ -226,7 +226,7 @@ void HuggleTool::finishPage()
 
 void HuggleTool::finishEdit()
 {
-    if (this->edit == nullptr || !this->edit->IsPostProcessed())
+    if (this->edit == nullptr || !this->edit->IsProcessed())
         return;
     this->tick->stop();
     this->ui->pushButtonLoad->setEnabled(true);