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

import_otherdistro: refactor spec file import

Browse Source 
Split out spec file import to its own function.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2019-03-25 16:54:44 +13:00
parent 4e7c81a0b9
commit 41c249d067
1 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
layerindex/tools/import_otherdistro.py
View File

@ -349,6 +349,52 @@ def get_update_obj(args):
return updateobj return updateobj
def import_specdir(metapath, layerbranch, existing, updateobj, pwriter):
dirlist = os.listdir(metapath)
total = len(dirlist)
for count, entry in enumerate(dirlist):
if os.path.exists(os.path.join(metapath, entry, 'dead.package')):
logger.info('Skipping dead package %s' % entry)
continue
specfiles = glob.glob(os.path.join(metapath, entry, '*.spec'))
if specfiles:
import_specfiles(specfiles, layerbranch, existing, updateobj, metapath)
else:
logger.warn('Missing spec file in %s' % os.path.join(metapath, entry))
if pwriter:
pwriter.write(int(count / total * 100))
def import_specfiles(specfiles, layerbranch, existing, updateobj, reldir):
from layerindex.models import ClassicRecipe, ComparisonRecipeUpdate
recipes = []
for specfile in specfiles:
specfn = os.path.basename(specfile)
specpath = os.path.relpath(os.path.dirname(specfile), reldir)
recipe, created = ClassicRecipe.objects.get_or_create(layerbranch=layerbranch, filepath=specpath, filename=specfn)
if created:
logger.info('Importing %s' % specfn)
elif recipe.deleted:
logger.info('Restoring and updating %s' % specpath)
recipe.deleted = False
else:
logger.info('Updating %s' % specpath)
recipe.layerbranch = layerbranch
recipe.filename = specfn
recipe.filepath = specpath
update_recipe_file(specfile, recipe, reldir)
recipe.save()
existingentry = (specpath, specfn)
if existingentry in existing:
existing.remove(existingentry)
if updateobj:
rupdate, _ = ComparisonRecipeUpdate.objects.get_or_create(update=updateobj, recipe=recipe)
rupdate.meta_updated = True
rupdate.save()
recipes.append(recipe)
return recipes
def import_pkgspec(args): def import_pkgspec(args):
utils.setup_django() utils.setup_django()
import settings import settings
@ -371,43 +417,8 @@ def import_pkgspec(args):
try: try:
with transaction.atomic(): with transaction.atomic():
layerrecipes = ClassicRecipe.objects.filter(layerbranch=layerbranch) layerrecipes = ClassicRecipe.objects.filter(layerbranch=layerbranch)
existing = list(layerrecipes.filter(deleted=False).values_list('filepath', 'filename')) existing = list(layerrecipes.filter(deleted=False).values_list('filepath', 'filename'))
dirlist = os.listdir(metapath) import_specdir(metapath, layerbranch, existing, updateobj, pwriter)
total = len(dirlist)
for count, entry in enumerate(dirlist):
if os.path.exists(os.path.join(metapath, entry, 'dead.package')):
logger.info('Skipping dead package %s' % entry)
continue
specfiles = glob.glob(os.path.join(metapath, entry, '*.spec'))
if specfiles:
for specfile in specfiles:
specfn = os.path.basename(specfile)
specpath = os.path.relpath(os.path.dirname(specfile), metapath)
recipe, created = ClassicRecipe.objects.get_or_create(layerbranch=layerbranch, filepath=specpath, filename=specfn)
if created:
logger.info('Importing %s' % specfn)
elif recipe.deleted:
logger.info('Restoring and updating %s' % specpath)
recipe.deleted = False
else:
logger.info('Updating %s' % specpath)
recipe.layerbranch = layerbranch
recipe.filename = specfn
recipe.filepath = specpath
update_recipe_file(specfile, recipe, metapath)
recipe.save()
existingentry = (specpath, specfn)
if existingentry in existing:
existing.remove(existingentry)
if updateobj:
rupdate, _ = ComparisonRecipeUpdate.objects.get_or_create(update=updateobj, recipe=recipe)
rupdate.meta_updated = True
rupdate.save()
else:
logger.warn('Missing spec file in %s' % os.path.join(metapath, entry))
if pwriter:
pwriter.write(int(count / total * 100))
if existing: if existing:
fpaths = sorted(['%s/%s' % (pth, fn) for pth, fn in existing]) fpaths = sorted(['%s/%s' % (pth, fn) for pth, fn in existing])