[TIC-Core] Handle errors when __KS_URL__ fails 90/125690/1
authorMyungJoo Ham <myungjoo.ham@samsung.com>
Tue, 18 Apr 2017 11:20:31 +0000 (20:20 +0900)
committerMyungJoo Ham <myungjoo.ham@samsung.com>
Tue, 18 Apr 2017 11:20:31 +0000 (20:20 +0900)
Change-Id: If7b859768890f498771fcd840f740bd379bcab8d
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
tic/parser/view_parser.py

index af4e6b0..67de806 100644 (file)
@@ -112,18 +112,24 @@ def make_view_data(pkg_group):
                 # e.g., Convert http://a.com/a/ to https://a.com/a/blahblah.ks
                 # Works for file-indexing html
                 if ksURL[-3:].lower() != ".ks":
+                    error = 0
                     if ksURL[-1:] != "/":
                         ksURL += "/"
                     r = requests.get(ksURL)
-                    m = re.search('>([^<]*\\.ks)\\s*<', r.text)
-                    if not m.group(1):
+                    if r.status_code == requests.codes.ok:
+                        m = re.search('>([^<]*\\.ks)\\s*<', r.text)
+                    else:
+                        error = 1
+                    if error == 0 and not m.group(1):
                         m = re.search('"([^"]*\\.ks)\\s*"', r.text)
                         if not m.group(1):
                             m = re.search("'([^']*\\.ks)\\s*'", r.text)
                             if not m.group(1):
-                                node['icon'] = 'glyphicon glyphicon-remove-sign'
-                                node['tooltip'] = 'Cannot find image base from' + ksURL
-                                return node
+                                error = 1
+                    if error == 1:
+                        node['icon'] = 'glyphicon glyphicon-remove-sign'
+                        node['tooltip'] = 'Cannot find image base from' + ksURL
+                        return node
                     ksURL += m.group(1)
                 node['tooltip'] = 'Image base from '+ksURL
                 node['ks'] = ksURL