From 98d462c8e67e292188f2614a3cc9db6136320351 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Tue, 23 Feb 2016 12:17:04 +0000 Subject: bitbake: toaster: show suffix for image files and basename for artifact files The build dashboard doesn't show image and artifact files correctly, as it shows the full filename for images and the filename plus path relative to DEPLOY_DIR for artifacts. Instead, show just the suffix for image files, and the basename for artifact files. (Bitbake rev: 8084dcdc283b4dc170f066c202f89d56ce1abbef) Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bitbake/lib/toaster/orm') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index ab6940feaf..93b5df3d4e 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -550,6 +550,8 @@ class BuildArtifact(models.Model): return self.file_name + def get_basename(self): + return os.path.basename(self.file_name) def is_available(self): return self.build.buildrequest.environment.has_artifact(self.file_name) @@ -588,6 +590,12 @@ class Target_Image_File(models.Model): file_name = models.FilePathField(max_length=254) file_size = models.IntegerField() + @property + def suffix(self): + filename, suffix = os.path.splitext(self.file_name) + suffix = suffix.lstrip('.') + return suffix + class Target_File(models.Model): ITYPE_REGULAR = 1 ITYPE_DIRECTORY = 2 -- cgit v1.2.3-54-g00ecf