#351: refactor: moved changeable state into new Unit "WorkState.cpp"

from Unit “Options.cpp”. The latter now contains only program options (which cannot be changed without reload).
nzbget · Jan 22, 2019 · e3bd941 · e3bd941
1 parent bb1cb68
commit e3bd941
Show file tree

Hide file tree

Showing 26 changed files with 235 additions and 146 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,7 1,7 @@
 #
 # This file is part of nzbget. See <http://nzbget.net>.
 #
-# Copyright (C) 2008-2016 Andrey Prygunkov <[email protected]>
 # Copyright (C) 2008-2019 Andrey Prygunkov <[email protected]>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -68,6 68,8 @@ nzbget_SOURCES = \
  daemon/main/nzbget.h \
  daemon/main/Options.cpp \
  daemon/main/Options.h \
  daemon/main/WorkState.cpp \
  daemon/main/WorkState.h \
  daemon/main/Scheduler.cpp \
  daemon/main/Scheduler.h \
  daemon/main/StackTrace.cpp \

diff --git a/Makefile.in b/Makefile.in
@@ -17,7 17,7 @@
 #
 # This file is part of nzbget. See <http://nzbget.net>.
 #
-# Copyright (C) 2008-2016 Andrey Prygunkov <[email protected]>
 # Copyright (C) 2008-2019 Andrey Prygunkov <[email protected]>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -232,7 232,8 @@ am__nzbget_SOURCES_DIST = daemon/connect/Connection.cpp \
  daemon/main/DiskService.h daemon/main/Maintenance.cpp \
  daemon/main/Maintenance.h daemon/main/nzbget.cpp \
  daemon/main/nzbget.h daemon/main/Options.cpp \
- daemon/main/Options.h daemon/main/Scheduler.cpp \
  daemon/main/Options.h daemon/main/WorkState.cpp \
  daemon/main/WorkState.h daemon/main/Scheduler.cpp \
  daemon/main/Scheduler.h daemon/main/StackTrace.cpp \
  daemon/main/StackTrace.h daemon/nntp/ArticleDownloader.cpp \
  daemon/nntp/ArticleDownloader.h daemon/nntp/ArticleWriter.cpp \
@@ -387,7 388,8 @@ am_nzbget_OBJECTS = daemon/connect/Connection.$(OBJEXT) \
  daemon/main/CommandLineParser.$(OBJEXT) \
  daemon/main/DiskService.$(OBJEXT) \
  daemon/main/Maintenance.$(OBJEXT) daemon/main/nzbget.$(OBJEXT) \
- daemon/main/Options.$(OBJEXT) daemon/main/Scheduler.$(OBJEXT) \
  daemon/main/Options.$(OBJEXT) daemon/main/WorkState.$(OBJEXT) \
  daemon/main/Scheduler.$(OBJEXT) \
  daemon/main/StackTrace.$(OBJEXT) \
  daemon/nntp/ArticleDownloader.$(OBJEXT) \
  daemon/nntp/ArticleWriter.$(OBJEXT) \
@@ -720,7 722,8 @@ nzbget_SOURCES = daemon/connect/Connection.cpp \
  daemon/main/DiskService.h daemon/main/Maintenance.cpp \
  daemon/main/Maintenance.h daemon/main/nzbget.cpp \
  daemon/main/nzbget.h daemon/main/Options.cpp \
- daemon/main/Options.h daemon/main/Scheduler.cpp \
  daemon/main/Options.h daemon/main/WorkState.cpp \
  daemon/main/WorkState.h daemon/main/Scheduler.cpp \
  daemon/main/Scheduler.h daemon/main/StackTrace.cpp \
  daemon/main/StackTrace.h daemon/nntp/ArticleDownloader.cpp \
  daemon/nntp/ArticleDownloader.h daemon/nntp/ArticleWriter.cpp \
@@ -1158,6 1161,8 @@ daemon/main/nzbget.$(OBJEXT): daemon/main/$(am__dirstamp) \
  daemon/main/$(DEPDIR)/$(am__dirstamp)
 daemon/main/Options.$(OBJEXT): daemon/main/$(am__dirstamp) \
  daemon/main/$(DEPDIR)/$(am__dirstamp)
 daemon/main/WorkState.$(OBJEXT): daemon/main/$(am__dirstamp) \
  daemon/main/$(DEPDIR)/$(am__dirstamp)
 daemon/main/Scheduler.$(OBJEXT): daemon/main/$(am__dirstamp) \
  daemon/main/$(DEPDIR)/$(am__dirstamp)
 daemon/main/StackTrace.$(OBJEXT): daemon/main/$(am__dirstamp) \
@@ -1553,6 1558,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/main/$(DEPDIR)/Options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/main/$(DEPDIR)/Scheduler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/main/$(DEPDIR)/StackTrace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/main/$(DEPDIR)/WorkState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/main/$(DEPDIR)/nzbget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/nntp/$(DEPDIR)/ArticleDownloader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/nntp/$(DEPDIR)/ArticleWriter.Po@am__quote@

diff --git a/daemon/connect/WebDownloader.cpp b/daemon/connect/WebDownloader.cpp
@@ -1,7 1,7 @@
 /*
  * This file is part of nzbget. See <http://nzbget.net>.
  *
- * Copyright (C) 2012-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2012-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 22,7 @@
 #include "WebDownloader.h"
 #include "Log.h"
 #include "Options.h"
 #include "WorkState.h"
 #include "Util.h"
 #include "FileSystem.h"
 
@@ -72,19 73,19 @@ void WebDownloader::Run()
 
  if ((((Status == adFailed) && (remainedDownloadRetries > 1)) ||
  ((Status == adConnectError) && (remainedConnectRetries > 1)))
- && !IsStopped() && !(!m_force && g_Options->GetPauseDownload()))
  && !IsStopped() && !(!m_force && g_WorkState->GetPauseDownload()))
  {
  detail("Waiting %i sec to retry", g_Options->GetUrlInterval());
  int msec = 0;
  while (!IsStopped() && (msec < g_Options->GetUrlInterval() * 1000) &&
- !(!m_force && g_Options->GetPauseDownload()))
  !(!m_force && g_WorkState->GetPauseDownload()))
  {
  usleep(100 * 1000);
  msec = 100;
  }
  }
 
- if (IsStopped() || (!m_force && g_Options->GetPauseDownload()))
  if (IsStopped() || (!m_force && g_WorkState->GetPauseDownload()))
  {
  Status = adRetry;
  break;

diff --git a/daemon/extension/PostScript.cpp b/daemon/extension/PostScript.cpp
@@ -1,7 1,7 @@
 /*
  * This file is part of nzbget. See <http://nzbget.net>.
  *
- * Copyright (C) 2007-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2007-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 23,7 @@
 #include "Log.h"
 #include "Util.h"
 #include "Options.h"
 #include "WorkState.h"
 
 static const int POSTPROCESS_PARCHECK = 92;
 static const int POSTPROCESS_SUCCESS = 93;
@@ -272,14 273,14 @@ void PostScriptController::AddMessage(Message::EKind kind, const char* text)
  m_postInfo->SetProgressLabel(text);
  }
 
- if (g_Options->GetPausePostProcess() && !m_postInfo->GetNzbInfo()->GetForcePriority())
  if (g_WorkState->GetPausePostProcess() && !m_postInfo->GetNzbInfo()->GetForcePriority())
  {
  time_t stageTime = m_postInfo->GetStageTime();
  time_t startTime = m_postInfo->GetStartTime();
  time_t waitTime = Util::CurrentTime();
 
  // wait until Post-processor is unpaused
- while (g_Options->GetPausePostProcess() && !m_postInfo->GetNzbInfo()->GetForcePriority() && !IsStopped())
  while (g_WorkState->GetPausePostProcess() && !m_postInfo->GetNzbInfo()->GetForcePriority() && !IsStopped())
  {
  usleep(100 * 1000);
 

diff --git a/daemon/feed/FeedCoordinator.cpp b/daemon/feed/FeedCoordinator.cpp
@@ -21,6 21,7 @@
 #include "nzbget.h"
 #include "FeedCoordinator.h"
 #include "Options.h"
 #include "WorkState.h"
 #include "WebDownloader.h"
 #include "Util.h"
 #include "FileSystem.h"
@@ -98,7 99,7 @@ void FeedCoordinator::Run()
  while (!IsStopped())
  {
  // this code should not be called too often, once per second is OK
- if (!g_Options->GetPauseDownload() || m_force || g_Options->GetUrlForce())
  if (!g_WorkState->GetPauseDownload() || m_force || g_Options->GetUrlForce())
  {
  Guard guard(m_downloadsMutex);
 

diff --git a/daemon/frontend/Frontend.cpp b/daemon/frontend/Frontend.cpp
@@ -2,7 2,7 @@
  * This file is part of nzbget. See <http://nzbget.net>.
  *
  * Copyright (C) 2004 Sven Henkel <[email protected]>
- * Copyright (C) 2007-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2007-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 21,7 @@
 
 #include "nzbget.h"
 #include "Options.h"
 #include "WorkState.h"
 #include "Frontend.h"
 #include "Log.h"
 #include "Connection.h"
@@ -57,8 58,8 @@ bool Frontend::PrepareData()
  if (m_summary)
  {
  m_currentDownloadSpeed = g_StatMeter->CalcCurrentDownloadSpeed();
- m_pauseDownload = g_Options->GetPauseDownload();
- m_downloadLimit = g_Options->GetDownloadRate();
  m_pauseDownload = g_WorkState->GetPauseDownload();
  m_downloadLimit = g_WorkState->GetSpeedLimit();
  m_threadCount = Thread::GetThreadCount();
  g_StatMeter->CalcTotalStat(&m_upTimeSec, &m_dnTimeSec, &m_allBytes, &m_standBy);
 
@@ -108,8 109,8 @@ void Frontend::ServerPauseUnpause(bool pause)
  }
  else
  {
- g_Options->SetResumeTime(0);
- g_Options->SetPauseDownload(pause);
  g_WorkState->SetResumeTime(0);
  g_WorkState->SetPauseDownload(pause);
  }
 }
 
@@ -121,7 122,7 @@ void Frontend::ServerSetDownloadRate(int rate)
  }
  else
  {
- g_Options->SetDownloadRate(rate);
  g_WorkState->SetSpeedLimit(rate);
  }
 }
 

diff --git a/daemon/frontend/NCursesFrontend.cpp b/daemon/frontend/NCursesFrontend.cpp
@@ -2,7 2,7 @@
  * This file is part of nzbget. See <http://nzbget.net>.
  *
  * Copyright (C) 2004 Sven Henkel <[email protected]>
- * Copyright (C) 2007-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2007-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/daemon/main/CommandLineParser.h b/daemon/main/CommandLineParser.h
@@ -1,7 1,7 @@
 /*
  * This file is part of nzbget. See <http://nzbget.net>.
  *
- * Copyright (C) 2007-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2007-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/daemon/main/DiskService.cpp b/daemon/main/DiskService.cpp
@@ -21,6 21,7 @@
 #include "nzbget.h"
 #include "DiskService.h"
 #include "Options.h"
 #include "WorkState.h"
 #include "StatMeter.h"
 #include "Log.h"
 #include "Util.h"
@@ -38,7 39,7 @@ void DiskService::ServiceWork()
 {
  debug("Disk service work");
 
- if (!g_Options->GetPauseDownload() &&
  if (!g_WorkState->GetPauseDownload() &&
  g_Options->GetDiskSpace() > 0 && !g_StatMeter->GetStandBy())
  {
  // check free disk space every 1 second
@@ -59,7 60,7 @@ void DiskService::CheckDiskSpace()
  if (freeSpace > -1 && freeSpace / 1024 / 1024 < g_Options->GetDiskSpace())
  {
  warn("Low disk space on %s. Pausing download", g_Options->GetDestDir());
- g_Options->SetPauseDownload(true);
  g_WorkState->SetPauseDownload(true);
  }
 
  if (!Util::EmptyStr(g_Options->GetInterDir()))
@@ -68,7 69,7 @@ void DiskService::CheckDiskSpace()
  if (freeSpace > -1 && freeSpace / 1024 / 1024 < g_Options->GetDiskSpace())
  {
  warn("Low disk space on %s. Pausing download", g_Options->GetInterDir());
- g_Options->SetPauseDownload(true);
  g_WorkState->SetPauseDownload(true);
  }
  }
 }
@@ -106,7 107,7 @@ void DiskService::CheckRequiredDir()
  info("All required directories available");
  }
 
- g_Options->SetTempPauseDownload(false);
- g_Options->SetTempPausePostprocess(false);
  g_WorkState->SetTempPauseDownload(false);
  g_WorkState->SetTempPausePostprocess(false);
  m_waitingRequiredDir = false;
 }
diff --git a/daemon/main/Options.h b/daemon/main/Options.h
@@ -2,7 2,7 @@
  * This file is part of nzbget. See <http://nzbget.net>.
  *
  * Copyright (C) 2004 Sven Henkel <[email protected]>
- * Copyright (C) 2007-2016 Andrey Prygunkov <[email protected]>
  * Copyright (C) 2007-2019 Andrey Prygunkov <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -300,6 300,7 @@ class Options
  bool GetDirectRename() { return m_directRename; }
  bool GetReorderFiles() { return m_reorderFiles; }
  EFileNaming GetFileNaming() { return m_fileNaming; }
  int GetDownloadRate() const { return m_downloadRate; }
 
  Categories* GetCategories() { return &m_categories; }
  Category* FindCategory(const char* name, bool searchAliases) { return m_categories.FindCategory(name, searchAliases); }
@@ -311,24 312,6 @@ class Options
  bool GetDaemonMode() { return m_daemonMode; }
  void SetRemoteClientMode(bool remoteClientMode) { m_remoteClientMode = remoteClientMode; }
  bool GetRemoteClientMode() { return m_remoteClientMode; }
- void SetPauseDownload(bool pauseDownload) { m_pauseDownload = pauseDownload; }
- bool GetPauseDownload() const { return m_pauseDownload; }
- void SetPausePostProcess(bool pausePostProcess) { m_pausePostProcess = pausePostProcess; }
- bool GetPausePostProcess() const { return m_pausePostProcess; }
- void SetPauseScan(bool pauseScan) { m_pauseScan = pauseScan; }
- bool GetPauseScan() const { return m_pauseScan; }
- void SetTempPauseDownload(bool tempPauseDownload) { m_tempPauseDownload = tempPauseDownload; }
- bool GetTempPauseDownload() const { return m_tempPauseDownload; }
- bool GetTempPausePostprocess() const { return m_tempPausePostprocess; }
- void SetTempPausePostprocess(bool tempPausePostprocess) { m_tempPausePostprocess = tempPausePostprocess; }
- void SetDownloadRate(int rate) { m_downloadRate = rate; }
- int GetDownloadRate() const { return m_downloadRate; }
- void SetResumeTime(time_t resumeTime) { m_resumeTime = resumeTime; }
- time_t GetResumeTime() const { return m_resumeTime; }
- void SetLocalTimeOffset(int localTimeOffset) { m_localTimeOffset = localTimeOffset; }
- int GetLocalTimeOffset() { return m_localTimeOffset; }
- void SetQuotaReached(bool quotaReached) { m_quotaReached = quotaReached; }
- bool GetQuotaReached() { return m_quotaReached; }
 
 private:
  OptEntries m_optEntries;
@@ -450,20 433,12 @@ class Options
  int m_dailyQuota = 0;
  bool m_reorderFiles = false;
  EFileNaming m_fileNaming = nfArticle;
  int m_downloadRate = 0;
 
- // Current state
  // Application mode
  bool m_serverMode = false;
  bool m_daemonMode = false;
  bool m_remoteClientMode = false;
- bool m_pauseDownload = false;
- bool m_pausePostProcess = false;
- bool m_pauseScan = false;
- bool m_tempPauseDownload = true;
- bool m_tempPausePostprocess = true;
- int m_downloadRate = 0;
- time_t m_resumeTime = 0;
- int m_localTimeOffset = 0;
- bool m_quotaReached = false;
 
  void Init(const char* exeName, const char* configFilename, bool noConfig,
  CmdOptList* commandLineOptions, bool noDiskAccess, Extender* extender);