Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: include/AdblockPlus/FilterEngine.h

Issue 10800079: Implemented update checking functionality (Closed)
Patch Set: Created June 5, 2013, 6:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | lib/api.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #ifndef ADBLOCK_PLUS_FILTER_ENGINE_H 18 #ifndef ADBLOCK_PLUS_FILTER_ENGINE_H
19 #define ADBLOCK_PLUS_FILTER_ENGINE_H 19 #define ADBLOCK_PLUS_FILTER_ENGINE_H
20 20
21 #include <vector> 21 #include <functional>
22 #include <map> 22 #include <map>
23 #include <string> 23 #include <string>
24 #include <vector>
24 #include <AdblockPlus/JsEngine.h> 25 #include <AdblockPlus/JsEngine.h>
25 #include <AdblockPlus/JsValue.h> 26 #include <AdblockPlus/JsValue.h>
26 27
27 #include "tr1_memory.h" 28 #include "tr1_memory.h"
28 29
29 namespace AdblockPlus 30 namespace AdblockPlus
30 { 31 {
31 class FilterEngine; 32 class FilterEngine;
32 33
33 class Filter : public JsValue, 34 class Filter : public JsValue,
(...skipping 26 matching lines...) Expand all
60 61
61 Subscription(JsValuePtr value); 62 Subscription(JsValuePtr value);
62 }; 63 };
63 64
64 typedef std::tr1::shared_ptr<Filter> FilterPtr; 65 typedef std::tr1::shared_ptr<Filter> FilterPtr;
65 typedef std::tr1::shared_ptr<Subscription> SubscriptionPtr; 66 typedef std::tr1::shared_ptr<Subscription> SubscriptionPtr;
66 67
67 class FilterEngine 68 class FilterEngine
68 { 69 {
69 public: 70 public:
71 typedef std::function<void(const std::string&)> UpdaterCallback;
72
70 explicit FilterEngine(JsEnginePtr jsEngine); 73 explicit FilterEngine(JsEnginePtr jsEngine);
71 JsEnginePtr GetJsEngine() const { return jsEngine; } 74 JsEnginePtr GetJsEngine() const { return jsEngine; }
72 bool IsFirstRun() const; 75 bool IsFirstRun() const;
73 FilterPtr GetFilter(const std::string& text); 76 FilterPtr GetFilter(const std::string& text);
74 SubscriptionPtr GetSubscription(const std::string& url); 77 SubscriptionPtr GetSubscription(const std::string& url);
75 std::vector<FilterPtr> GetListedFilters() const; 78 std::vector<FilterPtr> GetListedFilters() const;
76 std::vector<SubscriptionPtr> GetListedSubscriptions() const; 79 std::vector<SubscriptionPtr> GetListedSubscriptions() const;
77 std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const; 80 std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;
78 FilterPtr Matches(const std::string& url, 81 FilterPtr Matches(const std::string& url,
79 const std::string& contentType, 82 const std::string& contentType,
80 const std::string& documentUrl) const; 83 const std::string& documentUrl) const;
81 std::vector<std::string> GetElementHidingSelectors(const std::string& domain ) const; 84 std::vector<std::string> GetElementHidingSelectors(const std::string& domain ) const;
82 JsValuePtr GetPref(const std::string& pref) const; 85 JsValuePtr GetPref(const std::string& pref) const;
83 void SetPref(const std::string& pref, JsValuePtr value); 86 void SetPref(const std::string& pref, JsValuePtr value);
87 void ForceUpdateCheck(UpdaterCallback callback = 0);
84 88
85 private: 89 private:
86 JsEnginePtr jsEngine; 90 JsEnginePtr jsEngine;
87 bool initialized; 91 bool initialized;
88 bool firstRun; 92 bool firstRun;
93 int updateCheckId;
89 94
90 void InitDone(JsValueList& params); 95 void InitDone(JsValueList& params);
96 void UpdateCheckDone(const std::string& eventName, UpdaterCallback callback, JsValueList& params);
91 }; 97 };
92 } 98 }
93 99
94 #endif 100 #endif
OLDNEW
« no previous file with comments | « no previous file | lib/api.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld