surplus-dev 2 lat temu
rodzic
commit
1ee20348aa
4 zmienionych plików z 9 dodań i 1 usunięć
  1. 2 0
      requirements.txt
  2. 1 0
      route/tool/func.py
  3. 5 0
      route/view_read.py
  4. 1 1
      version.json

+ 2 - 0
requirements.txt

@@ -6,4 +6,6 @@ waitress
 requests
 diff-match-patch
 
+pillow
+
 pymysql

+ 1 - 0
route/tool/func.py

@@ -81,6 +81,7 @@ import werkzeug.debug
 import flask
 
 import requests
+from PIL import Image
 
 try:
     import mysqlclient as pymysql

+ 5 - 0
route/view_read.py

@@ -135,13 +135,18 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
             file_all_name = sha224_replace(file_name) + '.' + mime_type
             file_path_name = os.path.join(load_image_url(), file_all_name)
             if os.path.exists(file_path_name):
+                img = Image.open(file_path_name)
+                width, height = img.size
+                
                 file_size = str(round(os.path.getsize(file_path_name) / 1000, 1))
+                
                 file_data = '''
                     <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>
                         <tr><td>''' + load_lang('volume') + '''</td><td>''' + file_size + '''KB</td></tr>
+                        <tr><td>''' + load_lang('resolution') + '''</td><td>''' + str(width) + 'x' + str(height) + '''</td></tr>
                     </table>
                     <h2>''' + load_lang('content') + '''</h2>
                 '''

+ 1 - 1
version.json

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