MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

update.py: preserve recipe id when updating

Browse Source 
The recipe detail pages use the recipe record id, so in case users
bookmark links to these pages, try to preserve the id when a recipe
upgrade occurs (which usually shows up as a delete and an add). This
also works when doing a full update with -r so that we can capture the
newly recorded items (bbclasses, bbappends) without having all the
recipe id values change.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-06-16 02:24:47 +01:00
parent 413c1ffb7a
commit e36280922a
2 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,7 +1,6 @@
TODO: TODO:
* Duplication of first maintainer when editing to add a second? * Duplication of first maintainer when editing to add a second?
* Try to re-use existing recipe record with same PN instead of deleting and re-creating (if within same layer)
* Document macros for URL fields * Document macros for URL fields
Later: Later:

92
layerindex/update.py
View File

@ -69,6 +69,15 @@ def check_machine_conf(path, subdir_start):
return res.group(1) return res.group(1)
return None return None
def split_recipe_fn(path):
splitfn = os.path.basename(path).split('.bb')[0].split('_', 2)
pn = splitfn[0]
if len(splitfn) > 1:
pv = splitfn[1]
else:
pv = "1.0"
return (pn, pv)
def update_recipe_file(data, path, recipe, layerdir_start, repodir): def update_recipe_file(data, path, recipe, layerdir_start, repodir):
fn = str(os.path.join(path, recipe.filename)) fn = str(os.path.join(path, recipe.filename))
try: try:
@ -352,6 +361,12 @@ def main():
else: else:
diff = None diff = None
# We handle recipes specially to try to preserve the same id
# when recipe upgrades happen (so that if a user bookmarks a
# recipe page it remains valid)
layerrecipes_delete = []
layerrecipes_add = []
if diff: if diff:
# Apply git changes to existing recipe list # Apply git changes to existing recipe list
@ -366,7 +381,10 @@ def main():
if path.startswith(subdir_start): if path.startswith(subdir_start):
(typename, filepath, filename) = detect_file_type(path, subdir_start) (typename, filepath, filename) = detect_file_type(path, subdir_start)
if typename == 'recipe': if typename == 'recipe':
layerrecipes.filter(filepath=filepath).filter(filename=filename).delete() values = layerrecipes.filter(filepath=filepath).filter(filename=filename).values('id', 'filepath', 'filename', 'pn')
layerrecipes_delete.append(values[0])
logger.debug("Mark %s for deletion" % values[0])
updatedrecipes.add(os.path.join(values[0]['filepath'], values[0]['filename']))
elif typename == 'bbappend': elif typename == 'bbappend':
layerappends.filter(filepath=filepath).filter(filename=filename).delete() layerappends.filter(filepath=filepath).filter(filename=filename).delete()
elif typename == 'machine': elif typename == 'machine':
@ -379,13 +397,9 @@ def main():
if path.startswith(subdir_start): if path.startswith(subdir_start):
(typename, filepath, filename) = detect_file_type(path, subdir_start) (typename, filepath, filename) = detect_file_type(path, subdir_start)
if typename == 'recipe': if typename == 'recipe':
recipe = Recipe() layerrecipes_add.append(os.path.join(repodir, path))
recipe.layerbranch = layerbranch logger.debug("Mark %s for addition" % path)
recipe.filename = filename updatedrecipes.add(os.path.join(filepath, filename))
recipe.filepath = filepath
update_recipe_file(config_data_copy, os.path.join(layerdir, filepath), recipe, layerdir_start, repodir)
recipe.save()
updatedrecipes.add(recipe)
elif typename == 'bbappend': elif typename == 'bbappend':
append = BBAppend() append = BBAppend()
append.layerbranch = layerbranch append.layerbranch = layerbranch
@ -410,12 +424,13 @@ def main():
if path.startswith(subdir_start): if path.startswith(subdir_start):
(typename, filepath, filename) = detect_file_type(path, subdir_start) (typename, filepath, filename) = detect_file_type(path, subdir_start)
if typename == 'recipe': if typename == 'recipe':
logger.debug("Mark %s for update" % path)
results = layerrecipes.filter(filepath=filepath).filter(filename=filename)[:1] results = layerrecipes.filter(filepath=filepath).filter(filename=filename)[:1]
if results: if results:
recipe = results[0] recipe = results[0]
update_recipe_file(config_data_copy, os.path.join(layerdir, filepath), recipe, layerdir_start, repodir) update_recipe_file(config_data_copy, os.path.join(layerdir, filepath), recipe, layerdir_start, repodir)
recipe.save() recipe.save()
updatedrecipes.add(recipe) updatedrecipes.add(recipe.full_path())
elif typename == 'machine': elif typename == 'machine':
results = layermachines.filter(name=filename) results = layermachines.filter(name=filename)
if results: if results:
@ -427,12 +442,28 @@ def main():
for dep in deps: for dep in deps:
dirtyrecipes.add(dep.recipe) dirtyrecipes.add(dep.recipe)
dirtyrecipes -= updatedrecipes
for recipe in dirtyrecipes: for recipe in dirtyrecipes:
if not recipe.full_path() in updatedrecipes:
update_recipe_file(config_data_copy, os.path.join(layerdir, recipe.filepath), recipe, layerdir_start, repodir) update_recipe_file(config_data_copy, os.path.join(layerdir, recipe.filepath), recipe, layerdir_start, repodir)
else: else:
# Collect recipe data from scratch # Collect recipe data from scratch
layerrecipes.delete()
# First, check which recipes still exist
layerrecipe_values = layerrecipes.values('id', 'filepath', 'filename', 'pn')
layerrecipe_fns = []
for v in layerrecipe_values:
root = os.path.join(layerdir, v['filepath'])
fullpath = os.path.join(root, v['filename'])
if os.path.exists(fullpath):
# Recipe still exists, update it
results = layerrecipes.filter(id=v['id'])[:1]
recipe = results[0]
update_recipe_file(config_data_copy, root, recipe, layerdir_start, repodir)
else:
# Recipe no longer exists, mark it for later on
layerrecipes_delete.append(v)
layerrecipe_fns.append(fullpath)
layermachines.delete() layermachines.delete()
layerappends.delete() layerappends.delete()
layerclasses.delete() layerclasses.delete()
@ -443,12 +474,8 @@ def main():
fullpath = os.path.join(root, f) fullpath = os.path.join(root, f)
(typename, _, filename) = detect_file_type(fullpath, layerdir_start) (typename, _, filename) = detect_file_type(fullpath, layerdir_start)
if typename == 'recipe': if typename == 'recipe':
recipe = Recipe() if fullpath not in layerrecipe_fns:
recipe.layerbranch = layerbranch layerrecipes_add.append(fullpath)
recipe.filename = f
recipe.filepath = os.path.relpath(root, layerdir)
update_recipe_file(config_data_copy, root, recipe, layerdir_start, repodir)
recipe.save()
elif typename == 'bbappend': elif typename == 'bbappend':
append = BBAppend() append = BBAppend()
append.layerbranch = layerbranch append.layerbranch = layerbranch
@ -467,6 +494,37 @@ def main():
bbclass.name = filename bbclass.name = filename
bbclass.save() bbclass.save()
for added in layerrecipes_add:
# This is good enough without actually parsing the file
(pn, pv) = split_recipe_fn(added)
oldid = -1
for deleted in layerrecipes_delete:
if deleted['pn'] == pn:
oldid = deleted['id']
layerrecipes_delete.remove(deleted)
break
if oldid > -1:
# Reclaim a record we would have deleted
results = Recipe.objects.filter(id=oldid)[:1]
recipe = results[0]
logger.debug("Reclaim %s for %s %s" % (recipe, pn, pv))
else:
# Create new record
logger.debug("Add new recipe %s" % added)
recipe = Recipe()
recipe.layerbranch = layerbranch
recipe.filename = os.path.basename(added)
root = os.path.dirname(added)
recipe.filepath = os.path.relpath(root, layerdir)
update_recipe_file(config_data_copy, root, recipe, layerdir_start, repodir)
recipe.save()
for deleted in layerrecipes_delete:
logger.debug("Delete %s" % deleted)
results = Recipe.objects.filter(id=deleted['id'])[:1]
recipe = results[0]
recipe.delete()
# Save repo info # Save repo info
layerbranch.vcs_last_rev = topcommit.hexsha layerbranch.vcs_last_rev = topcommit.hexsha
layerbranch.vcs_last_commit = datetime.fromtimestamp(topcommit.committed_date) layerbranch.vcs_last_commit = datetime.fromtimestamp(topcommit.committed_date)