InPanel 1.2.7__tar.gz → 1.2.8.3__tar.gz

{inpanel-1.2.7 → inpanel-1.2.8.3}/InPanel.egg-info/PKG-INFO

@@ -1,40 +1,10 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.7
+Version: 1.2.8.3
 Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2017-2026, Jackson Dou
-        Copyright (c) 2012-2013, VPSMate development team
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License: BSD-3-Clause
 Project-URL: Homepage, https://inpanel.org
 Project-URL: Repository, https://github.com/inpanel/inpanel
 Project-URL: Documentation, https://inpanel.org
@@ -44,7 +14,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
@@ -370,18 +339,65 @@ inpanel run
 
 ### 构建安装包
 
+使用项目提供的构建脚本构建各类安装包：
+
+```bash
+# 进入项目目录
+cd inpanel
+
+# 构建 pip 包（wheel + sdist）
+bash scripts/build_pip.sh
+
+# 构建并上传 pip 包到 PyPI
+bash scripts/build_pip.sh upload
+
+# 一键构建 RPM 和 DEB 包
+bash scripts/build_package.sh
+
+# 或单独构建
+bash scripts/build_rpm.sh     # 仅构建 RPM
+bash scripts/build_deb.sh     # 仅构建 DEB
+```
+
+#### 构建依赖
+
+构建脚本依赖以下工具，请根据系统安装：
+
+| 依赖 | 用途 | 安装命令 |
+|------|------|----------|
+| `python3` | Python 运行环境 | 系统通常已自带 |
+| `python3-build` | 构建 Python 包（wheel/sdist） | `pip install build` |
+| `twine` | 上传 pip 包到 PyPI | `pip install twine` |
+| `rpmbuild` | RPM 包构建（CentOS/RHEL） | `yum install rpm-build` |
+| `dpkg-buildpackage` | DEB 包构建（Debian/Ubuntu） | `apt-get install dpkg-dev` |
+| `debhelper` | DEB 包构建辅助工具 | `apt-get install debhelper` |
+| `python3-all` | DEB 包 Python 兼容性 | `apt-get install python3-all` |
+| `python3-setuptools` | DEB 包 setuptools 支持 | `apt-get install python3-setuptools` |
+
+#### 完整依赖安装示例
+
+**所有平台**（构建 pip 包 / 上传 PyPI）：
+
 ```bash
-# 构建 pip 包
+pip install build twine
+```
+
+**Debian / Ubuntu**（构建 DEB 包）：
+
+```bash
+sudo apt-get install -y debhelper python3-all python3-setuptools dpkg-dev
 pip install build
-python -m build
+```
 
-# 构建 RPM 包（需要 rpmbuild）
-rpmbuild -bb rpmbuild.spec
+**CentOS / RHEL**（构建 RPM 包）：
 
-# 构建 DEB 包（需要 debuild）
-debuild -us -uc
+```bash
+sudo yum install -y rpm-build
+pip install build
 ```
 
+构建产物默认输出到项目目录下的 `packages/` 目录。
+
 ## 账号和密码
 
 默认用户名：`admin`

inpanel-1.2.8.3/MANIFEST.in

