Bladeren bron

https://github.com/openNAMU/openNAMU/issues/1967

잉여개발기 (SPDV) 2 jaren geleden
bovenliggende
commit
d03bb44554
4 gewijzigde bestanden met toevoegingen van 12 en 3 verwijderingen
  1. 1 0
      route/main_view_image.py
  2. 5 1
      route/tool/func_render_namumark.py
  3. 5 1
      route/view_read.py
  4. 1 1
      version.json

+ 1 - 0
route/main_view_image.py

@@ -3,6 +3,7 @@ from .main_func_error_404 import main_func_error_404
 
 def main_view_image(name = ''):
     with get_db_connect() as conn:
+        name = re.sub(r'\.cache_v(?:[0-9]+)$', '', name)
         mime_type = re.search(r'([^.]+)$', name)
         if mime_type:
             mime_type = mime_type.group(1).lower()

+ 5 - 1
route/tool/func_render_namumark.py

@@ -896,6 +896,10 @@ class class_do_render_namumark:
                             link_exist = 'opennamu_not_exist_link'
                             self.data_backlink['file:' + link_main]['no'] = ''
 
+                        self.curs.execute(db_change('select id from history where title = ? order by date desc limit 1'), ['file:' + link_main])
+                        db_data = self.curs.fetchall()
+                        rev = db_data[0][0] if db_data else '1' 
+
                         self.data_backlink['file:' + link_main]['file'] = ''
 
                         link_extension_regex = r'\.([^.]+)$'
@@ -908,7 +912,7 @@ class class_do_render_namumark:
                         link_main = re.sub(link_extension_regex, '', link_main)
                         link_main_org = link_main
 
-                        link_main = '/image/' + url_pas(sha224_replace(link_main)) + '.' + link_extension
+                        link_main = '/image/' + url_pas(sha224_replace(link_main)) + '.' + link_extension + '.cache_v' + rev
 
                     if file_width != '':
                         file_width = 'width:' + self.get_tool_css_safe(file_width) + ';'

+ 5 - 1
route/view_read.py

@@ -116,6 +116,10 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
             if name == 'user:' + user_name:
                 menu += [['w/' + url_pas(name) + '/' + url_pas(now_time.split()[0]), load_lang('today_doc')]]
         elif re.search(r"^file:", name):
+            curs.execute(db_change('select id from history where title = ? order by date desc limit 1'), [name])
+            db_data = curs.fetchall()
+            rev = db_data[0][0] if db_data else '1' 
+
             name_view = name
             doc_type = 'file'
 
@@ -133,7 +137,7 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
             if os.path.exists(file_path_name):
                 file_size = str(round(os.path.getsize(file_path_name) / 1000, 1))
                 file_data = '''
-                    <img src="/image/''' + url_pas(file_all_name) + '''">
+                    <img src="/image/''' + url_pas(file_all_name) + '''.cache_v''' + rev + '''">
                     <h2>''' + load_lang('data') + '''</h2>
                     <table>
                         <tr><td>URL</td><td><a href="/image/''' + url_pas(file_all_name) + '''">''' + load_lang('link') + '''</a></td></tr>

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev44",
+        "r_ver" : "v3.4.6-RC5-dev45",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }