mod onmark

route/api_image_view.py

@@ -6,4 +6,4 @@ def api_image_view_2(conn, name, app_var):
     if os.path.exists(os.path.join(app_var['path_data_image'], name)):
         return flask.jsonify({ "exist" : "1" })
     else:
-        return flask.jsonify({})
+        return flask.jsonify({ "exist" : "0" })

route/tool/func.py

@@ -65,7 +65,7 @@ for i in range(0, 2):
 
 global_lang = {}
 
-data_css_ver = '76'
+data_css_ver = '77'
 data_css = ''
 
 conn = ''

views/main_css/js/load_topic.js

@@ -46,11 +46,11 @@ function new_topic_load(topic_num, type_do = 'top', some = '', where = 'top_topi
                     data_i_pas = data_i_pas.replace(
                         /<topic_a>((?:(?!<\/topic_a>).)+)<\/topic_a>/g,
                         '<a href="$1">$1</a>'
-                    )
+                    );
                     data_i_pas = data_i_pas.replace(
                         /&lt;topic_call&gt;((?:(?!&lt;\/topic_call&gt;).)+)&lt;\/topic_call&gt;/g,
                         '<a href="/w/user:$1">@$1</a>', 
-                    )
+                    );
                 }
                 
                 if(blind === 'O') {

views/main_css/js/render_namumark.js

@@ -27,7 +27,8 @@ function load_image_link(data) {
     '';
 }
 
-function get_file_state(data, i = 0) {       
+function get_file_state(data, i = 0) {      
+    // 개인적인 생각엔 이 부분 개편 필요
     var get_class = document.getElementsByClassName(data + 'file_finder')[i];
     if(get_class) {            
         if(get_class.getAttribute('under_href') === 'out_link') {
@@ -63,48 +64,62 @@ function get_file_state(data, i = 0) {
                 '';
             }
         } else {
+            var file_type = get_class.getAttribute('under_src').split('.');
+            var file_name = file_type.slice(0, file_type.length - 1).join('.');
+            file_type = file_type[file_type.length - 1].toLowerCase();
+            
             var xhr = new XMLHttpRequest();
-            xhr.open("GET", get_class.getAttribute('under_src').replace('/image/', '/api/image/'));
+            xhr.open("GET", '/api/sha224/' + file_name);
             xhr.send();
             
             xhr.onreadystatechange = function() {
                 if(this.readyState === 4 && this.status === 200) {
-                    if(JSON.parse(this.responseText)['exist'] !== '1') {
-                        document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
-                            '<a href="' + get_class.getAttribute('under_href') + '" ' + 
-                                'id="not_thing">' +
-                                '(' + get_class.getAttribute('under_alt') + ')' +
-                            '</a>' +
-                        '';
-                    } else {
-                        if(
-                            document.cookie.match(main_css_regex_data('main_css_image_set')) &&
-                            document.cookie.match(main_css_regex_data('main_css_image_set'))[1] === '1'
-                        ) {
-                            document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
-                                '<a href="' + get_class.getAttribute('under_src') + '">' +
-                                    '(' + get_class.getAttribute('under_alt') + ')' +
-                                '</a>' +
-                            '';
-                        } else if(
-                            document.cookie.match(main_css_regex_data('main_css_image_set')) &&
-                            document.cookie.match(main_css_regex_data('main_css_image_set'))[1] === '2'
-                        ) {
-                            document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
-                                '<a href="javascript:void(0);" ' +
-                                    'onclick="load_image_link(this); this.onclick = \'\';" ' + 
-                                    'under_style="' + get_class.getAttribute('under_style') + '" ' +
-                                    'under_alt="' + get_class.getAttribute('under_alt') + '" ' +
-                                    'under_src="' + get_class.getAttribute('under_src') + '">' + 
-                                    '(' + get_class.getAttribute('under_alt') + ' load)' +
-                                '</a>' +
-                            '';
-                        } else {
-                            document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
-                                '<img   style="' + get_class.getAttribute('under_style') + '" ' + 
-                                        'alt="' + get_class.getAttribute('under_alt') + '" ' + 
-                                        'src="' + get_class.getAttribute('under_src') + '">' +
-                            '';
+                    file_name = JSON.parse(this.responseText)['data'];
+                    
+                    var xhr_2 = new XMLHttpRequest();
+                    xhr_2.open("GET", '/api/image/' + file_name + '.' + file_type);
+                    xhr_2.send();
+
+                    xhr_2.onreadystatechange = function() {
+                        if(this.readyState === 4 && this.status === 200) {
+                            if(JSON.parse(this.responseText)['exist'] !== '1') {
+                                document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
+                                    '<a href="' + get_class.getAttribute('under_href') + '" ' + 
+                                        'id="not_thing">' +
+                                        '(' + get_class.getAttribute('under_alt') + ')' +
+                                    '</a>' +
+                                '';
+                            } else {
+                                if(
+                                    document.cookie.match(main_css_regex_data('main_css_image_set')) &&
+                                    document.cookie.match(main_css_regex_data('main_css_image_set'))[1] === '1'
+                                ) {
+                                    document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
+                                        '<a href="/image/' + file_name + '.' + file_type + '">' +
+                                            '(' + get_class.getAttribute('under_alt') + ')' +
+                                        '</a>' +
+                                    '';
+                                } else if(
+                                    document.cookie.match(main_css_regex_data('main_css_image_set')) &&
+                                    document.cookie.match(main_css_regex_data('main_css_image_set'))[1] === '2'
+                                ) {
+                                    document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
+                                        '<a href="javascript:void(0);" ' +
+                                            'onclick="load_image_link(this); this.onclick = \'\';" ' + 
+                                            'under_style="' + get_class.getAttribute('under_style') + '" ' +
+                                            'under_alt="' + get_class.getAttribute('under_alt') + '" ' +
+                                            'under_src="/image/' + file_name + '.' + file_type + '">' + 
+                                            '(' + get_class.getAttribute('under_alt') + ' load)' +
+                                        '</a>' +
+                                    '';
+                                } else {
+                                    document.getElementsByClassName(data + 'file_finder')[i].innerHTML = '' +
+                                        '<img   style="' + get_class.getAttribute('under_style') + '" ' + 
+                                                'alt="' + get_class.getAttribute('under_alt') + '" ' + 
+                                                'src="/image/' + file_name + '.' + file_type + '">' +
+                                    '';
+                                }
+                            }
                         }
                     }
                 }

views/main_css/js/render_onmark.js

@@ -166,19 +166,62 @@ function do_onmark_link_render(data, data_js, name_doc, name_include, data_nowik
         if(link_real.match(file_re)) {
             var file_load_type = link_real.match(file_re)[1];
             var file_name = link_real.replace(file_re, '');
-            
-            // 아직 더 짜야함
-            console.log([link_real, link_out_2]);
-        
+                 
             if(file_load_type === '파일' || file_load_type === 'file') {
                 var file_type = file_name.split('.');
                 file_name = file_type.slice(0, file_type.length - 1).join('.');
-                file_type = file_type[file_type.length - 1].toLowerCase();
+                file_type = file_type[file_type.length - 1];
+                
+                var file_src = do_url_change(file_name) + '.' + file_type;       
+                var file_alt = file_name + '.' + file_type;
+                var file_exist = 1;
+            } else {
+                var file_src = file_name;
+                var file_alt = file_name;
+                var file_exist = 0;
             }
             
-            console.log(file_name, file_load_type, file_type);
+            var file_style = '';
+            var file_bgcolor = '';
+            var file_align = '';
             
-            return '';
+            var file_set = link_out_2.split('&');
+            var i = 0;
+            while(file_set[i]) {
+                var file_set_name = file_set[i].split('=');
+                var file_set_data = file_set_name[1];
+                file_set_name = file_set_name[0];
+                
+                if(file_set_name === 'width') {
+                    file_style += 'width:' + file_set_data + ';';
+                } else if(file_set_name === 'height') {
+                    file_style += 'height:' + file_set_data + ';';
+                } else if(file_set_name === 'bgcolor') {
+                    file_bgcolor += 'background:' + file_set_data + ';';
+                } else if(file_set_name === 'alt') {
+                    file_alt += file_set_data;
+                } else if(file_set_name === 'align') {
+                    if(file_set_data === 'center') {
+                        file_align = 'display: block; text-align: center;';
+                    } else {
+                        file_align = 'float: ' + file_set_data + ';';
+                    }
+                } 
+                
+                i += 1;
+            }
+            
+            return '' +
+                '<span style="' + file_align + '">' + 
+                    '<span  style="' + file_bgcolor + '" ' +
+                            'class="' + name_include + 'file_finder" ' +
+                            'under_style="' + file_style + '" ' +
+                            'under_alt="' + file_alt + '" ' +
+                            'under_src="' + file_src + '" ' +
+                            'under_href="' + (file_exist === 0 ? "out_link" : '/upload?name=' + do_url_change(file_name)) + '">' +
+                    '</span>' + 
+                '</span>' +
+            ''
         } else if(link_real.match(category_re)) {
             var category_link = link_real.replace(category_re, '');