@@ -0,0 +1,6 @@
+exclude test/*
+exclude tests/*
+prune inpanel/data
+prune inpanel/data/plugins
+global-exclude *.pyc
+global-exclude __pycache__

{inpanel-1.2.7 → inpanel-1.2.8.3}/PKG-INFO

@@ -1,40 +1,10 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.7
+Version: 1.2.8.3
 Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2017-2026, Jackson Dou
-        Copyright (c) 2012-2013, VPSMate development team
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License: BSD-3-Clause
 Project-URL: Homepage, https://inpanel.org
 Project-URL: Repository, https://github.com/inpanel/inpanel
 Project-URL: Documentation, https://inpanel.org
@@ -44,7 +14,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
@@ -370,18 +339,65 @@ inpanel run
 
 ### 构建安装包
 
+使用项目提供的构建脚本构建各类安装包：
+
+```bash
+# 进入项目目录
+cd inpanel
+
+# 构建 pip 包（wheel + sdist）
+bash scripts/build_pip.sh
+
+# 构建并上传 pip 包到 PyPI
+bash scripts/build_pip.sh upload
+
+# 一键构建 RPM 和 DEB 包
+bash scripts/build_package.sh
+
+# 或单独构建
+bash scripts/build_rpm.sh     # 仅构建 RPM
+bash scripts/build_deb.sh     # 仅构建 DEB
+```
+
+#### 构建依赖
+
+构建脚本依赖以下工具，请根据系统安装：
+
+| 依赖 | 用途 | 安装命令 |
+|------|------|----------|
+| `python3` | Python 运行环境 | 系统通常已自带 |
+| `python3-build` | 构建 Python 包（wheel/sdist） | `pip install build` |
+| `twine` | 上传 pip 包到 PyPI | `pip install twine` |
+| `rpmbuild` | RPM 包构建（CentOS/RHEL） | `yum install rpm-build` |
+| `dpkg-buildpackage` | DEB 包构建（Debian/Ubuntu） | `apt-get install dpkg-dev` |
+| `debhelper` | DEB 包构建辅助工具 | `apt-get install debhelper` |
+| `python3-all` | DEB 包 Python 兼容性 | `apt-get install python3-all` |
+| `python3-setuptools` | DEB 包 setuptools 支持 | `apt-get install python3-setuptools` |
+
+#### 完整依赖安装示例
+
+**所有平台**（构建 pip 包 / 上传 PyPI）：
+
 ```bash
-# 构建 pip 包
+pip install build twine
+```
+
+**Debian / Ubuntu**（构建 DEB 包）：
+
+```bash
+sudo apt-get install -y debhelper python3-all python3-setuptools dpkg-dev
 pip install build
-python -m build
+```
 
-# 构建 RPM 包（需要 rpmbuild）
-rpmbuild -bb rpmbuild.spec
+**CentOS / RHEL**（构建 RPM 包）：
 
-# 构建 DEB 包（需要 debuild）
-debuild -us -uc
+```bash
+sudo yum install -y rpm-build
+pip install build
 ```
 
+构建产物默认输出到项目目录下的 `packages/` 目录。
+
 ## 账号和密码
 
 默认用户名：`admin`

{inpanel-1.2.7 → inpanel-1.2.8.3}/README.md

@@ -302,18 +302,65 @@ inpanel run
 
 ### 构建安装包
 
+使用项目提供的构建脚本构建各类安装包：
+
+```bash
+# 进入项目目录
+cd inpanel
+
+# 构建 pip 包（wheel + sdist）
+bash scripts/build_pip.sh
+
+# 构建并上传 pip 包到 PyPI
+bash scripts/build_pip.sh upload
+
+# 一键构建 RPM 和 DEB 包
+bash scripts/build_package.sh
+
+# 或单独构建
+bash scripts/build_rpm.sh     # 仅构建 RPM
+bash scripts/build_deb.sh     # 仅构建 DEB
+```
+
+#### 构建依赖
+
+构建脚本依赖以下工具，请根据系统安装：
+
+| 依赖 | 用途 | 安装命令 |
+|------|------|----------|
+| `python3` | Python 运行环境 | 系统通常已自带 |
+| `python3-build` | 构建 Python 包（wheel/sdist） | `pip install build` |
+| `twine` | 上传 pip 包到 PyPI | `pip install twine` |
+| `rpmbuild` | RPM 包构建（CentOS/RHEL） | `yum install rpm-build` |
+| `dpkg-buildpackage` | DEB 包构建（Debian/Ubuntu） | `apt-get install dpkg-dev` |
+| `debhelper` | DEB 包构建辅助工具 | `apt-get install debhelper` |
+| `python3-all` | DEB 包 Python 兼容性 | `apt-get install python3-all` |
+| `python3-setuptools` | DEB 包 setuptools 支持 | `apt-get install python3-setuptools` |
+
+#### 完整依赖安装示例
+
+**所有平台**（构建 pip 包 / 上传 PyPI）：
+
 ```bash
-# 构建 pip 包
+pip install build twine
+```
+
+**Debian / Ubuntu**（构建 DEB 包）：
+
+```bash
+sudo apt-get install -y debhelper python3-all python3-setuptools dpkg-dev
 pip install build
-python -m build
+```
 
-# 构建 RPM 包（需要 rpmbuild）
-rpmbuild -bb rpmbuild.spec
+**CentOS / RHEL**（构建 RPM 包）：
 
-# 构建 DEB 包（需要 debuild）
-debuild -us -uc
+```bash
+sudo yum install -y rpm-build
+pip install build
 ```
 
+构建产物默认输出到项目目录下的 `packages/` 目录。
+
 ## 账号和密码
 
 默认用户名：`admin`

{inpanel-1.2.7 → inpanel-1.2.8.3}/inpanel/base.py

@@ -40,7 +40,7 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-26'
+releasetime = '2026-07-28'
 DEBUG       = False
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'

{inpanel-1.2.7 → inpanel-1.2.8.3}/inpanel/mod/server.py

@@ -846,6 +846,7 @@ class ServerInfo(object):
                 line = lvs.readline()
                 if not line:
                     break
+                line = line.decode('utf-8', errors='replace')
                 if 'LV Name' in line or 'LV Path' in line:
                     devlink = line.replace('LV Name',
                                            '').replace('LV Path', '').strip()

{inpanel-1.2.7 → inpanel-1.2.8.3}/inpanel/mod/service.py

@@ -292,19 +292,20 @@ def get_service_list():
 
     # 构建 categories 数组（按 order 排序）
     categories_result = []
-    for cat in sorted(categories_config, key=lambda x: x.get('order', 99)):
-        cat_id = cat['id']
-        if cat_id == 'other':
-            continue  # "其他" 单独处理
-        if cat_id not in categorized:
-            continue
-        categories_result.append({
-            'id': cat_id,
-            'name': cat['name'],
-            'icon': cat.get('icon', ''),
-            'order': cat.get('order', 99),
-            'services': categorized[cat_id],
-        })
+    if categories_config:
+        for cat in sorted(categories_config, key=lambda x: x.get('order', 99)):
+            cat_id = cat['id']
+            if cat_id == 'other':
+                continue  # "其他" 单独处理
+            if cat_id not in categorized:
+                continue
+            categories_result.append({
+                'id': cat_id,
+                'name': cat['name'],
+                'icon': cat.get('icon', ''),
+                'order': cat.get('order', 99),
+                'services': categorized[cat_id],
+            })
 
     # 获取"其他"服务
     other_services = manager.get_other_services()

{inpanel-1.2.7 → inpanel-1.2.8.3}/pyproject.toml

@@ -1,9 +1,13 @@
+[build-system]
+requires = ["setuptools>=75", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "InPanel"
-version = "1.2.7"
+version = "1.2.8.3"
 description = "InPanel - A Server Management Tool"
 readme = "README.md"
-license = {file = "LICENSE"}
+license = {text = "BSD-3-Clause"}
 authors = [{name = "Jackson Dou", email = "jksdou@qq.com"}]
 maintainers = [{name = "Jackson Dou", email = "jksdou@qq.com"}]
 keywords = ["server", "management", "admin", "panel", "linux"]
@@ -12,7 +16,6 @@ classifiers = [
     "Environment :: Web Environment",
     "Framework :: AsyncIO",
     "Intended Audience :: System Administrators",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.6",
@@ -51,8 +54,6 @@ exclude = ["test*", "tests*"]
 [tool.setuptools.package-data]
 inpanel = [
     "public/**/*",
-    "templates/**/*",
-    "plugins/**/*",
-    "data/**/*",
+    "templates/services/*.json",
+    "templates/sources/*.json",
 ]
-

inpanel-1.2.7/MANIFEST.in

@@ -1,2 +0,0 @@
-exclude test/*
-exclude tests/*