From 80952c59906f9e11281f75f0395e05639b85aa8c Mon Sep 17 00:00:00 2001
From: 111wyh111 <73573256+111wyh111@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:46:26 +0800
Subject: [PATCH 1/2] Update service.py

I have changed it
---
 service.py | 55 +++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/service.py b/service.py
index d6c9423..3be9d55 100644
--- a/service.py
+++ b/service.py
@@ -1,20 +1,19 @@
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import or_
 import os, uuid, math, random
-import re
 from flask import Flask, flash, request, redirect, url_for, session, jsonify, render_template, send_from_directory
 from werkzeug.utils import secure_filename
 from datetime import datetime, timedelta
 from flask import Flask
 
 basedir = os.path.abspath(os.path.dirname(__file__))
-UPLOAD_FOLDER = basedir + '/static/pdf'
+UPLOAD_FOLDER = basedir + '\static\pdf'
 ALLOWED_EXTENSIONS = set(['pdf'])
 threshold = 100000
 app = Flask(__name__)
 app.config['MAX_CONTENT_LENGTH'] = 20 * 1024 * 1024
-app.config['UPLOAD_FOLDER'] = os.path.join(basedir+'/static/pdf')
-app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///'+os.path.join(basedir+'/database.sqlite')
+app.config['UPLOAD_FOLDER'] = os.path.join(basedir + '\static\pdf')
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir + '\database.sqlite')
 app.config['SQLALCHEMY_COMMIT_ON_TEARDOWN'] = True
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
 app.secret_key = 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT'
@@ -57,8 +56,6 @@ class Article(db.Model):
     metric = db.Column(db.Float, default=0)
     fpath = db.Column(db.String)
     status = db.Column(db.Integer, default=1)
-    # Add downloads
-    downloadcount = db.Column(db.Integer)
     # OneToMany
     comments = db.relationship('Comment', backref='article', cascade='all,delete-orphan')
 
@@ -168,7 +165,7 @@ def find_path_last_id(path):
     # ======================================================================================================
     @staticmethod
     def sensitive_words_filter(text):
-        f = open(basedir + '/static/sensitive words/1.txt', 'r')
+        f = open('static/sensitive words/1.txt', 'r')
         result = ''
         flag = True
         for line in f:
@@ -216,15 +213,6 @@ def email_display_filter(email):
 
         return display + suf
 
-    @staticmethod
-    def highlight_matched_parts(sentence, search_key_word):
-        pattern = re.compile(re.escape(search_key_word), re.IGNORECASE)
-        if pattern:
-            return pattern.sub('<span style="background-color:yellow">%s</span>' % (search_key_word), sentence)
-        else:
-            return sentence
-        
-
 
 # =========================================================================================
 # like and dislike
@@ -347,11 +335,9 @@ def get_subject(subjectID):
     for x in a:
         hot_article.append(x)
 
+    return render_template('subject.html', url=url, subject_id=subject.id, articles=articles, hot_article=hot_article,
+                           Tool=Tool)
 
-    if not subject.pid  == "None" :
-        return render_template('subject.html', url=url, subject_id=subject.id,lasturl="/subject/"+str(subject.pid) ,articles=articles, hot_article=hot_article, Tool=Tool)
-    else :
-        return render_template('subject.html', url=url, subject_id=subject.id,lasturl="/" ,articles=articles, hot_article=hot_article, Tool=Tool)
 
 # ============================================================================================
 # before request
@@ -396,6 +382,10 @@ def index():
     return render_template('io.html')
 
 
+@app.route('/test')
+def test_one():
+    return render_template('test.html')
+
 
 # ============================================================================================#
 # used to out new index after new a subcategory.
@@ -527,8 +517,12 @@ def get_article(articleID):
         article.visit += 1
         db.session.add(article)
 
+    comments_tup = []
     comments = article.comments
-    return render_template('article.html', article=article, comments=comments, Tool=Tool)
+    for n,i in enumerate(comments):
+        comments_tup.append((n,i))
+
+    return render_template('article.html', article=article, comments=comments_tup, Tool=Tool)
 
 
 # ========================================================================
@@ -565,11 +559,8 @@ def allowed_file(filename):
 # ===========================================================================
 # download pdf file
 # ===========================================================================
-@app.route("/download/<filename>/<id>", methods=['GET'])
-def download_file(filename, id):
-    article = Article.query.get(id)
-    article.downloadcount += 1
-    db.session.add(article)
+@app.route("/download/<filename>", methods=['GET'])
+def download_file(filename):
     return send_from_directory(os.path.join(app.config['UPLOAD_FOLDER']), filename, as_attachment=True)
 
 
@@ -730,11 +721,14 @@ def search():
 
     content = request.args.get('content')
 
-    matched_articles = db.session.query(Article).order_by(Article.metric.desc()).filter(or_(Article.title.contains(content), Article.highlight.contains(content), Article.abstract.contains(content))).all()
-    
-    matched_comments = db.session.query(Comment).filter(Comment.body.contains(content))
+    a = db.session.query(Article).filter(or_(Article.title.contains(content), Article.highlight.contains(content),
+                                             Article.abstract.contains(content))).all()
+    c = db.session.query(Comment).filter(Comment.body.contains(content))
+
+    articles = a
+    comments = c
 
-    return render_template('search.html', articles=matched_articles, comments=matched_comments, Tool=Tool, message=message,kwd=content)
+    return render_template('search.html', articles=articles, comments=comments, Tool=Tool, message=message)
 
 
 @app.route('/error/<message>')
@@ -752,3 +746,4 @@ def author(author_id):
 
 if __name__ == '__main__':
     app.run(debug=True)
+

From e477782a77eb3d47e1a9288f42d282deacc18414 Mon Sep 17 00:00:00 2001
From: 111wyh111 <73573256+111wyh111@users.noreply.github.com>
Date: Wed, 20 Jan 2021 14:47:23 +0800
Subject: [PATCH 2/2] Update article.html

---
 templates/article.html | 275 ++++++++++++++++++++++++-----------------
 1 file changed, 159 insertions(+), 116 deletions(-)

diff --git a/templates/article.html b/templates/article.html
index a7d7970..396af20 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -3,75 +3,105 @@
 {% block head %}
 
 
