2022.10.29 (02. Various errors are being processed.)

mod_linkkf.py

@@ -11,6 +11,8 @@ import copy
 
 # third-party
 import requests
+from lxml import html
+from urllib import parse
 
 # third-party
 from flask import request, render_template, jsonify
@@ -79,7 +81,7 @@ class LogicLinkkf(PluginModuleBase):
     def process_menu(self, sub, req):
         arg = P.ModelSetting.to_dict()
         arg["sub"] = self.name
-        if sub in ["setting", "queue", "category", "list", "request"]:
+        if sub in ["setting", "queue", "category", "list", "request", "search"]:
             if sub == "request" and req.args.get("content_code") is not None:
                 arg["linkkf_current_code"] = req.args.get("content_code")
             if sub == "setting":
@@ -97,13 +99,49 @@ class LogicLinkkf(PluginModuleBase):
     def process_ajax(self, sub, req):
         try:
             if sub == "analysis":
-                pass
+                # code = req.form['code']
+                code = request.form["code"]
+
+                wr_id = request.form.get("wr_id", None)
+                bo_table = request.form.get("bo_table", None)
+                data = []
+                # print(code)
+                # logger.info("code::: %s", code)
+                P.ModelSetting.set("ohli24_current_code", code)
+                data = self.get_series_info(code, wr_id, bo_table)
+                self.current_data = data
+                return jsonify({"ret": "success", "data": data, "code": code})
             elif sub == "anime_list":
-                pass
+                data = []
+                cate = request.form["type"]
+                page = request.form["page"]
+
+                data = self.get_anime_info(cate, page)
+                # self.current_data = data
+                return jsonify(
+                    {"ret": "success", "cate": cate, "page": page, "data": data}
+                )
             elif sub == "complete_list":
                 pass
             elif sub == "search":
-                pass
+                data = []
+                # cate = request.form["type"]
+                # page = request.form["page"]
+                cate = request.form["type"]
+                query = request.form["query"]
+                page = request.form["page"]
+
+                data = self.get_search_result(query, page, cate)
+                # self.current_data = data
+                return jsonify(
+                    {
+                        "ret": "success",
+                        "cate": cate,
+                        "page": page,
+                        "query": query,
+                        "data": data,
+                    }
+                )
             elif sub == "add_queue":
                 pass
             elif sub == "entity_list":
@@ -123,9 +161,86 @@ class LogicLinkkf(PluginModuleBase):
             P.logger.error("Exception:%s", e)
             P.logger.error(traceback.format_exc())
 
-    pass
+    def get_anime_info(self, cate, page):
+        try:
+            if cate == "ing":
+                url = (
+                        P.ModelSetting.get("ohli24_url")
+                        + "/bbs/board.php?bo_table="
+                        + cate
+                        + "&page="
+                        + page
+                )
+            elif cate == "movie":
+                url = (
+                        P.ModelSetting.get("ohli24_url")
+                        + "/bbs/board.php?bo_table="
+                        + cate
+                        + "&page="
+                        + page
+                )
+            else:
+                url = (
+                        P.ModelSetting.get("ohli24_url")
+                        + "/bbs/board.php?bo_table="
+                        + cate
+                        + "&page="
+                        + page
+                )
+                # cate == "complete":
+            logger.info("url:::> %s", url)
+            data = {}
+            response_data = LogicOhli24.get_html(url, timeout=10)
+            tree = html.fromstring(response_data)
+            tmp_items = tree.xpath('//div[@class="list-row"]')
+            data["anime_count"] = len(tmp_items)
+            data["anime_list"] = []
 
+            for item in tmp_items:
+                entity = {}
+                entity["link"] = item.xpath(".//a/@href")[0]
+                entity["code"] = entity["link"].split("/")[-1]
+                entity["title"] = item.xpath(".//div[@class='post-title']/text()")[
+                    0
+                ].strip()
+                entity["image_link"] = item.xpath(".//div[@class='img-item']/img/@src")[
+                    0
+                ].replace("..", P.ModelSetting.get("ohli24_url"))
+                data["ret"] = "success"
+                data["anime_list"].append(entity)
 
