WebSVN – tpanel – Diff – /trunk/ttpinit.cpp

 #include "terror.h"
 #include "tvalidatefile.h"
 #include "tconfig.h"
 #include "tfsfreader.h"
 #include "tdirectory.h"
+#include "tpagemanager.h"
 #include "tresources.h"
 #if __cplusplus < 201402L
 #   error "This module requires at least C++14 standard!"
 #else
+{
     DECL_TRACER("TTPInit::loadSurfaceFromController(bool force)");
     TFsfReader reader;
     reader.regCallbackProgress(bind(&TTPInit::progressCallback, this, std::placeholders::_1));
+    bool temp = TConfig::getTemporary();
+    if (gPageManager && gPageManager->isSetupActive())
+        TConfig::setTemporary(true);
+    else
+        TConfig::setTemporary(false);
+    string surface = TConfig::getFtpSurface();
+    TConfig::setTemporary(temp);
-    string target = mPath + "/" + TConfig::getFtpSurface();
+    string target = mPath + "/" + surface;
     size_t pos = 0;
     if ((pos = mPath.find_last_of("/")) != string::npos)
-        target = mPath.substr(0, pos) + "/" + TConfig::getFtpSurface();
+        target = mPath.substr(0, pos) + "/" + surface;
     if (!force)
+    {
         if (!isVirgin() || TConfig::getFtpDownloadTime() > 0)
             return false;
         dir.dropDir(mPath + "/fonts");
         dir.dropDir(mPath + "/images");
         dir.dropDir(mPath + "/sounds");
+    }
-    if (!reader.copyOverFTP(TConfig::getFtpSurface(), target))
+    if (!reader.copyOverFTP(surface, target))
+    {
         if (TConfig::getFtpDownloadTime() == 0)
             createPanelConfigs();
         return false;
         _processEvents();
     return 1;
+}
+off64_t TTPInit::getFileSize(const string& file)
+{
+    DECL_TRACER("TTPInit::getFileSize(const string& file)");
+    vector<FILELIST_t>::iterator iter;
+    if (!mDirList.empty())
+    {
+        for (iter = mDirList.begin(); iter != mDirList.end(); ++iter)
+        {
+            if (iter->fname == file)
+                return iter->size;
+        }
+    }
+    // Here we know that we've no files in our cache. Therefor we'll read from
+    // the NetLinx, if possible.
+    getFileList(".tp4");
+    if (mDirList.empty())
+        return 0;
+    // Now search again for the file.
+    for (iter = mDirList.begin(); iter != mDirList.end(); ++iter)
+    {
+        if (iter->fname == file)
+            return iter->size;
+    }
+    // The file doesn't exist, or we couldn't read from a NetLinx.
+    return 0;
+}
 bool TTPInit::isSystemDefault()
+{
     DECL_TRACER("TTPInit::isSystemDefault()");
     try

Subversion Repositories tpanel

(root)/trunk/ttpinit.cpp @ 242 – Rev 197 → 208