From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 465BF63A24 for ; Mon, 5 Oct 2020 16:57:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 387E51BF50 for ; Mon, 5 Oct 2020 16:57:15 +0200 (CEST) Received: from gaia.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BD7E21BF48 for ; Mon, 5 Oct 2020 16:57:14 +0200 (CEST) Received: from gaia.proxmox.com (localhost.localdomain [127.0.0.1]) by gaia.proxmox.com (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 095EvEJ21705396; Mon, 5 Oct 2020 16:57:14 +0200 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 095EvE6u1705395; Mon, 5 Oct 2020 16:57:14 +0200 From: Oguz Bektas To: pbs-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 16:57:10 +0200 Message-Id: <20201005145710.1705112-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.692 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.398 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup] scanrefs: match all instances of 'onlineHelp' in js files X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 14:57:15 -0000 previously it looked for the first instance. this behavior became an issue while trying to add multiple onlineHelp buttons Signed-off-by: Oguz Bektas --- docs/_ext/proxmox-scanrefs.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/_ext/proxmox-scanrefs.py b/docs/_ext/proxmox-scanrefs.py index dd88f462..58176fe5 100644 --- a/docs/_ext/proxmox-scanrefs.py +++ b/docs/_ext/proxmox-scanrefs.py @@ -44,12 +44,13 @@ def scan_extjs_files(wwwdir="../www"): # a bit rough i know, but we can optimize js_files.append(os.path.join(root, filename)) for js_file in js_files: fd = open(js_file).read() - match = re.search("onlineHelp:\s*[\'\"](.*?)[\'\"]", fd) # match object is tuple - if match: - anchor = match.groups()[0] + allmatch = re.findall("onlineHelp:\s*[\'\"](.*?)[\'\"]", fd, re.M) + for match in allmatch: + anchor = match anchor = re.sub('_', '-', anchor) # normalize labels logger.info("found onlineHelp: {} in {}".format(anchor, js_file)) used_anchors.append(anchor) + return used_anchors -- 2.20.1