Docserver: Pull knowledge of host file systems into a single

chrome/common/extensions/docs/server2/branch_utility.py

 # Copyright (c) 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 json
 import logging
 import operator
 
 from appengine_url_fetcher import AppEngineUrlFetcher
 import url_constants
 
 
 class ChannelInfo(object):
   '''Represents a Chrome channel with three pieces of information. |channel| is
   one of 'stable', 'beta', 'dev', or 'trunk'. |branch| and |version| correspond
   with each other, and represent different releases of Chrome. Note that
   |branch| and |version| can occasionally be the same for separate channels
   (i.e. 'beta' and 'dev'), so all three fields are required to uniquely
   identify a channel.
   '''
 
   def __init__(self, channel, branch, version):
+    assert isinstance(channel, basestring), channel

[Jeffrey Yasskin, 2013/10/08 17:46:05]

Do you want basestring or str here? How are you handling unicode?

[not at google - send to devlin, 2013/10/08 18:27:37]

Does unicode need to be handled any differently? I'm not sure whether this
stuff, when grabbed from the json, will end up unicode or not. Hopefully unicode
since JSON might have unicode but I'm not sure.

But it's moot if it doesn't matter.

[Jeffrey Yasskin, 2013/10/08 20:49:39]

Unicode probably needs to be encoded before you make an http request using it,
but maybe urlfetch will handle it automatically. It's not a huge deal, but since
all of the arguments I know of are ascii, maybe it makes sense to explicitly
constrain the inputs that way. On the other hand, your profile indicates we're
actually handling a lot of unicode, so maybe tightening the assert will break a
bunch. I'm fine with either ignoring this or doing it in a separate CL.

[not at google - send to devlin, 2013/10/08 21:29:36]

I'm not sure what encoding we specify on fetches. Off the top of my head I'd say
we don't. We do parse text responses as unicode though.

As part of the ContentProvider stuff I will need to tighten up our unicode
handling, but, that will come later.

+    assert isinstance(branch, basestring), branch
+    # TODO(kalman): Assert that this is a string. One day Chromium will probably
+    # be served out of a git repository and the versions will no longer be ints.
+    assert isinstance(version, int) or version == 'trunk', version
     self.channel = channel
     self.branch = branch
     self.version = version
 
   def __eq__(self, other):
     return self.__dict__ == other.__dict__
 
   def __ne__(self, other):
     return not (self == other)
 
@@ skipping 82 matching lines @@
   def GetAllVersions(self):
     return tuple(self.GetChannelInfo(channel).version
             for channel in BranchUtility.GetAllChannelNames())
 
   def GetAllChannelInfo(self):
     return tuple(self.GetChannelInfo(channel)
             for channel in BranchUtility.GetAllChannelNames())
 
 
   def GetChannelInfo(self, channel):
+    version = self._ExtractFromVersionJson(channel, 'version')
+    if version != 'trunk':
+      version = int(version)
     return ChannelInfo(channel,
                        self._ExtractFromVersionJson(channel, 'branch'),
-                       self._ExtractFromVersionJson(channel, 'version'))
+                       version)
 
   def GetStableChannelInfo(self, version):
     '''Given a |version| corresponding to a 'stable' version of Chrome, returns
     a ChannelInfo object representing that version.
     '''
     return ChannelInfo('stable', self.GetBranchForVersion(version), version)
 
   def _ExtractFromVersionJson(self, channel_name, data_type):
     '''Returns the branch or version number for a channel name.
     '''
@@ skipping 28 matching lines @@
         if data_type == 'branch':
           number = version['version'].split('.')[2]
         elif data_type == 'version':
           number = version['version'].split('.')[0]
         if number not in numbers:
           numbers[number] = 0
         else:
           numbers[number] += 1
 
     sorted_numbers = sorted(numbers.iteritems(),
                             None,

[Jeffrey Yasskin, 2013/10/08 17:46:05]

Wow, this is terrible style. sorted() wants keyword arguments.

[not at google - send to devlin, 2013/10/08 18:27:37]

Heh.

                             operator.itemgetter(1),
                             True)
-    object_store.Set(channel_name, int(sorted_numbers[0][0]))
-    return int(sorted_numbers[0][0])
+    object_store.Set(channel_name, sorted_numbers[0][0])
+    return sorted_numbers[0][0]
 
   def GetBranchForVersion(self, version):
     '''Returns the most recent branch for a given chrome version number using
     data stored on omahaproxy (see url_constants).
     '''
     if version == 'trunk':
       return 'trunk'
 
     branch = self._branch_object_store.Get(str(version)).Get()
     if branch is not None:
       return branch
 
     version_json = json.loads(self._history_result.Get().content)
     for entry in version_json['events']:
       # Here, entry['title'] looks like: '<title> - <version>.##.<branch>.##'
       version_title = entry['title'].split(' - ')[1].split('.')
       if version_title[0] == str(version):
-        self._branch_object_store.Set(str(version), int(version_title[2]))
-        return int(version_title[2])
+        self._branch_object_store.Set(str(version), version_title[2])
+        return version_title[2]
 
     raise ValueError('The branch for %s could not be found.' % version)
 
   def GetChannelForVersion(self, version):
     '''Returns the name of the development channel corresponding to a given
     version number.
     '''
     for channel_info in self.GetAllChannelInfo():
       if channel_info.channel == 'stable' and version <= channel_info.version:
         return channel_info.channel
@@ skipping 11 matching lines @@
     version_json = json.loads(self._history_result.Get().content)
     latest_version = 0
     for entry in version_json['events']:
       version_title = entry['title'].split(' - ')[1].split('.')
       version = int(version_title[0])
       if version > latest_version:
         latest_version = version
 
     self._version_object_store.Set('latest', latest_version)
     return latest_version