+            return data
+        except Exception as e:
+            P.logger.error("Exception:%s", e)
+            P.logger.error(traceback.format_exc())
+            return {"ret": "exception", "log": str(e)}
+    @staticmethod
+    def get_html(url, referer=None, stream=False, timeout=5):
+        data = ""
+        headers = {
+            "referer": f"https://linkkf.app",
+            "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) "
+                          "Chrome/96.0.4664.110 Whale/3.12.129.46 Safari/537.36"
+                          "Mozilla/5.0 (Macintosh; Intel "
+                          "Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 "
+                          "Whale/3.12.129.46 Safari/537.36",
+            "X-Requested-With": "XMLHttpRequest",
+        }
+        try:
+
+            if LogicOhli24.session is None:
+                LogicOhli24.session = requests.session()
+
+            # logger.debug('get_html :%s', url)
+            headers["Referer"] = "" if referer is None else referer
+            page_content = LogicOhli24.session.get(
+                url, headers=headers, timeout=timeout
+            )
+            data = page_content.text
+        except Exception as e:
+            logger.error("Exception:%s", e)
+            logger.error(traceback.format_exc())
+        return data
 class ModelLinkkfItem(db.Model):
     __tablename__ = "{package_name}_linkkf_item".format(package_name=P.package_name)
     __table_args__ = {"mysql_collate": "utf8_general_ci"}
@@ -152,8 +267,8 @@ class ModelLinkkfItem(db.Model):
     status = db.Column(db.String)
     linkkf_info = db.Column(db.JSON)
 
-    def __int__(self):
+    def __init__(self):
-        self.created_time == datetime.now()
+        self.created_time = datetime.now()
 
     def __repr__(self):
         return repr(self.as_dict())

templates/anime_downloader_linkkf_queue.html

