Changeset 66445

Timestamp:

Oct 9, 2015, 6:38:35 AM (9 years ago)

Author:

wenzeslaus

Message:

ignore also https when fixing URLs in addons manuals

Follows r63507. Fixes e.g. Reference link in v.ellipse manual.

File:

• grass-addons/tools/addons/update_manual.py (modified) (4 diffs)

grass-addons/tools/addons/update_manual.py

@@ -8 +8 @@
 import re
 
+
 def get_addons(path):
     return os.walk(path).next()[1]
+
 
 def main(htmlfile, prefix):
@@ -26 +28 @@
     addons = get_addons(os.sep.join(htmlfile.split(os.sep)[:4]))
     for match in re.finditer(pattern, shtml):
-        if match.group(1)[:7] == 'http://':
+        # most common URLs
+        if match.group(1).startswith('http://'):
             continue
+        if match.group(1).startswith('https://'):
+            continue
+        # protocol-relative URL
+        if match.group(1).startswith('//'):
+            continue
+        # TODO: perhaps we could match any *://
+        # link to other addon
         if match.group(1).replace('.html', '') in addons:
             continue
@@ -33 +43 @@
 
     if not pos:
-        return # no match
+        return  # no match
 
     # replace file URIs
@@ -50 +60 @@
         f.close()
 
+
 if __name__ == "__main__":
     if len(sys.argv) != 3: