From a9004c513b42a28d12c4e709636352b68db1e895 Mon Sep 17 00:00:00 2001
From: projectdx <com114@gmail.com>
Date: Sun, 17 Apr 2022 18:00:43 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic_ohli24.py                               | 18 ++++++++++++---
 .../anime_downloader_ohli24_category.html     | 23 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/logic_ohli24.py b/logic_ohli24.py
index 0bfcecf..a6c6925 100644
--- a/logic_ohli24.py
+++ b/logic_ohli24.py
@@ -171,11 +171,21 @@ class LogicOhli24(LogicModuleBase):
                 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)
+                data = self.get_search_result(query, page, cate)
                 # self.current_data = data
-                return jsonify({"ret": "success", "query": query, "data": data})
+                return jsonify(
+                    {
+                        "ret": "success",
+                        "cate": cate,
+                        "page": page,
+                        "query": query,
+                        "data": data,
+                    }
+                )
 
             elif sub == "add_queue":
                 ret = {}
@@ -475,13 +485,15 @@ class LogicOhli24(LogicModuleBase):
             return {"ret": "exception", "log": str(e)}
 
     # @staticmethod
-    def get_search_result(self, query):
+    def get_search_result(self, query, page, cate):
         try:
             _query = urllib.parse.quote(query)
             url = (
                 P.ModelSetting.get("ohli24_url")
                 + "/bbs/search.php?srows=24&gr_id=&sfl=wr_subject&stx="
                 + _query
+                + "&page="
+                + page
             )
 
             logger.info("get_search_result()::url> %s", url)
diff --git a/templates/anime_downloader_ohli24_category.html b/templates/anime_downloader_ohli24_category.html
index bfcc67d..7d1351f 100644
--- a/templates/anime_downloader_ohli24_category.html
+++ b/templates/anime_downloader_ohli24_category.html
@@ -57,6 +57,7 @@
    let page = 1;
    let next_page = Number
    let current_cate = ''
+   let current_query = ''
 
    const observer = lozad('.lozad', {
      rootMargin: '10px 0px', // syntax similar to that of CSS Margin
@@ -303,6 +304,8 @@
     e.preventDefault();
     let query = $("#input_search").val();
     console.log(query);
+    current_cate = "search"
+    current_query = query
 
     if ($("#input_search").val() === "") {
       console.log("search keyword nothing");
@@ -313,13 +316,14 @@
       url: "/" + package_name + "/ajax/" + sub + "/search",
       type: "POST",
       cache: false,
-      data: { query: query },
+      data: { query: query, type: current_cate, page: page },
       // dataType: "json",
       contentType: "application/x-www-form-urlencoded; charset=UTF-8",
       success: function (ret) {
         if (ret.ret) {
           console.log('ret:::', ret)
           make_search_result_list(ret.data, 1);
+          next_page = page + 1
         } else {
           $.notify("<strong>분석 실패</strong><br>" + ret.log, {
             type: "warning",
@@ -418,7 +422,7 @@
    // observer.observe();
   const loadNextAnimes = (cate, page) => {
     spinner.style.display = "block";
-    const data = { type: cate, page: String(page) };
+    let data = { type: cate, page: String(page) };
     let url = ''
     switch (cate) {
        case 'ing':
@@ -437,6 +441,11 @@
            url = '/' + package_name + '/ajax/'+sub+'/complete_list'
            current_cate = 'fin'
            break
+      case 'search':
+           url = "/" + package_name + "/ajax/" + sub + "/search"
+           current_cate = 'search'
+           data.query = current_query
+           break;
        default:
            break;
     }
@@ -451,12 +460,16 @@
     })
       .then((res) => res.json())
       .then((response) => {
-        console.log("Success:", JSON.stringify(response));
+        // console.log("Success:", JSON.stringify(response));
         // {#imagesContainer.appendChild()#}
         console.log("return page:::> ", String(response.page));
         // {#page = response.page#}
-        make_screen_movie_list(response.data, response.page);
+        if (current_cate === 'search') {
+          make_search_result_list(response.data, response.page);
 
+        } else {
+          make_screen_movie_list(response.data, response.page);
+        }
         page++;
         next_page++;
       })
@@ -471,7 +484,7 @@
       document.getElementById("spinner").style.display = "block";
       console.log("loading");
       console.log("now page::> ", page);
-      console.log("next_page::> ", next_page);
+      console.log("next_page::> ", String(next_page));
       loadNextAnimes(current_cate, next_page);
     }
   };