Refactor serving_dirs.

tools/telemetry/telemetry/page/__init__.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import inspect
 import logging
 import os
 import urlparse
 
 from telemetry import user_story
 from telemetry.page import shared_page_state
@@ skipping 177 matching lines @@
     assert self.is_file
     file_path_url = os.path.normpath(os.path.join(self._base_dir, self.url[7:]))
     # Preserve trailing slash or backslash.
     # It doesn't matter in a file path, but it does matter in a URL.
     if self.url.endswith('/'):
       file_path_url += os.sep
     return file_path_url
 
   @property
   def serving_dir(self):
+    if not self.is_file:
+      return None

[nednguyen, 2015/02/03 01:37:37]

Can the logic below be moved to user_story?

[aiolos (Not reviewing), 2015/02/03 02:35:36]

user_story doesn't currently have a file_path parameter. If you want me to add
one to user_story, I can move the logic below.

[nednguyen, 2015/02/03 18:03:54]

file_path is a field that only works in page's case, since there is no notion of
'url' for a generic user story. I think it's fine to keep this here.

     file_path = os.path.realpath(self.file_path)
     if os.path.isdir(file_path):
       return file_path
     else:
       return os.path.dirname(file_path)
 
   @property
   def display_name(self):
     if self.name:
       return self.name
     if not self.is_file:
       return self.url
     all_urls = [p.url.rstrip('/') for p in self.page_set if p.is_file]
     common_prefix = os.path.dirname(os.path.commonprefix(all_urls))
     return self.url[len(common_prefix):].strip('/')