Преглед на файлове

handle not found and remove unused endpoint

Pi преди 4 месеца
родител
ревизия
d592fca43c
променени са 4 файла, в които са добавени 13 реда и са изтрити 27 реда
  1. 5 0
      home-sqlpage/sqlpage/alert.sql
  2. 0 5
      home-sqlpage/sqlpage/status.sql
  3. 8 11
      home-sqlpage/sqlpage/validate.sql
  4. 0 11
      rest/pyapi.py

+ 5 - 0
home-sqlpage/sqlpage/alert.sql

@@ -0,0 +1,5 @@
+SELECT 'alert' AS component
+, $icon AS icon
+, $title AS title
+, $description AS description
+;

+ 0 - 5
home-sqlpage/sqlpage/status.sql

@@ -1,5 +0,0 @@
-SELECT 'alert' AS component
-, 'error-'||$status AS icon
-, $status||' - '||$info AS title
-, $url||' returned: '||$status||' - '||$info AS description
-;

+ 8 - 11
home-sqlpage/sqlpage/validate.sql

@@ -1,15 +1,12 @@
 SET content = (SELECT content FROM clip WHERE hash = $hash);
 
-SET inner = CASE $err IS NULL
-  WHEN TRUE THEN $tool||'/form.sql'
-  ELSE 'sqlpage/status.sql'
-END;
-SET status = CASE $content IS NULL
-  WHEN TRUE THEN '404'
-  ELSE NULL
-END;
-SET info = CASE $content IS NULL
-  WHEN TRUE THEN 'No such '||$tool||': '||$hash
-  ELSE NULL
+SET inner = CASE COALESCE($content,'') = ''
+  WHEN TRUE THEN 'sqlpage/alert.sql'
+  ELSE $tool||'/form.sql'
 END;
+
+SET icon = 'error-404';
+SET status = '404';
+SET title = $status||' - Not found';
+SET description = 'No such '||$tool||': '||$hash;
 SELECT 'dynamic' AS component, sqlpage.run_sql($inner) AS properties;

+ 0 - 11
rest/pyapi.py

@@ -43,17 +43,6 @@ def normalize():
         'o': normalize_base32(_hash) if _hash else None,
     })
 
-@route('/clip/validate', method=['GET'])
-def validate_clip():
-    _hash = request.params.hash
-    ret = _validate(_hash, 'clip', root='rest/static/files')
-    response.content_type = 'application/json'
-    return dumps({
-        'i': _hash,
-        'o': ret.decode('utf-8') if isinstance(ret, bytes) else None,
-        'err': ret[1:] if isinstance(ret, tuple) else None
-    })
-
 @route('/qr', method=['POST'])
 def get_qr():
     data = load(request.body)