@@ -0,0 +1,131 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div>
+  {{ macros.m_button_group([['reset_btn', '초기화'], ['delete_completed_btn', '완료 목록 삭제'], ['go_ffmpeg_btn', 'Go FFMPEG']])}}
+  {{ macros.m_row_start('0') }}
+  {{ macros.m_row_end() }}
+  {{ macros.m_hr_head_top() }}
+  {{ macros.m_row_start('0') }}
+  {{ macros.m_col(1,  macros.m_strong('Idx')) }}
+  {{ macros.m_col(2,  macros.m_strong('CreatedTime')) }}
+  {{ macros.m_col(4,  macros.m_strong('Filename')) }}
+  {{ macros.m_col(3,  macros.m_strong('Status')) }}
+  {{ macros.m_col(2,  macros.m_strong('Action')) }}
+  {{ macros.m_row_end() }}
+  {{ macros.m_hr_head_bottom() }}
+  <div id="download_list_div"></div>
+</div> <!--전체-->
+
+<script type="text/javascript">
+var package_name = "{{arg['package_name'] }}";
+var sub = "{{arg['sub'] }}";
+var current_data = null;
+socket = io.connect(window.location.protocol + "//" + document.domain + ":" + location.port + "/" + package_name + '/' + sub);
+
+$(document).ready(function(){
+});
+
+socket.on('start', function(data){
+  on_start();
+});
+socket.on('list_refresh', function(data){
+  on_start()
+});
+
+socket.on('status', function(data){
+  console.log(data);
+  on_status(data)
+});
+
+
+function on_start() {
+  $.ajax({
+    url: '/' + package_name + '/ajax/' + sub + '/entity_list',
+    type: "POST", 
+    cache: false,
+    data: {},
+    dataType: "json",
+    success: function (data) {
+      make_download_list(data)
+    }
+  });
+}
+
+
+function on_status(data) {
+  //console.log(data)
+  tmp = document.getElementById("progress_"+data.entity_id)
+  if (tmp != null) {
+    document.getElementById("progress_"+data.entity_id).style.width = data.ffmpeg_percent+ '%';
+    document.getElementById("progress_"+data.entity_id+"_label").innerHTML = data.ffmpeg_status_kor + "(" + data.ffmpeg_percent + "%)" + ' ' + ((data.ffmpeg_arg != null)?data.ffmpeg_arg.data.current_speed:'')
+  }
+}
+
+function make_download_list(data) {
+  str = '';
+  for (i in data) {
+    str += m_row_start();
+    str += m_col(1, data[i].entity_id);
+    str += m_col(2, data[i].created_time);
+    str += m_col(4, (data[i].filename != null) ? data[i].filename : '');
+
+    label = data[i].ffmpeg_status_kor
+    if (data[i].ffmpeg_percent != 0) {
+      label += '(' + data[i].ffmpeg_percent + '%)'
+    }
+    tmp = m_progress('progress_'+data[i].entity_id, data[i].ffmpeg_percent,  label)
+    str += m_col(3, tmp);
+    tmp = m_button('program_cancel_btn', '취소', [{'key':'id', 'value':data[i].entity_id}]);
+    tmp = m_button_group(tmp)
+    str += m_col(2, tmp)
+    str += m_row_end();
+    if (i != data.length -1) str += m_hr(0);
+  }
+  document.getElementById("download_list_div").innerHTML = str;
+}
+
+$("body").on('click', '#program_cancel_btn', function(e){
+  e.preventDefault();
+  entity_id = $(this).data('id')
+  send_data = {'command':'cancel', 'entity_id':entity_id}
+  queue_command(send_data)
+});
+
+$("body").on('click', '#reset_btn', function(e){
+  e.preventDefault();
+  entity_id = $(this).data('id')
+  send_data = {'command':'reset', 'entity_id':-1}
+  queue_command(send_data)
+});
+
+$("body").on('click', '#delete_completed_btn', function(e){
+  e.preventDefault();
+  entity_id = $(this).data('id')
+  send_data = {'command':'delete_completed', 'entity_id':-1}
+  queue_command(send_data)
+});
+
+function queue_command(data) {
+  $.ajax({
+    url: '/' + package_name + '/ajax/' + sub + '/queue_command',
+    type: "POST", 
+    cache: false,
+    data: data,
+    dataType: "json",
+    success: function (ret) {
+      if (ret.ret == 'notify') {
+        $.notify('<strong>'+ ret.log +'</strong>', {type: 'warning'});
+      }
+      on_start();
+    }
+  });
+}
+
+$("body").on('click', '#go_ffmpeg_btn', function(e){
+  e.preventDefault();
+  $(location).attr('href', '/ffmpeg')
+});
+
+</script>    
+{% endblock %}

templates/anime_downloader_linkkf_setting.html

