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
+    assert isinstance(branch, basestring), branch
+    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 31 matching lines @@
           number = version['version'].split('.')[0]
         if number not in numbers:
           numbers[number] = 0
         else:
           numbers[number] += 1
 
     sorted_numbers = sorted(numbers.iteritems(),
                             None,
                             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