Commit db283871 authored by slamm's avatar slamm Committed by Commit bot

Simplify server_dirs algorithm. os.path.join('/foo', '/bar') gives '/bar'.

BUG=

Review URL: https://codereview.chromium.org/657163002

Cr-Commit-Position: refs/heads/master@{#299772}
parent a5cc021b
...@@ -41,14 +41,9 @@ class PageSet(user_story_set.UserStorySet): ...@@ -41,14 +41,9 @@ class PageSet(user_story_set.UserStorySet):
self._wpr_archive_info = None self._wpr_archive_info = None
self.startup_url = startup_url self.startup_url = startup_url
self.user_stories = [] self.user_stories = []
self.serving_dirs = set() # Convert any relative serving_dirs to absolute paths.
serving_dirs = [] if serving_dirs is None else serving_dirs self._serving_dirs = set(os.path.realpath(os.path.join(self.base_dir, d))
# Makes sure that page_set's serving_dirs are absolute paths for d in serving_dirs or [])
for sd in serving_dirs:
if os.path.isabs(sd):
self.serving_dirs.add(os.path.realpath(sd))
else:
self.serving_dirs.add(os.path.realpath(os.path.join(self.base_dir, sd)))
if self._IsValidPrivacyBucket(bucket): if self._IsValidPrivacyBucket(bucket):
self._bucket = bucket self._bucket = bucket
else: else:
...@@ -84,6 +79,10 @@ class PageSet(user_story_set.UserStorySet): ...@@ -84,6 +79,10 @@ class PageSet(user_story_set.UserStorySet):
else: else:
return self.file_path return self.file_path
@property
def serving_dirs(self):
return self._serving_dirs
@property @property
def wpr_archive_info(self): # pylint: disable=E0202 def wpr_archive_info(self): # pylint: disable=E0202
"""Lazily constructs wpr_archive_info if it's not set and returns it.""" """Lazily constructs wpr_archive_info if it's not set and returns it."""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment