x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Drop image-type across the board

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-31 17:28:25 -07:00
parent 62f7baa233
commit 5c84ce70cd
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/fetcher.py
View File

@@ -30,11 +30,6 @@ parser.add_argument(
dest='image_dir', dest='image_dir',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
FLAGS = parser.parse_args() FLAGS = parser.parse_args()
@@ -55,9 +50,8 @@ class Fetcher(object):
_BUF_SIZE = 2 ** 16 _BUF_SIZE = 2 ** 16
_MAX_BP = 10000 _MAX_BP = 10000
def __init__(self, base_url, image_type, ca_cert, image_dir): def __init__(self, base_url, ca_cert, image_dir):
self._base_url = base_url self._base_url = base_url
self._image_type = image_type
self._ca_cert_path = ca_cert self._ca_cert_path = ca_cert
self._image_dir = image_dir self._image_dir = image_dir
@@ -98,7 +92,7 @@ class Fetcher(object):
return json.loads(wrapped['inner']) return json.loads(wrapped['inner'])
def _GetManifest(self): def _GetManifest(self):
url = '%s/%s.manifest.json' % (self._base_url, self._image_type) url = '%s/manifest.json' % (self._base_url)
resp = urllib.request.urlopen(url).read().decode('utf8') resp = urllib.request.urlopen(url).read().decode('utf8')
return self._Unwrap(json.loads(resp)) return self._Unwrap(json.loads(resp))
@@ -114,7 +108,7 @@ class Fetcher(object):
raise NoValidImage raise NoValidImage
def _FetchImage(self, image): def _FetchImage(self, image):
filename = '%s.%d.iso' % (self._image_type, image['timestamp']) filename = '%d.iso' % (image['timestamp'])
path = os.path.join(self._image_dir, filename) path = os.path.join(self._image_dir, filename)
if os.path.exists(path): if os.path.exists(path):
@@ -141,7 +135,7 @@ class Fetcher(object):
raise raise
def _SetCurrent(self, image): def _SetCurrent(self, image):
filename = '%s.%d.iso' % (self._image_type, image['timestamp']) filename = '%d.iso' % (image['timestamp'])
path = os.path.join(self._image_dir, filename) path = os.path.join(self._image_dir, filename)
current_path = os.path.join(self._image_dir, 'current') current_path = os.path.join(self._image_dir, 'current')
@@ -166,7 +160,7 @@ class Fetcher(object):
def main(): def main():
fetcher = Fetcher(FLAGS.base_url, FLAGS.image_type, FLAGS.ca_cert, FLAGS.image_dir) fetcher = Fetcher(FLAGS.base_url, FLAGS.ca_cert, FLAGS.image_dir)
fetcher.Fetch() fetcher.Fetch()

16
server/build_manifest.py
View File

@@ -21,11 +21,6 @@ parser.add_argument(
dest='image_dir', dest='image_dir',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
parser.add_argument( parser.add_argument(
'--old-manifest', '--old-manifest',
dest='old_manifest', dest='old_manifest',
@@ -35,14 +30,11 @@ FLAGS = parser.parse_args()
class ManifestBuilder(object): class ManifestBuilder(object):
_FILE_REGEX = '^%(image_type)s\.(?P<timestamp>\d+)\.iso$' _FILE_REGEX = re.compile('^(?P<timestamp>\d+)\.iso$')
_BUF_SIZE = 2 ** 16 _BUF_SIZE = 2 ** 16
def __init__(self, image_dir, image_type, old_manifest): def __init__(self, image_dir, old_manifest):
self._image_dir = image_dir self._image_dir = image_dir
self._file_regex = re.compile(self._FILE_REGEX % {
'image_type': image_type,
})
self._old_manifest = old_manifest self._old_manifest = old_manifest
def _Rollouts(self): def _Rollouts(self):
@@ -64,7 +56,7 @@ class ManifestBuilder(object):
} }
rollouts = self._Rollouts() rollouts = self._Rollouts()
for filename in os.listdir(self._image_dir): for filename in os.listdir(self._image_dir):
match = self._file_regex.match(filename) match = self._FILE_REGEX.match(filename)
if not match: if not match:
continue continue
timestamp = int(match.group('timestamp')) timestamp = int(match.group('timestamp'))
@@ -86,7 +78,7 @@ class ManifestBuilder(object):
def main(): def main():
builder = ManifestBuilder(FLAGS.image_dir, FLAGS.image_type, FLAGS.old_manifest) builder = ManifestBuilder(FLAGS.image_dir, FLAGS.old_manifest)
manifest = builder.BuildManifest() manifest = builder.BuildManifest()
json.dump(manifest, sys.stdout, sort_keys=True, indent=4) json.dump(manifest, sys.stdout, sort_keys=True, indent=4)
sys.stdout.write('\n') sys.stdout.write('\n')

13
server/image.py
View File

@@ -25,11 +25,6 @@ parser.add_argument(
dest='device', dest='device',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
parser.add_argument( parser.add_argument(
'--persistent-percent', '--persistent-percent',
dest='persistent_percent', dest='persistent_percent',
@@ -41,12 +36,11 @@ FLAGS = parser.parse_args()
class Imager(object): class Imager(object):
def __init__(self, device, persistent_percent, base_url, ca_cert, image_type): def __init__(self, device, persistent_percent, base_url, ca_cert):
self._device = device self._device = device
self._persistent_percent = persistent_percent self._persistent_percent = persistent_percent
self._base_url = base_url self._base_url = base_url
self._ca_cert = ca_cert self._ca_cert = ca_cert
self._image_type = image_type
self._icon_server_path = os.path.dirname(sys.argv[0]) self._icon_server_path = os.path.dirname(sys.argv[0])
@@ -130,8 +124,7 @@ class Imager(object):
fetcher, fetcher,
'--image-dir', image_path, '--image-dir', image_path,
'--base-url', self._base_url, '--base-url', self._base_url,
'--ca-cert', self._ca_cert, '--ca-cert', self._ca_cert)
'--image-type', self._image_type)
return image_path return image_path
@@ -167,7 +160,7 @@ class Imager(object):
def main(): def main():
imager = Imager(FLAGS.device, FLAGS.persistent_percent, FLAGS.base_url, FLAGS.ca_cert, FLAGS.image_type) imager = Imager(FLAGS.device, FLAGS.persistent_percent, FLAGS.base_url, FLAGS.ca_cert)
imager.Image() imager.Image()