[pbs-devel] [PATCH proxmox-backup] scanrefs: match all instances of 'onlineHelp' in js files

[pbs-devel] [PATCH proxmox-backup] scanrefs: match all instances of 'onlineHelp' in js files

[Oguz Bektas]

previously it looked for the first instance. this behavior
became an issue while trying to add multiple onlineHelp buttons

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
 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

[pbs-devel] applied: [PATCH proxmox-backup] scanrefs: match all instances of 'onlineHelp' in js files

[Thomas Lamprecht]

On 05.10.20 16:57, Oguz Bektas wrote:
> previously it looked for the first instance. this behavior
> became an issue while trying to add multiple onlineHelp buttons
> 
> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> ---
>  docs/_ext/proxmox-scanrefs.py | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
>

applied, thanks!