@@ -0,0 +1,68 @@
+{% extends "base.html" %}
+{% block content %}
+<div>
+  {{ macros.m_button_group([['globalSettingSaveBtn', '설정 저장']])}}
+  {{ macros.m_row_start('5') }}
+  {{ macros.m_row_end() }}
+  <nav>
+    {{ macros.m_tab_head_start() }}
+      {{ macros.m_tab_head('normal', '일반', true) }}
+      {{ macros.m_tab_head('auto', '홈화면 자동', false) }}
+      {{ macros.m_tab_head('action', '기타', false) }}
+    {{ macros.m_tab_head_end() }}
+  </nav>
+  <form id="setting">
+  <div class="tab-content" id="nav-tabContent">
+  {{ macros.m_tab_content_start('normal', true) }}
+    {{ macros.setting_input_text_and_buttons('linkkf_url', 'linkkf URL', [['go_btn', 'GO']], value=arg['linkkf_url']) }}
+    {{ macros.setting_input_text('linkkf_download_path', '저장 폴더', value=arg['linkkf_download_path'], desc='정상적으로 다운 완료 된 파일이 이동할 폴더 입니다. ') }}
+    {{ macros.setting_input_int('linkkf_max_ffmpeg_process_count', '동시 다운로드 수', value=arg['linkkf_max_ffmpeg_process_count'], desc='동시에 다운로드 할 에피소드 갯수입니다.') }}
+    {{ macros.setting_checkbox('linkkf_order_desc', '요청 화면 최신순 정렬', value=arg['linkkf_order_desc'], desc='On : 최신화부터, Off : 1화부터') }}
+    {{ macros.setting_checkbox('linkkf_auto_make_folder', '제목 폴더 생성', value=arg['linkkf_auto_make_folder'], desc='제목으로 폴더를 생성하고 폴더 안에 다운로드합니다.') }}
+    <div id="linkkf_auto_make_folder_div" class="collapse">
+      {{ macros.setting_input_text('linkkf_finished_insert', '완결 표시', col='3', value=arg['linkkf_finished_insert'], desc=['완결된 컨텐츠 폴더명 앞에 넣을 문구입니다.']) }}
+      {{ macros.setting_checkbox('linkkf_auto_make_season_folder', '시즌 폴더 생성', value=arg['linkkf_auto_make_season_folder'], desc=['On : Season 번호 폴더를 만듭니다.']) }}
+    </div>
+      {{ macros.setting_checkbox('linkkf_uncompleted_auto_enqueue', '자동으로 다시 받기', value=arg['linkkf_uncompleted_auto_enqueue'], desc=['On : 플러그인 로딩시 미완료인 항목은 자동으로 다시 받습니다.']) }}
+  {{ macros.m_tab_content_end() }}
+
+  {{ macros.m_tab_content_start('auto', false) }}
+    {{ macros.setting_global_scheduler_sub_button(arg['scheduler'], arg['is_running']) }}
+    {{ macros.setting_input_text('linkkf_interval', '스케쥴링 실행 정보', value=arg['linkkf_interval'], col='3', desc=['Inverval(minute 단위)이나 Cron 설정']) }}
+    {{ macros.setting_checkbox('linkkf_auto_start', '시작시 자동실행', value=arg['linkkf_auto_start'], desc='On : 시작시 자동으로 스케쥴러에 등록됩니다.') }}
+    {{ macros.setting_input_textarea('linkkf_auto_code_list', '자동 다운로드할 작품 코드', desc=['all 입력시 모두 받기', '구분자 | 또는 엔터'], value=arg['linkkf_auto_code_list'], row='10') }}
+    {{ macros.setting_checkbox('linkkf_auto_mode_all', '에피소드 모두 받기', value=arg['linkkf_auto_mode_all'], desc=['On : 이전 에피소드를 모두 받습니다.', 'Off : 최신 에피소드만 받습니다.']) }}
+  {{ macros.m_tab_content_end() }}
+
+  {{ macros.m_tab_content_start('action', false) }}
+    {{ macros.setting_button([['global_one_execute_sub_btn', '1회 실행']], left='1회 실행' ) }}
+    {{ macros.setting_button([['global_reset_db_sub_btn', 'DB 초기화']], left='DB정리' ) }}
+  {{ macros.m_tab_content_end() }}
+
+  </div><!--tab-content-->
+  </form>
+</div> <!--전체-->
+
+<script type="text/javascript">
+var package_name = "{{arg['package_name'] }}";
+var sub = "{{arg['sub'] }}";
+var current_data = null;
+
+
+$(document).ready(function(){
+  use_collapse('linkkf_auto_make_folder');
+});
+
+$('#ani365_auto_make_folder').change(function() {
+  use_collapse('linkkf_auto_make_folder');
+});
+
+
+$("body").on('click', '#go_btn', function(e){
+  e.preventDefault();
+  let url = document.getElementById("linkkf_url").value
+  window.open(url, "_blank");
+});
+
+</script>
+{% endblock %}