-<script>
-    $(document).ready(function(){
-        $("p").css('display', 'inline')
-        $("p.pp").css('cursor', 'pointer')
-        $("p.bp").addClass('font-weight-bold')
-    });
-
-    <!--ajax-->
-    function like() {
-         var url = "/article_upvote/" + {{ article.id }}
-         axios.get(url).then(function(response) {
-            let jsonObject = response.data;
-            document.getElementById('like').innerHTML=jsonObject.upvote
-            if(jsonObject.ht) {
-                alert(jsonObject.ht)
-            }
-        })
-    }
-
-    function dislike() {
-         var url = "/article_downvote/" + {{ article.id }}
-         axios.get(url).then(function(response) {
-            let jsonObject = response.data;
-            document.getElementById('dislike').innerHTML=jsonObject.downvote
-              if(jsonObject.ht) {
-                alert(jsonObject.ht)
-            }
-        })
-    }
-    
-    function clike(comment_id) {
-        var url = "/comment_upvote/" + comment_id
-            axios.get(url).then(function(response) {
-            let jsonObject = response.data;
-            document.getElementById('cl'+comment_id).innerHTML=jsonObject.upvote
-            if(jsonObject.ht) {
-                alert(jsonObject.ht)
-            }
-        })
-    }
-
-
-    function cdislike(comment_id) {
+    <script>
+        var ifsort = false
+
+        $(document).ready(function () {
+            $("p").css('display', 'inline')
+            $("p.pp").css('cursor', 'pointer')
+            $("p.bp").addClass('font-weight-bold')
+        });
+
+        <!--ajax-->
+        function like() {
+            var url = "/article_upvote/" + {{ article.id }}
+                axios.get(url).then(function (response) {
+                    let jsonObject = response.data;
+                    document.getElementById('like').innerHTML = jsonObject.upvote
+                    if (jsonObject.ht) {
+                        alert(jsonObject.ht)
+                    }
+                })
+        }
+
+        function dislike() {
+            var url = "/article_downvote/" + {{ article.id }}
+                axios.get(url).then(function (response) {
+                    let jsonObject = response.data;
+                    document.getElementById('dislike').innerHTML = jsonObject.downvote
+                    if (jsonObject.ht) {
+                        alert(jsonObject.ht)
+                    }
+                })
+        }
+
+        function clike(comment_id) {
+            var url = "/comment_upvote/" + comment_id
+            axios.get(url).then(function (response) {
+                let jsonObject = response.data;
+                document.getElementById('cl' + comment_id).innerHTML = jsonObject.upvote
+                if (jsonObject.ht) {
+                    alert(jsonObject.ht)
+                }
+            })
+        }
+
+
+        function cdislike(comment_id) {
             var url = "/comment_downvote/" + comment_id
-            axios.get(url).then(function(response) {
-            let jsonObject = response.data;
-            document.getElementById('cd'+comment_id).innerHTML=jsonObject.downvote
-            if(jsonObject.ht) {
-                alert(jsonObject.ht)
-            }
-        })
-    }
-    
-    
-    
-    
-    <!--before comment-->
-    function before_comment() {
-         htmlobj=$.ajax({url:"/check/" + document.getElementById('email').value ,async:false});
+            axios.get(url).then(function (response) {
+                let jsonObject = response.data;
+                document.getElementById('cd' + comment_id).innerHTML = jsonObject.downvote
+                if (jsonObject.ht) {
+                    alert(jsonObject.ht)
+                }
+            })
+        }
+
+
+        <!--before comment-->
+        function before_comment() {
+            htmlobj = $.ajax({url: "/check/" + document.getElementById('email').value, async: false});
             let flag = String(htmlobj.responseText)
-            if(flag==='true\n') {
+            if (flag === 'true\n') {
                 alert('Your email has been banned!')
                 return false
-            }else {
+            } else {
                 return true
             }
-    }
+        }
+
+        function sort() {
+            $(".comments .card").sort(sort_method)
+                .appendTo(".comments");
+            ifsort = !ifsort
+
+        }
+
+        function sort_method(a, b) {
+            if (ifsort === false) {
+                let b_num = b.getElementsByClassName("like")[0].textContent - b.getElementsByClassName("dislike")[0]
+                let a_num = a.getElementsByClassName("like")[0].textContent - a.getElementsByClassName("dislike")[0]
+                let b_like = b.getElementsByClassName("like")[0].textContent
+                let a_like = a.getElementsByClassName("like")[0].textContent
+
+                if (b_num < a_num) {
+                    return -1
+                } else if (b_num > a_num) {
+                    return 1
+                } else if (b_like < a_like) {
+                    return -1
+                } else {
+                    return 1
+                }
+            } else {
+                return b.getElementsByClassName("commentid")[0].textContent - a.getElementsByClassName("commentid")[0].textContent > 0 ? 1 : -1
+            }
+
+            {#return b_num < a_num ? 1 : -1;    //升序排列#}
+        }
 
-</script>
+    </script>
 {% endblock %}
 
 
@@ -80,83 +110,96 @@
 
 
 
-<br>
-
-<div class="card">
-    <div class="card-body">
-
-    <h2 class="card-title">{{ article.title }}</h2><!--title-->
-
-    <p class="card-text bp">Abstract<br></p><p>&nbsp;{{ Tool.sensitive_words_filter(article.abstract) }}</p><br><br><!--abstract-->
-
-    <p class="card-text bp">Hightlights<br></p><p>&nbsp;{{ article.highlight }}</p><br><br><!--highlights-->
+    <br>
 
-    <p class="card-text bp">Popularity Metric<br></p><p>&nbsp;{{ article.metric }}</p><br><br><!-- popularity metric-->
+    <div class="card">
+        <div class="card-body">
 
-    <p class="card-text bp">Publication Date<br></p><p>&nbsp;{{ article.time.strftime("%Y-%m-%d %H:%M") }}</p><br><br><!--publication date-->
+            <h2 class="card-title">{{ article.title }}</h2><!--title-->
 
-    <p class="card-text bp">Author Information<br></p>&nbsp;<a href="{{ url_for('author', author_id=article.author_id) }}">{{ Tool.email_display_filter(article.author.mail) }}</a><br><br><!--author-->
+            <p class="card-text bp">-abstract<br></p>
+            <p>&nbsp;{{ Tool.sensitive_words_filter(article.abstract) }}</p><br><br><!--abstract-->
 
-    <br><br>
+            <p class="card-text bp">-hightlights<br></p>
+            <p>&nbsp;{{ article.highlight }}</p><br><br><!--highlights-->
 
-    <div>
-        <p class="text-primary pp" onclick="like()">like</p>  <p id="like">{{ article.upvote }}</p>&nbsp;
+            <p class="card-text bp">-population metric<br></p>
+            <p>&nbsp;{{ article.metric }}</p><br><br><!-- population metric-->
 
-        <p class="text-primary pp" onclick="dislike()">dislike</p> <p id="dislike">{{ article.downvote }}</p>&nbsp;
+            <p class="card-text bp">-publication date<br></p>
+            <p>&nbsp;{{ article.time.strftime("%Y-%m-%d %H:%M") }}</p><br><br><!--publication date-->
 
-        <!--New downloads-->
-        <div style="float:right"><p class="text-primary">download number </p> <p id="download_number">{{ article.downloadcount }}</p></div><br>
+            <p class="card-text bp">-author<br></p>&nbsp;<a
+                href="{{ url_for('author', author_id=article.author_id) }}">{{ Tool.email_display_filter(article.author.mail) }}</a><br><br>
+            <!--author-->
 
+            <br><br>
 
+            <div>
+                <p class="text-primary pp" onclick="like()">like</p>
+                <p id="like">{{ article.upvote }}</p>&nbsp;
 
-        <a href="{{ url_for('download_file', filename=article.fpath, id=article.id) }}"><button class="btn btn-primary" style="float:right" >download pdf</button></a><!--pdf download link-->
+                <p class="text-primary pp" onclick="dislike()">dislike</p>
+                <p id="dislike">{{ article.downvote }}</p>&nbsp;<br>
 
-        <a href="{{ url_for('preview_file', filename=article.fpath) }}"><button class="btn btn-primary" style="float:left" >preview</button></a>
-    
-     </div>
 
+                <a href="{{ url_for('download_file', filename=article.fpath) }}">
+                    <button class="btn btn-primary" style="float:right">download pdf</button>
+                </a><!--pdf download link-->
 
-    </div>
-</div>
+                <a href="{{ url_for('preview_file', filename=article.fpath) }}">
+                    <button class="btn btn-primary" style="float:left">preview</button>
+                </a>
 
+            </div>
 
-<br>
-<!--comment edit-->
-<div class="card">
-<div class="card-body">
-    <form method="post" action="{{ url_for('post_comment', articleID=article.id) }}" onsubmit="" >
 
-        <div class="form-group">
-            <input type="email" class="form-control" id="email" name="email" placeholder="Enter your email" required="required">
         </div>
+    </div>
 
-        <div class="form-group">
-          <textarea class="form-control" rows="3" name="body" placeholder="write something here..." required="required"></textarea>
-        </div>
 
-        <button class="btn btn-primary" type="submit" style="float:right">comment</button>
-    </form>
-</div>
-</div><br>
+    <br>
+    <!--comment edit-->
+    <div class="card">
+        <div class="card-body">
+            <form method="post" action="{{ url_for('post_comment', articleID=article.id) }}" onsubmit="">
 
-{% if comments %}
-<div class="alert alert-primary">
-    Number of comments :{{ comments|length }}
-</div>
+                <div class="form-group">
+                    <input type="email" class="form-control" id="email" name="email" placeholder="Enter your email"
+                           required="required">
+                </div>
 
+                <div class="form-group">
+                    <textarea class="form-control" rows="3" name="body" placeholder="write something here..."
+                              required="required"></textarea>
+                </div>
 
-{% for comment in comments[::-1] %}
-    <div class="card">
-        <div class="card-body">
-            <p><a href="/author/{{ comment.author.id }}">{{ Tool.email_display_filter(comment.author.mail) }}</a></p><br>
-            <p>{{ Tool.sensitive_words_filter(comment.body) }}</p><br>
-            <p class="text-primary pp"  onclick="clike({{ comment.id }})">like</p> <p id='cl{{ comment.id }}'>{{ comment.upvote }}</p>
-            <p class="text-primary pp" onclick="cdislike({{ comment.id }})">dislike</p> <p id='cd{{ comment.id }}'>{{ comment.downvote }}</p>
-            <p  style="float:right" >{{ comment.time.strftime("%Y-%m-%d %H:%M") }}</p>
+                <button class="btn btn-primary" type="submit" style="float:right">comment</button>
+            </form>
         </div>
+    </div><br>
+
+    <div class="comments">
+        {% for comment in comments[::-1] %}
+            <div class="card">
+                <span class="commentid" style="display:none">{{ comment[0] }}</span>
+                <div class="card-body">
+                    <p>
+                        <a href="/author/{{ comment[1].author.id }}">{{ Tool.email_display_filter(comment[1].author.mail) }}</a>
+                    </p><br>
+                    <p>{{ Tool.sensitive_words_filter(comment[1].body) }}</p><br>
+                    <p class="text-primary pp" onclick="clike({{ comment[1].id }})">like</p>
+                    <p id='cl{{ comment[1].id }}' class="like">{{ comment[1].upvote }}</p>
+                    <p class="text-primary pp" onclick="cdislike({{ comment[1].id }})">dislike</p>
+                    <p id='cd{{ comment[1].id }}' class="dislike">{{ comment[1].downvote }}</p>
+                    <p style="float:right" class="time">{{ comment[1].time.strftime("%Y-%m-%d %H:%M") }}</p>
+                </div>
+            </div>
+        {% endfor %}
     </div>
-{% endfor %}
-{% endif %}
 
+    <button class="btn btn-primary" type="submit" style="float:right" onclick="sort()">排序/取消排序</button>
+
+
+{% endblock %}
 
-{%  endblock %}