Browse Source

이미지 버그 수정, alt 기능 추가

잉여개발기 (SPDV) 5 năm trước cách đây
mục cha
commit
8d0506a062
3 tập tin đã thay đổi với 12 bổ sung6 xóa
  1. 2 2
      app.py
  2. 8 2
      route/tool/set_mark/namumark.py
  3. 2 2
      version.json

+ 2 - 2
app.py

@@ -622,7 +622,7 @@ def user_count_edit(name = None):
 def func_title_random():
     return func_title_random_2(conn)
 
-@app.route('/image/<name>')
+@app.route('/image/<everything:name>')
 def main_image_view(name = None):
     return main_image_view_2(conn, name, app_var)
 
@@ -705,7 +705,7 @@ def api_sha224(name = 'test'):
 def api_title_index():
     return api_title_index_2(conn)
 
-@app.route('/api/image/<name>')
+@app.route('/api/image/<everything:name>')
 def api_image_view(name = ''):
     return api_image_view_2(conn, name, app_var)
 

+ 8 - 2
route/tool/set_mark/namumark.py

@@ -1031,10 +1031,16 @@ def namumark(conn, data, title, include_num):
                 else:
                     file_color = ''
 
+                file_alt = re.search(r'alt=((?:(?!&).)+)', see_link)
+                if file_alt:
+                    file_alt = file_alt.group(1)
+                else:
+                    file_alt = ''
+
                 if re.search(r'^(?:out|외부):', main_link):
                     file_src = re.sub(r'^(?:out|외부):', '', main_link)
 
-                    file_alt = main_link
+                    file_alt = main_link if file_alt == '' else file_alt
                     exist = 'Yes'
                 else:
                     file_data = re.search(r'^(?:file|파일):((?:(?!\.).)+)\.(.+)$', main_link)
@@ -1050,7 +1056,7 @@ def namumark(conn, data, title, include_num):
                         file_end = 'jpg'
 
                     file_src = '/image/' + tool.sha224_replace(file_name) + '.' + file_end
-                    file_alt = 'file:' + file_name + '.' + file_end
+                    file_alt = ('file:' + file_name + '.' + file_end) if file_alt == '' else file_alt
                     exist = None
 
                 data = link_re.sub(

+ 2 - 2
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.2.0-master-21 (v3.2.0-dev-20200806-03)",
+        "r_ver" : "v3.2.0-master-21 (v3.2.0-dev-20200808-01)",
         "c_ver" : "3201601",
         "s_ver" : "9"
     }, "stable" : {
@@ -8,4 +8,4 @@
         "c_ver" : "3200900",
         "s_ver" : "9"
     }
-}
+}