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

Side by Side Diff: lib/iniParser.js

Issue 30013625: Issue 7094 - Link filters with subscriptions in INI parser (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Feb. 22, 2019, 1:28 a.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 | no next file » | 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 <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present 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
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 this.subscriptions.push(subscription); 100 this.subscriptions.push(subscription);
101 break; 101 break;
102 102
103 case "subscription filters": 103 case "subscription filters":
104 if (this.subscriptions.length) 104 if (this.subscriptions.length)
105 { 105 {
106 let currentSubscription = this.subscriptions[ 106 let currentSubscription = this.subscriptions[
107 this.subscriptions.length - 1 107 this.subscriptions.length - 1
108 ]; 108 ];
109 for (let text of this._curObj) 109 for (let text of this._curObj)
110 {
111 let filter = Filter.fromText(text);
110 currentSubscription.addFilterText(text); 112 currentSubscription.addFilterText(text);
113 filter.addSubscription(currentSubscription);
114 }
111 } 115 }
112 break; 116 break;
113 } 117 }
114 } 118 }
115 119
116 if (line === null) 120 if (line === null)
117 return; 121 return;
118 122
119 this._curSection = match[1].toLowerCase(); 123 this._curSection = match[1].toLowerCase();
120 switch (this._curSection) 124 switch (this._curSection)
(...skipping 19 matching lines...) Expand all
140 } 144 }
141 finally 145 finally
142 { 146 {
143 Filter.knownFilters = origKnownFilters; 147 Filter.knownFilters = origKnownFilters;
144 Subscription.knownSubscriptions = origKnownSubscriptions; 148 Subscription.knownSubscriptions = origKnownSubscriptions;
145 } 149 }
146 } 150 }
147 } 151 }
148 152
149 exports.INIParser = INIParser; 153 exports.INIParser = INIParser;
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld