Merge pull request #475 from 2DU/master

Master

func.py

@@ -544,56 +544,53 @@ def re_error(data):
             data = '<h2>Error</h2><ul>' + end + '</ul>',
             menu = 0
         ))
+    else:
+        error_data = re.search('\/error\/([0-9]+)', data)
+        if error_data:
+            num = int(error_data.groups()[0])
+            if num == 1:
+                data = load_lang('no_login_error')
+            elif num == 2:
+                data = load_lang('no_exist_user_error')
+            elif num == 3:
+                data = load_lang('authority_error')
+            elif num == 4:
+                data = load_lang('no_admin_block_error')
+            elif num == 6:
+                data = load_lang('same_id_exist_error')
+            elif num == 7:
+                data = load_lang('long_id_error')
+            elif num == 8:
+                data = load_lang('id_char_error')
+            elif num == 9:
+                data = load_lang('file_exist_error')
+            elif num == 10:
+                data = load_lang('password_error')
+            elif num == 13:
+                data = load_lang('recaptcha_error')
+            elif num == 14:
+                data = load_lang('file_extension_error')
+            elif num == 15:
+                data = load_lang('edit_record_error')
+            elif num == 16:
+                data = load_lang('same_file_error')
+            elif num == 17:
+                data = load_lang('file_capacity_error') + ' ' + wiki_set(3)
+            elif num == 19:
+                data = load_lang('decument_exist_error')
+            elif num == 20:
+                data = load_lang('password_diffrent_error')
+            elif num == 21:
+                data = load_lang('edit_filter_error')
+            elif num == 22:
+                data = load_lang('file_name_error')
+            else:
+                data = '???'
 
-    error_data = re.search('\/error\/([0-9]+)', data)
-    if error_data:
-        num = int(error_data.groups()[0])
-        if num == 1:
-            data = load_lang('no_login_error')
-        elif num == 2:
-            data = load_lang('no_exist_user_error')
-        elif num == 3:
-            data = load_lang('authority_error')
-        elif num == 4:
-            data = load_lang('no_admin_block_error')
-        elif num == 6:
-            data = load_lang('same_id_exist_error')
-        elif num == 7:
-            data = load_lang('long_id_error')
-        elif num == 8:
-            data = load_lang('id_char_error')
-        elif num == 9:
-            data = load_lang('file_exist_error')
-        elif num == 10:
-            data = load_lang('password_error')
-        elif num == 13:
-            data = load_lang('recaptcha_error')
-        elif num == 14:
-            data = load_lang('file_extension_error')
-        elif num == 15:
-            data = load_lang('edit_record_error')
-        elif num == 16:
-            data = load_lang('same_file_error')
-        elif num == 17:
-            data = load_lang('file_capacity_error') + ' ' + wiki_set(3)
-        elif num == 19:
-            data = load_lang('decument_exist_error')
-        elif num == 20:
-            data = load_lang('password_diffrent_error')
-        elif num == 21:
-            data = load_lang('edit_filter_error')
-        elif num == 22:
-            data = load_lang('file_name_error')
-        else:
-            data = '???'
-
-        if title:
             return css_html_js_minify.html_minify(flask.render_template(skin_check(), 
                 imp = ['Error', wiki_set(1), custom(), other2([0, 0])],
                 data = '<h2>Error</h2><ul><li>' + data + '</li></ul>',
                 menu = 0
             ))
         else:
-            return redirect('/')
-    else:
-        return redirect('/')
+            return redirect('/')

set_mark/start.py

@@ -615,7 +615,6 @@ def start(conn, data, title, lang):
     data = tool.savemark(data)
     
     data = re.sub("\[anchor\((?P<in>(?:(?!\)\]).)+)\)\]", '<span id="\g<in>"></span>', data)          
-    data = re.sub("\[nicovideo\((?P<in>(?:(?!,|\)\]).)+)(?:(?:(?!\)\]).)*)\)\]", "[[http://embed.nicovideo.jp/watch/\g<in>|\g<in>]]", data)
     data = re.sub('\[ruby\((?P<in>(?:(?!,).)+)\, ?(?P<out>(?:(?!\)\]).)+)\)\]', '<ruby>\g<in><rp>(</rp><rt>\g<out></rt><rp>)</rp></ruby>', data)
 
     # 원래 코드 재탕
@@ -661,7 +660,7 @@ def start(conn, data, title, lang):
 
     # 유튜브, 카카오 티비 처리
     while 1:
-        video = re.search('\[(youtube|kakaotv)\(((?:(?!\)\]).)+)\)\]', data)
+        video = re.search('\[(youtube|kakaotv|nicovideo)\(((?:(?!\)\]).)+)\)\]', data)
         if video:
             video = video.groups()
             
@@ -691,13 +690,15 @@ def start(conn, data, title, lang):
                 video_code = re.sub('^https:\/\/youtu\.be\/', '', video_code)
                 
                 video_src = 'https://www.youtube.com/embed/' + video_code
-            else:
+            elif video[0] == 'kakaotv':
                 video_code = re.sub('^https:\/\/tv\.kakao\.com\/channel\/9262\/cliplink\/', '', video_code)
                 video_code = re.sub('^http:\/\/tv\.kakao\.com\/v\/', '', video_code)
                 
                 video_src = 'https://tv.kakao.com/embed/player/cliplink/' + video_code +'?service=kakao_tv'
+            else:
+                video_src = 'https://embed.nicovideo.jp/watch/' + video_code
                 
-            data = re.sub('\[(youtube|kakaotv)\(((?:(?!\)\]).)+)\)\]', '<iframe width="' + video_width + '" height="' + video_height + '" src="' + video_src + '" allowfullscreen frameborder="0"></iframe>', data, 1)
+            data = re.sub('\[(youtube|kakaotv|nicovideo)\(((?:(?!\)\]).)+)\)\]', '<iframe width="' + video_width + '" height="' + video_height + '" src="' + video_src + '" allowfullscreen frameborder="0"></iframe>', data, 1)
         else:
             break