Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Side by Side Diff: chrome/common/extensions/docs/server2/features_bundle.py

Issue 344453003: Docserver: separate models for apps and extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase/Add comment Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import posixpath 5 from copy import copy
6 6
7 from branch_utility import BranchUtility
7 from compiled_file_system import SingleFile, Unicode 8 from compiled_file_system import SingleFile, Unicode
9 from docs_server_utils import StringIdentity
8 from extensions_paths import API_PATHS, JSON_TEMPLATES 10 from extensions_paths import API_PATHS, JSON_TEMPLATES
9 import features_utility
10 from file_system import FileNotFoundError 11 from file_system import FileNotFoundError
11 from future import Future 12 from future import Future
13 from path_util import Join
14 from platform_util import GetExtensionTypes, PlatformToExtensionType
12 from third_party.json_schema_compiler.json_parse import Parse 15 from third_party.json_schema_compiler.json_parse import Parse
13 16
14 17
15 _API_FEATURES = '_api_features.json' 18 _API_FEATURES = '_api_features.json'
16 _MANIFEST_FEATURES = '_manifest_features.json' 19 _MANIFEST_FEATURES = '_manifest_features.json'
17 _PERMISSION_FEATURES = '_permission_features.json' 20 _PERMISSION_FEATURES = '_permission_features.json'
18 21
19 22
20 def _GetFeaturePaths(feature_file, *extra_paths): 23 def HasParentFeature(feature_name, feature, all_feature_names):
21 paths = [posixpath.join(api_path, feature_file) for api_path in API_PATHS] 24 # A feature has a parent if it has a . in its name, its parent exists,
22 paths.extend(extra_paths) 25 # and it does not explicitly specify that it has no parent.
23 return paths 26 return ('.' in feature_name and
24 27 feature_name.rsplit('.', 1)[0] in all_feature_names and
25 28 not feature.get('noparent'))
26 def _AddPlatformsAndChannelsFromDependencies(feature, 29
27 api_features, 30
28 manifest_features, 31 def GetParentFeature(feature_name, feature, all_feature_names):
29 permission_features): 32 '''Returns the name of the parent feature, or None if it does not have a
30 features_map = { 33 parent.
31 'api': api_features, 34 '''
32 'manifest': manifest_features, 35 if not HasParentFeature(feature_name, feature, all_feature_names):
33 'permission': permission_features, 36 return None
34 } 37 return feature_name.rsplit('.', 1)[0]
35 dependencies = feature.get('dependencies') 38
36 if dependencies is None: 39
37 return 40 def _CreateFeaturesFromJSONFutures(json_futures):
38 platforms = set() 41 '''Returns a dict of features. The value of each feature is a list with
39 channel = None 42 all of its possible values.
40 for dependency in dependencies: 43 '''
41 dep_type, dep_name = dependency.split(':') 44 def ignore_feature(name, value):
42 dependency_features = features_map[dep_type] 45 '''Returns true if this feature should be ignored. Features are ignored if
43 dependency_feature = dependency_features.get(dep_name) 46 they are only available to whitelisted apps or component extensions/apps, as
44 # If the dependency can't be resolved, it is inaccessible and therefore 47 in these cases the APIs are not available to public developers.
45 # so is this feature. 48
46 if dependency_feature is None: 49 Private APIs are also unavailable to public developers, but logic elsewhere
47 return 50 makes sure they are not listed. So they shouldn't be ignored via this
48 # Import the platforms from the dependency. The logic is a bit odd; if 51 mechanism.
49 # |feature| specifies platforms the it's considered an override. If not, 52 '''
50 # we form the union of all dependency's platforms. 53 if name.endswith('Private'):
51 # TODO(kalman): Fix this (see http://crbug.com/322094). 54 return False
52 platforms.update(dependency_feature.get('platforms', set())) 55 return value.get('location') == 'component' or 'whitelist' in value
53 # Import the channel from the dependency. 56
54 channel = dependency_feature.get('channel', channel) 57 features = {}
55 if platforms and not feature.get('platforms'): 58
56 feature['platforms'] = list(platforms) 59 for json_future in json_futures:
57 if channel and not feature.get('channel'): 60 try:
58 feature['channel'] = channel 61 features_json = Parse(json_future.Get())
62 except FileNotFoundError:
63 # Not all file system configurations have the extra files.
64 continue
65 for name, rawvalue in features_json.iteritems():
66 if name not in features:
67 features[name] = []
68 for value in (rawvalue if isinstance(rawvalue, list) else (rawvalue,)):
69 if not ignore_feature(name, value):
70 features[name].append(value)
71
72 return features
73
74
75 def _CopyParentFeatureValues(child, parent):
76 '''Takes data from feature dict |parent| and copies/merges it
77 into feature dict |child|. Two passes are run over the features,
78 and on the first pass features are not resolved across caches,
79 so a None value for |parent| may be passed in.
80 '''
81 if parent is None:
82 return child
83 merged = copy(parent)
84 merged.pop('noparent', None)
85 merged.pop('name', None)
86 merged.update(child)
87 return merged
88
89
90 def _ResolveFeature(feature_name,
91 feature_values,
92 extra_feature_values,
93 platform,
94 features_type,
95 features_map):
96 '''Filters and combines the possible values for a feature into one dict.
97
98 It uses |features_map| to resolve dependencies for each value and inherit
99 unspecified platform and channel data. |feature_values| is then filtered
100 by platform and all values with the most stable platform are merged into one
101 dict. All values in |extra_feature_values| get merged into this dict.
102
103 Returns |resolve_successful| and |feature|. |resolve_successful| is False
104 if the feature's dependencies have not been merged yet themselves, meaning
105 that this feature can not be reliably resolved yet. |feature| is the
106 resulting feature dict, or None if the feature does not exist on the
107 platform specified.
108 '''
109 feature = None
110 most_stable_channel = None
111 for value in feature_values:
112 # If 'extension_types' or 'channel' is unspecified, these values should
113 # be inherited from dependencies. If they are specified, these values
114 # should override anything specified by dependencies.
115 inherit_valid_platform = 'extension_types' not in value
116 if inherit_valid_platform:
117 valid_platform = None
118 else:
119 valid_platform = (value['extension_types'] == 'all' or
120 platform in value['extension_types'])
121 inherit_channel = 'channel' not in value
122 channel = value.get('channel')
123
124 dependencies = value.get('dependencies', [])
125 parent = GetParentFeature(
126 feature_name, value, features_map[features_type]['all_names'])
127 if parent is not None:
128 # The parent data needs to be resolved so the child can inherit it.
129 if parent in features_map[features_type].get('unresolved', ()):
130 return False, None
131 value = _CopyParentFeatureValues(
132 value, features_map[features_type]['resolved'].get(parent))
133 # Add the parent as a dependency to ensure proper platform filtering.
134 dependencies.append(features_type + ':' + parent)
135
136 for dependency in dependencies:
137 dep_type, dep_name = dependency.split(':')
138 if (dep_type not in features_map or
139 dep_name in features_map[dep_type].get('unresolved', ())):
140 # The dependency itself has not been merged yet or the features map
141 # does not have the needed data. Fail to resolve.
142 return False, None
143
144 dep = features_map[dep_type]['resolved'].get(dep_name)
145 if inherit_valid_platform and (valid_platform is None or valid_platform):
146 # If dep is None, the dependency does not exist because it has been
147 # filtered out by platform. This feature value does not explicitly
148 # specify platform data, so filter this feature value out.
149 # Only run this check if valid_platform is True or None so that it
150 # can't be reset once it is False.
151 valid_platform = dep is not None
152 if inherit_channel and dep and 'channel' in dep:
153 if channel is None or BranchUtility.NewestChannel(
154 (dep['channel'], channel)) != channel:
155 # Inherit the least stable channel from the dependencies.
156 channel = dep['channel']
157
158 # Default to stable on all platforms.
159 if valid_platform is None:
160 valid_platform = True
161 if valid_platform and channel is None:
162 channel = 'stable'
163
164 if valid_platform:
165 # The feature value is valid. Merge it into the feature dict.
166 if feature is None or BranchUtility.NewestChannel(
167 (most_stable_channel, channel)) != channel:
168 # If this is the first feature value to be merged, copy the dict.
169 # If this feature value has a more stable channel than the most stable
170 # channel so far, replace the old dict so that it only merges values
171 # from the most stable channel.
172 feature = copy(value)
173 most_stable_channel = channel
174 elif channel == most_stable_channel:
175 feature.update(value)
176
177 if feature is None:
178 # Nothing was left after filtering the values, but all dependency resolves
179 # were successful. This feature does not exist on |platform|.
180 return True, None
181
182 # Merge in any extra values.
183 for value in extra_feature_values:
184 feature.update(value)
185
186 # Cleanup, fill in missing fields.
187 if 'name' not in feature:
188 feature['name'] = feature_name
189 feature['channel'] = most_stable_channel
190 return True, feature
59 191
60 192
61 class _FeaturesCache(object): 193 class _FeaturesCache(object):
62 def __init__(self, file_system, compiled_fs_factory, json_paths): 194 def __init__(self,
63 populate = self._CreateCache 195 file_system,
64 if len(json_paths) == 1: 196 compiled_fs_factory,
65 populate = SingleFile(populate) 197 json_paths,
66 198 extra_paths,
67 self._cache = compiled_fs_factory.Create(file_system, populate, type(self)) 199 platform,
200 features_type):
201 self._cache = compiled_fs_factory.Create(
202 file_system, self._CreateCache, type(self), category=platform)
68 self._text_cache = compiled_fs_factory.ForUnicode(file_system) 203 self._text_cache = compiled_fs_factory.ForUnicode(file_system)
69 self._json_path = json_paths[0] 204 self._json_paths = json_paths
70 self._extra_paths = json_paths[1:] 205 self._extra_paths = extra_paths
206 self._platform = platform
207 self._features_type = features_type
71 208
72 @Unicode 209 @Unicode
73 def _CreateCache(self, _, features_json): 210 def _CreateCache(self, _, features_json):
211 json_path_futures = [self._text_cache.GetFromFile(path)
212 for path in self._json_paths[1:]]
74 extra_path_futures = [self._text_cache.GetFromFile(path) 213 extra_path_futures = [self._text_cache.GetFromFile(path)
75 for path in self._extra_paths] 214 for path in self._extra_paths]
76 features = features_utility.Parse(Parse(features_json)) 215
77 for path_future in extra_path_futures: 216 features_values = _CreateFeaturesFromJSONFutures(
78 try: 217 [Future(value=features_json)] + json_path_futures)
79 extra_json = path_future.Get() 218
80 except FileNotFoundError: 219 extra_features_values = _CreateFeaturesFromJSONFutures(extra_path_futures)
81 # Not all file system configurations have the extra files. 220
82 continue 221 features = {
83 features = features_utility.MergedWith( 222 'resolved': {},
84 features_utility.Parse(Parse(extra_json)), features) 223 'unresolved': copy(features_values),
224 'extra': extra_features_values,
225 'all_names': set(features_values.keys())
226 }
227
228 # Merges as many feature values as possible without resolving dependencies
229 # from other FeaturesCaches. Pass in a features_map with just this
230 # FeatureCache's features_type. Makes repeated passes until no new
231 # resolves are successful.
232 new_resolves = True
233 while new_resolves:
234 new_resolves = False
235 for feature_name, feature_values in features_values.iteritems():
236 if feature_name not in features['unresolved']:
237 continue
238 resolve_successful, feature = _ResolveFeature(
239 feature_name,
240 feature_values,
241 extra_features_values.get(feature_name, ()),
242 self._platform,
243 self._features_type,
244 {self._features_type: features})
245 if resolve_successful:
246 del features['unresolved'][feature_name]
247 new_resolves = True
248 if feature is not None:
249 features['resolved'][feature_name] = feature
250
85 return features 251 return features
86 252
87 def GetFeatures(self): 253 def GetFeatures(self):
88 if self._json_path is None: 254 if not self._json_paths:
89 return Future(value={}) 255 return Future(value={})
90 return self._cache.GetFromFile(self._json_path) 256 return self._cache.GetFromFile(self._json_paths[0])
91 257
92 258
93 class FeaturesBundle(object): 259 class FeaturesBundle(object):
94 '''Provides access to properties of API, Manifest, and Permission features. 260 '''Provides access to properties of API, Manifest, and Permission features.
95 ''' 261 '''
96 def __init__(self, file_system, compiled_fs_factory, object_store_creator): 262 def __init__(self,
97 self._api_cache = _FeaturesCache( 263 file_system,
98 file_system, 264 compiled_fs_factory,
99 compiled_fs_factory, 265 object_store_creator,
100 _GetFeaturePaths(_API_FEATURES)) 266 platform):
101 self._manifest_cache = _FeaturesCache( 267 def create_features_cache(features_type, feature_file, *extra_paths):
102 file_system, 268 return _FeaturesCache(
103 compiled_fs_factory, 269 file_system,
104 _GetFeaturePaths(_MANIFEST_FEATURES, 270 compiled_fs_factory,
105 posixpath.join(JSON_TEMPLATES, 'manifest.json'))) 271 [Join(path, feature_file) for path in API_PATHS],
106 self._permission_cache = _FeaturesCache( 272 extra_paths,
107 file_system, 273 self._platform,
108 compiled_fs_factory, 274 features_type)
109 _GetFeaturePaths(_PERMISSION_FEATURES, 275
110 posixpath.join(JSON_TEMPLATES, 'permissions.json'))) 276 if platform not in GetExtensionTypes():
111 self._identity = file_system.GetIdentity() 277 self._platform = PlatformToExtensionType(platform)
278 else:
279 self._platform = platform
280
281 self._caches = {
282 'api': create_features_cache('api', _API_FEATURES),
283 'manifest': create_features_cache(
284 'manifest',
285 _MANIFEST_FEATURES,
286 Join(JSON_TEMPLATES, 'manifest.json')),
287 'permission': create_features_cache(
288 'permission',
289 _PERMISSION_FEATURES,
290 Join(JSON_TEMPLATES, 'permissions.json'))
291 }
292 # Namespace the object store by the file system ID because this class is
293 # used by the availability finder cross-channel.
112 self._object_store = object_store_creator.Create( 294 self._object_store = object_store_creator.Create(
113 _FeaturesCache, 295 _FeaturesCache,
114 category=self._identity) 296 category=StringIdentity(file_system.GetIdentity(), self._platform))
115 297
116 def GetPermissionFeatures(self): 298 def GetPermissionFeatures(self):
117 return self._permission_cache.GetFeatures() 299 return self.GetFeatures('permission', ('permission',))
118 300
119 def GetManifestFeatures(self): 301 def GetManifestFeatures(self):
120 return self._manifest_cache.GetFeatures() 302 return self.GetFeatures('manifest', ('manifest',))
121 303
122 def GetAPIFeatures(self): 304 def GetAPIFeatures(self):
123 api_features = self._object_store.Get('api_features').Get() 305 return self.GetFeatures('api', ('api', 'manifest', 'permission'))
124 if api_features is not None: 306
125 return Future(value=api_features) 307 def GetFeatures(self, features_type, dependencies):
126 308 '''Resolves all dependencies in the categories specified by |dependencies|.
127 api_features_future = self._api_cache.GetFeatures() 309 Returns the features in the |features_type| category.
128 manifest_features_future = self._manifest_cache.GetFeatures() 310 '''
129 permission_features_future = self._permission_cache.GetFeatures() 311 features = self._object_store.Get(features_type).Get()
312 if features is not None:
313 return Future(value=features)
314
315 futures = {}
316 for cache_type in dependencies:
317 dependency_features = self._object_store.Get(cache_type).Get()
318 if dependency_features is not None:
319 # Get cached dependencies if possible. If it has been cached, all
320 # of its features have been resolved, so the other fields are
321 # unnecessary.
322 futures[cache_type] = Future(value={'resolved': dependency_features})
323 else:
324 futures[cache_type] = self._caches[cache_type].GetFeatures()
325
130 def resolve(): 326 def resolve():
131 api_features = api_features_future.Get() 327 features_map = {}
132 manifest_features = manifest_features_future.Get() 328 for cache_type, future in futures.iteritems():
133 permission_features = permission_features_future.Get() 329 # Copy down to features_map level because the 'resolved' and
134 # TODO(rockot): Handle inter-API dependencies more gracefully. 330 # 'unresolved' dicts will be modified.
135 # Not yet a problem because there is only one such case (windows -> tabs). 331 features_map[cache_type] = dict((c, copy(d))
136 # If we don't store this value before annotating platforms, inter-API 332 for c, d in future.Get().iteritems())
137 # dependencies will lead to infinite recursion. 333
138 for feature in api_features.itervalues(): 334 def has_unresolved():
139 _AddPlatformsAndChannelsFromDependencies( 335 '''Determines if there are any unresolved features left over in any
140 feature, api_features, manifest_features, permission_features) 336 of the categories in |dependencies|.
141 self._object_store.Set('api_features', api_features) 337 '''
142 return api_features 338 return any(cache['unresolved'] for cache in features_map.itervalues())
339
340 # Iterate until everything is resolved. If dependencies are multiple
341 # levels deep, it might take multiple passes to inherit data to the
342 # topmost feature.
343 while has_unresolved():
344 for cache_type, cache in features_map.iteritems():
345 to_remove = []
346 for feature_name, feature_values in cache['unresolved'].iteritems():
347 resolve_successful, feature = _ResolveFeature(
348 feature_name,
349 feature_values,
350 cache['extra'].get(feature_name, ()),
351 self._platform,
352 cache_type,
353 features_map)
354 if not resolve_successful:
355 continue # Try again on the next iteration of the while loop
356
357 # When successfully resolved, remove it from the unresolved dict.
358 # Add it to the resolved dict if it didn't get deleted.
359 to_remove.append(feature_name)
360 if feature is not None:
361 cache['resolved'][feature_name] = feature
362
363 for key in to_remove:
364 del cache['unresolved'][key]
365
366 for cache_type, cache in features_map.iteritems():
367 self._object_store.Set(cache_type, cache['resolved'])
368 return features_map[features_type]['resolved']
369
143 return Future(callback=resolve) 370 return Future(callback=resolve)
144
145 def GetIdentity(self):
146 return self._identity
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698