xnote-web 0.2.2__tar.gz → 0.2.3__tar.gz

{xnote_web-0.2.2 → xnote_web-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xnote_web
-Version: 0.2.2
+Version: 0.2.3
 Summary: xnote-web框架
 Author: mark
 Author-email: 578749341@qq.com
@@ -29,7 +29,7 @@ xnote是一款面向个人的轻量级笔记系统，提供多种维度的数据
 
 如果你热爱技术爱折腾、需要多元的数据处理能力、希望完全掌控自己的文档数据，本产品将会是一个不错的尝试，欢迎试用反馈。
 
-- 体验demo网址 https://1k5u680558.goho.co/
+- 体验demo网址 http://101.43.99.188:5557
 - 测试账号 user01/123456, user02/123456 友情提示：管理员会不定期清理数据，请勿存放重要数据
 
 以下是一些页面展示

{xnote_web-0.2.2 → xnote_web-0.2.3}/README.md

@@ -17,7 +17,7 @@ xnote是一款面向个人的轻量级笔记系统，提供多种维度的数据
 
 如果你热爱技术爱折腾、需要多元的数据处理能力、希望完全掌控自己的文档数据，本产品将会是一个不错的尝试，欢迎试用反馈。
 
-- 体验demo网址 https://1k5u680558.goho.co/
+- 体验demo网址 http://101.43.99.188:5557
 - 测试账号 user01/123456, user02/123456 友情提示：管理员会不定期清理数据，请勿存放重要数据
 
 以下是一些页面展示

xnote_web-0.2.3/config/version.txt

@@ -0,0 +1 @@
+develop-2025.06.29

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/common/date/contribution_calendar.html

@@ -1,38 +1,4 @@
 <style>
-    .calendar-header {
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 10px;
-    }
-
-    .calendar-title {
-        font-size: 14px;
-        font-weight: 600;
-        color: #24292e;
-    }
-
-    .calendar-controls {
-        align-items: center;
-        gap: 8px;
-    }
-
-    .calendar-year {
-        font-size: 14px;
-        color: #586069;
-    }
-
-    .calendar-nav {
-        background: none;
-        border: none;
-        cursor: pointer;
-        color: #959da5;
-        padding: 4px;
-    }
-
-    .calendar-nav:hover {
-        color: #24292e;
-    }
-
     .legend {
         float: left;
         margin-bottom: 10px;
@@ -132,23 +98,23 @@
     }
 
     .month-2-cols {
-        width: 27px;
+        width: 26px;
         float: left;
     }
 
     .month-3-cols {
-        width: 40px;
+        width: 39px;
         float: left;
     }
 
     .month-4-cols {
         float: left;
-        width: 53px;
+        width: 52px;
     }
 
     .month-5-cols {
         float: left;
-        width: 66px;
+        width: 65px;
     }
 
     .stats {
@@ -224,11 +190,7 @@
             <div class="row calendar-row" style="{{calendar.row_style}}">
                 <div class="weekday-label">{{row.label}}</div>
                 {% for cell in row.items %}
-                    {% if cell.count > 0 %} 
-                        <div class="calendar-day {{cell.css_class}}" data-tip="{{cell.tip}}" onmouseenter="showTooltip(event, this);" onmouseleave="hideTooltip()"></div>
-                    {% else %}
-                        <div class="calendar-day {{cell.css_class}}"></div>
-                    {% end %}
+                    <div class="calendar-day {{cell.css_class}}" data-tip="{{cell.tip}}" onmouseenter="showTooltip(event, this);" onmouseleave="hideTooltip()"></div>
                 {% end %}
             </div>
             {% end %}

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/common/title/base_title.html

@@ -5,7 +5,7 @@
 <!-- <a href="{{_server_home}}/system/index" class="link">系统</a> › -->
 <h3 class="card-title btn-line-height">
     {% if parent_link %}
-        <a class="link2" href="{{parent_link.href}}">{{parent_link.text}}</a>
+        <a class="link2 path-link" href="{{parent_link.href}}">{{parent_link.text}}</a>
         <span>/</span>
     {% end %}
 

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/fs/fs.py

@@ -245,7 +245,7 @@ class FileSystemHandler:
             # 处理不了，返回所有的数据
             yield self.read_all(path, blocksize)
 
-    def read_all(self, path, blocksize):
+    def read_all(self, path, blocksize: int):
         total_size = os.stat(path).st_size
         web.header("Content-Length", total_size)
         with open(path, "rb") as fp:
@@ -255,7 +255,7 @@ class FileSystemHandler:
                 yield block
                 block = fp.read(blocksize)
             
-    def read_thumbnail(self, path, blocksize, version="v1"):
+    def read_thumbnail(self, path, blocksize: int, version="v1"):
         # TODO 限制进程数量
         # 在SAE环境中，pillow处理图片后无法释放内存，改成用子进程处理
         data = fs_image.create_thumbnail_data(path, version)

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/fs/fs_image.py

@@ -68,7 +68,7 @@ def do_create_thumbnail(path: str, version="v1", debug=False):
         with subprocess.Popen(args, stdout=subprocess.PIPE) as proc:
             assert proc.stdout != None
             buf = proc.stdout.read()
-            if buf.strip() == "":
+            if len(buf.strip()) == 0:
                 return None
             return base64.b64decode(buf.decode("utf-8"))
 

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/plugin/header/plugin_header_normal.html

@@ -9,7 +9,7 @@
 <div class="card">
     <div class="card-title">
         {% if parent_link %}
-            <a class="link2" href="{{parent_link.href}}">{{parent_link.text}}</a>
+            <a class="link2 path-link" href="{{parent_link.href}}">{{parent_link.text}}</a>
             <span>/</span>
         {% end %}
         <a class="link2" href="{{title_url}}">{{ title }}</a>

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/system/page/system_info.html

@@ -9,16 +9,11 @@
     {% include system/component/system_css.html %}
 
 <div class="card">
-    <div class="card-title">
-        <span>系统信息</span>
-        <div class="float-right">
-            {% include common/button/back_button.html %}
-        </div>
-    </div>
+    {% include common/title/base_title.html %}
 </div>
 
 <div class="card">
-    {% for item in items %}
+    {% for item in info_items %}
         <div class="settings-row">
             <div class="settings-key">{{item.name}}</div>
             <div class="settings-value">

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/system/system_info.py

@@ -15,6 +15,7 @@ from xutils import dateutil
 from xutils import fsutil
 from xutils import mem_util
 from xutils import Storage
+from xnote.plugin import LinkConfig
 
 try:
     import sqlite3
@@ -162,8 +163,13 @@ class InfoHandler:
             SystemInfoItem("浏览器信息", "查看", link = "/tools/browser_info"),
         ]
 
-        return xtemplate.render("system/page/system_info.html", items = items, 
-            runtime_id = xconfig.RUNTIME_ID)
+        kw = Storage()
+        kw.info_items = items
+        kw.runtime_id = xconfig.RUNTIME_ID
+        kw.title = "系统信息"
+        kw.parent_link = LinkConfig.app_index
+
+        return xtemplate.render("system/page/system_info.html", **kw)
     
 
     def render_python_lib(self):

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/user/login.py

@@ -21,14 +21,15 @@ def get_real_ip():
 def save_login_info(name, error=None):
     if name != "":
         real_ip = get_real_ip()
-        detail = "登录IP: %s" % real_ip
+        detail = ""
         if error != None:
-            detail += ",登录失败:%s" % error
+            detail = f"登录失败:{error}"
+        else:
+            detail = "登录成功"
         user_id = xauth.UserDao.get_id_by_name(name)
         if user_id == 0:
             user_id = -1
             detail += f",login_name:{name}"
-        
         log = user_dao.UserOpLog()
         log.detail = detail
         log.type = user_dao.UserOpTypeEnum.login.value
@@ -66,7 +67,7 @@ class LoginHandler:
         return self.do_login_with_redirect(name,pswd,target)
 
 
-    def do_login_with_redirect(self,name, pswd, target=""):
+    def do_login_with_redirect(self,name:str, pswd:str, target=""):
         error = self.do_login_with_error(name, pswd)
         if error == "":
             if target == "":
@@ -74,7 +75,7 @@ class LoginHandler:
             raise web.found(target)
         return error
 
-    def do_login_with_error(self, name, pswd, count=0):
+    def do_login_with_error(self, name:str, pswd:str, count=0):
         name = name.strip()
         pswd = pswd.strip()
         count = _login_failed_count.get(name, 0)

{xnote_web-0.2.2 → xnote_web-0.2.3}/handlers/user/user.py

@@ -127,6 +127,7 @@ class UserHandler:
         table.default_head_style.min_width = "100px"
         table.add_head("操作类型", "type")
         table.add_head("操作时间", "ctime", min_width="200px")
+        table.add_head("IP地址", "ip", min_width="100px")
         table.add_head("详情", "detail", min_width="200px")
 
         for item in log_list:

{xnote_web-0.2.2 → xnote_web-0.2.3}/setup.py

@@ -10,7 +10,7 @@ data_ext_list =  ["*.txt", "*.json", "*.properties", "*.js", "*.html", "*.css"]
 
 setuptools.setup(
     name = "xnote_web",
-    version = "0.2.2",
+    version = "0.2.3",
     author = "mark",
     author_email = "578749341@qq.com",
     description = "xnote-web框架",

{xnote_web-0.2.2 → xnote_web-0.2.3}/static/js/marked-ext.js

@@ -136,7 +136,9 @@
 
     marked.setOptions({
         renderer: myRenderer,
-        highlight: highlight
+        highlight: highlight,
+        // 换行替换成<br>
+        breaks: true
     });
 
     marked.showMenu = true;

{xnote_web-0.2.2 → xnote_web-0.2.3}/tests/test_app.py

@@ -408,12 +408,12 @@ class Main:
             password="_error",
             _format="json",
         )
-        resp = json_request("/login", method="POST", data=params)
+        resp = json_request_return_dict("/login", method="POST", data=params)
         print("test_login_user_not_found", resp)
         self.assertEqual("用户名或密码错误", resp["error"])
 
     def test_add_visit_log(self):
-        xmanager.add_visit_log(None, "/index")
+        xmanager.add_visit_log("guest", "/index")
 
 
     def test_system_log2(self):

xnote_web-0.2.3/tests/test_plugin.py

@@ -0,0 +1,25 @@
+# -*- coding:utf-8 -*-
+# @author xupingmao
+# @since 2021/07/18 18:36:23
+# @modified 2021/07/18 19:45:09
+# @filename test_search.py
+
+from . import test_base
+from .test_base import json_request_return_dict
+from xnote.core import xauth
+
+app          = test_base.init()
+json_request = test_base.json_request
+request_html = test_base.request_html
+BaseTestCase = test_base.BaseTestCase
+
+class TestMain(BaseTestCase):
+
+    def test_plugin_list(self):
+        self.check_OK("/plugin_list")
+
+    def test_table(self):
+        self.check_OK("/test/example/table?name=table")
+
+    def test_contribution_calendar(self):
+        self.check_OK("/test/example/calendar?name=calendar")

{xnote_web-0.2.2 → xnote_web-0.2.3}/tests/test_user.py

@@ -23,7 +23,6 @@ class TestUser(BaseTestCase):
     def test_login_page(self):
         self.check_OK("/login")
 
-
     def test_change_password(self):
         self.check_OK("/user/change_password")
 
@@ -33,4 +32,11 @@ class TestUser(BaseTestCase):
     def test_user_session(self):
         self.check_OK("/user/session")
 
-        
+    def test_refresh_session(self):
+        session_info = xauth.login_user_by_name("admin", "127.0.0.1")
+        new_session = xauth.refresh_user_session(session_info=session_info)
+        assert new_session.sid != session_info.sid
+
+        # test cache hit
+        new_session = xauth.refresh_user_session(session_info=session_info)
+        assert new_session.sid == session_info.sid