Filterlists downloads changes

Shared/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginIniFileW.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginDictionary.h"
 #include "PluginClient.h"
 #include "PluginChecksum.h"
@@ skipping 220 matching lines @@
         }
 
         CPluginSettingsLock lock;
         if (lock.IsLocked())
         {
             isRead = m_settingsFile->Read();        
             if (isRead)
             {
                 if (m_settingsFile->IsValidChecksum())
                 {
+                                        m_properties = m_settingsFile->GetSectionData("Settings");
+
 #ifdef SUPPORT_FILTER                       
                     // Unpack filter URLs
                     CPluginIniFileW::TSectionData filters = m_settingsFile->GetSectionData("Filters");
                     int filterCount = 0;
                     bool bContinue = true;
 
                     s_criticalSectionFilters.Lock();
                             {
                                     m_filterUrlList.clear();
 
@@ skipping 101 matching lines @@
                 m_filterDownloadTimesList[CString(FILTERS_PROTOCOL) + CString(FILTERS_HOST) + "/easylist.txt"] = time(NULL);
 */
         }
         s_criticalSectionFilters.Unlock();
 
 #endif // SUPPORT_FILTER
 }
 
 bool CPluginSettings::MakeRequestForUpdate()
 {
+        time_t updateTime = this->GetValue(SETTING_LAST_UPDATE_TIME);
+
+        if (time(NULL) <= updateTime)
+                return false;
+
         CPluginHttpRequest httpRequest(PLUGIN_UPDATE_URL);
 
         CPluginSystem* system = CPluginSystem::GetInstance();
 
     httpRequest.Add("lang", this->GetString(SETTING_LANGUAGE, "err"));
         httpRequest.Add("ie", system->GetBrowserVersion());
         httpRequest.Add("ielang", system->GetBrowserLanguage());
 
         httpRequest.AddOsInfo();
 
         httpRequest.Send();
 
+        this->SetValue(SETTING_LAST_UPDATE_TIME, time(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
         if (httpRequest.IsValidResponse())
         {
                 const std::auto_ptr<CPluginIniFile>& iniFile = httpRequest.GetResponseFile();
 
                 CPluginIniFile::TSectionData settingsData = iniFile->GetSectionData("Settings");
                 CPluginIniFile::TSectionData::iterator it;
 
                 it = settingsData.find("pluginupdate");
                 if (it != settingsData.end())
                 {
@@ skipping 10 matching lines @@
                         SetString(SETTING_PLUGIN_UPDATE_VERSION, ver);
                         m_isDirty = true;
                         DEBUG_SETTINGS("Settings::Configuration plugin update version:" + it->second);
                 }
         }
 
         return true;
 }
 bool CPluginSettings::CheckFilterAndDownload()
 {
-        TFilterUrlList currentFilterUrlList = this->GetFilterUrlList();
-        std::map<CString, CString> fileNamesList = this->GetFilterFileNamesList();
+        s_criticalSectionLocal.Lock();
+    TFilterUrlList currentFilterUrlList = this->GetFilterUrlList();
+    std::map<CString, CString> fileNamesList = this->GetFilterFileNamesList();
 
-        for (TFilterUrlList::iterator it = currentFilterUrlList.begin(); it != currentFilterUrlList.end(); ++it) 
+        bool filterAvailable = false;
+    for (TFilterUrlList::iterator it = currentFilterUrlList.begin(); it != currentFilterUrlList.end(); ++it) 
+    {
+        CString downloadFilterName = it->first;
+
+                std::map<CString, CString>::const_iterator fni = fileNamesList.find(downloadFilterName);                
+                CString filename = "";
+                if (fni != fileNamesList.end())
+                {
+                        filename = fni->second;
+                }
+                else
+                {
+                        filename = downloadFilterName.Trim().Right(downloadFilterName.GetLength() - downloadFilterName.ReverseFind('/') - 1).Trim();
+                }
+        int version = it->second;
+        if ((this->FilterShouldLoad(downloadFilterName)))
         {
-            CString downloadFilterName = it->first;
-
-                        std::map<CString, CString>::const_iterator fni = fileNamesList.find(downloadFilterName);                
-                        CString filename = "";
-                        if (fni != fileNamesList.end())
+                        filterAvailable = true;
+                        if (this->FilterlistExpired(downloadFilterName))
                         {
-                                filename = fni->second;
-                        }
-                        else
-                        {
-                                filename = downloadFilterName.Trim().Right(downloadFilterName.GetLength() - downloadFilterName.ReverseFind('/') - 1).Trim();
-                        }
-            int version = it->second;
-
-            if (this->FilterlistExpired(downloadFilterName) && (this->FilterShouldLoad(downloadFilterName)))
-            {
-                CPluginFilter::DownloadFilterFile(downloadFilterName, filename);
+                                CPluginFilter::DownloadFilterFile(downloadFilterName, filename);
                                 this->SetFilterRefreshDate(downloadFilterName, time(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
-            }
-                        else
-                        {
-                                //Cleanup, since we don't need the filter definition
-                                DeleteFile(CPluginSettings::GetDataPath(filename));
-                                this->SetFilterRefreshDate(downloadFilterName, 0);
                         }
         }
+                else
+                {
+                        //Cleanup, since we don't need the filter definition
+                        DeleteFile(CPluginSettings::GetDataPath(filename));
+                        this->SetFilterRefreshDate(downloadFilterName, 0);
+                }
+    }
 
-        this->Write();
+        if (!filterAvailable)
+        {
+                //If no filter list found, default to "en"
 
-        this->IncrementTabVersion(SETTING_TAB_FILTER_VERSION);
+            this->SetString(SETTING_LANGUAGE, (BSTR)L"en");
 
-                return true;
+                CPluginDictionary* dict = CPluginDictionary::GetInstance();
+                dict->SetLanguage(L"en");
+
+                for (std::map<CString, CString>::iterator it = m_filterLanguagesList.begin(); it != m_filterLanguagesList.end(); ++it) 
+                {
+                        if (it->second == L"en")
+                        {
+                                CPluginFilter::DownloadFilterFile(it->first, m_filterFileNameList.find(it->first)->second);
+                                this->SetFilterRefreshDate(it->first, time(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
+                        }
+                }
+        }
+
+    this->Write();
+
+    this->IncrementTabVersion(SETTING_TAB_FILTER_VERSION);
+
+        s_criticalSectionLocal.Unlock();
+        return true;
 }
 
 CString CPluginSettings::GetDataPathParent()
 {
         if (s_dataPathParent == NULL) 
         {
                 WCHAR* lpData = new WCHAR[MAX_PATH];
 
                 OSVERSIONINFO osVersionInfo;
                 ::ZeroMemory(&osVersionInfo, sizeof(OSVERSIONINFO));
@@ skipping 1733 matching lines @@
            osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
            bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
 
            m_WindowsBuildNumber = osvi.dwBuildNumber;
         }
 
    return m_WindowsBuildNumber;
 }
 
 #endif // SUPPORT_WHITELIST