From patchwork Fri Jan 3 15:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1217354 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aFkTn6Kw"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47q7pz0QpJz9sPn for ; Sat, 4 Jan 2020 02:19:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5431C849BE; Fri, 3 Jan 2020 15:19:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RCCMQ620BM6T; Fri, 3 Jan 2020 15:19:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1269F859FC; Fri, 3 Jan 2020 15:19:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 37DB71BF599 for ; Fri, 3 Jan 2020 15:19:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 33B7A20445 for ; Fri, 3 Jan 2020 15:19:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OwqG2J7C2jWF for ; Fri, 3 Jan 2020 15:18:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by silver.osuosl.org (Postfix) with ESMTPS id D9E202036D for ; Fri, 3 Jan 2020 15:18:58 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id d73so8686763wmd.1 for ; Fri, 03 Jan 2020 07:18:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fzAmMYi6EkRW0NV1fQDcCyGSzR8btDUr9CMvGw1uNL8=; b=aFkTn6KwsNWByk+SwW+5Mkw24OgNp2NQZkzN4x+NHqjNQDZ77f2XIur6sy9Uy5CiJw R5WCpk23Vf2I2cxgAExxCuvrchQjZ+HqyRcJFK3BNjlgKKnoSwHrJK1DX74mXU6Wnce4 F7pyU5EDm9TPxBHCQY3qYoomMK6m48OgIEauxMgjzk3tCA3m1G75wAby4CJ+cFnx55hS IU/xmtAKnJRRpDsH8vL84JLo9JrR1PKqlJyTJyTgGc0v/uw2X4JTp6RG3XQfRY3FL4bU DjH3bDTt/yo5LNR9bW1J6PvcL+/WALUJ/cEZLcGmgEzbx649ubUy2oyURoUyC6ARca0D /JUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fzAmMYi6EkRW0NV1fQDcCyGSzR8btDUr9CMvGw1uNL8=; b=Fx+1OVzlsCX01tHWjNi0jBrUAICfQpDQ+/T4Lpo83P1R8A4UjdMOa/5cKm0Xl1hFtF W5tfvcNmIVi+ACNVWucNO4nVNy+ie57crr/5aZHhZVsLOnodZv6JeFiLc5x4LskoDYxW p4866fT2vm/F3R69k1wOJnh89arOX5UZZP4C7C2R2+zvLb1scjdLmxiHW1iZ6S44C/Qp ceRY30VOTUFI5tCohtMnX5bZfHFCvvZ0HBb6Ed1SOEe062n4udH/YWfaoJtfnYffwLGH 4tleHk55PDwwJszlbPOyiKqdBQndxU5JqSltLqsIArAVRxhDSyDt/7HnVKvofkkyZ6Kx J02Q== X-Gm-Message-State: APjAAAUfvVmw2k8IKJ6hHJBf1vmOqRlZAbLxE9pOeD6OnMQRaoZEW++S wPVZk7MYGvjFPzls8rhQxl4luzLm X-Google-Smtp-Source: APXvYqzDOCOx2UngfV30XW05ubjajs7Ylgfk0A/PNkAXkmnDMQ+KuNb4kek9Z1QC0DY2Iifr4YkxXA== X-Received: by 2002:a1c:6406:: with SMTP id y6mr20340840wmb.144.1578064737102; Fri, 03 Jan 2020 07:18:57 -0800 (PST) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id u16sm12460565wmj.41.2020.01.03.07.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2020 07:18:56 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Fri, 3 Jan 2020 16:18:38 +0100 Message-Id: <20200103151849.10956-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200103151849.10956-1-heiko.thiery@gmail.com> References: <20200103151849.10956-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 01/11] support/scripts/pkg-stats: store latest version in a hash X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch changes the name and the variable from latest_verion of type list to rm_status of type hash. This is for better readability/usability of the data. With this the json output is more descriptive. Signed-off-by: Heiko Thiery --- support/scripts/pkg-stats | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index e477828f7b..8c64993aaf 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -61,7 +61,7 @@ class Package: self.url = None self.url_status = None self.url_worker = None - self.latest_version = (RM_API_STATUS_ERROR, None, None) + self.rm_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} def pkgvar(self): return self.name.upper().replace("-", "_") @@ -331,11 +331,10 @@ def check_package_latest_version_worker(name): def check_package_latest_version(packages): """ - Fills in the .latest_version field of all Package objects + Fills in the .rm_version field of all Package objects + + This field is a dict and has the following keys: - This field has a special format: - (status, version, id) - with: - status: one of RM_API_STATUS_ERROR, RM_API_STATUS_FOUND_BY_DISTRO, RM_API_STATUS_FOUND_BY_PATTERN, RM_API_STATUS_NOT_FOUND @@ -351,7 +350,9 @@ def check_package_latest_version(packages): worker_pool = Pool(processes=64) results = worker_pool.map(check_package_latest_version_worker, (pkg.name for pkg in packages)) for pkg, r in zip(packages, results): - pkg.latest_version = r + pkg.rm_version['status'] = r[0] + pkg.rm_version['version'] = r[1] + pkg.rm_version['id'] = r[2] del http_pool @@ -379,13 +380,13 @@ def calculate_stats(packages): stats["hash"] += 1 else: stats["no-hash"] += 1 - if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO: + if pkg.rm_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO: stats["rmo-mapping"] += 1 else: stats["rmo-no-mapping"] += 1 - if not pkg.latest_version[1]: + if not pkg.rm_version['version']: stats["version-unknown"] += 1 - elif pkg.latest_version[1] == pkg.current_version: + elif pkg.rm_version['version'] == pkg.current_version: stats["version-uptodate"] += 1 else: stats["version-not-uptodate"] += 1 @@ -548,29 +549,29 @@ def dump_html_pkg(f, pkg): f.write(" %s\n" % current_version) # Latest version - if pkg.latest_version[0] == RM_API_STATUS_ERROR: + if pkg.rm_version['status'] == RM_API_STATUS_ERROR: td_class.append("version-error") - if pkg.latest_version[1] is None: + if pkg.rm_version['version'] is None: td_class.append("version-unknown") - elif pkg.latest_version[1] != pkg.current_version: + elif pkg.rm_version['version'] != pkg.current_version: td_class.append("version-needs-update") else: td_class.append("version-good") - if pkg.latest_version[0] == RM_API_STATUS_ERROR: + if pkg.rm_version['status'] == RM_API_STATUS_ERROR: latest_version_text = "Error" - elif pkg.latest_version[0] == RM_API_STATUS_NOT_FOUND: + elif pkg.rm_version['status'] == RM_API_STATUS_NOT_FOUND: latest_version_text = "Not found" else: - if pkg.latest_version[1] is None: + if pkg.rm_version['version'] is None: latest_version_text = "Found, but no version" else: latest_version_text = "%s" % \ - (pkg.latest_version[2], str(pkg.latest_version[1])) + (pkg.rm_version['id'], str(pkg.rm_version['version'])) latest_version_text += "
" - if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO: + if pkg.rm_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO: latest_version_text += "found by distro" else: latest_version_text += "found by guess"