hiddifypanel 10.15.0.dev1__py3-none-any.whl → 10.15.0.dev4__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.15.0.dev1
+10.15.0.dev4

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.15.0.dev1'
+__version__='10.15.0.dev4'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-04-06','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-04-07','%Y-%m-%d')

hiddifypanel/panel/init_db.py

@@ -10,8 +10,6 @@ from hiddifypanel import Events, hutils
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db, db_execute
-from hiddifypanel import hutils
-from sqlalchemy import text
 from flask import g
 
 MAX_DB_VERSION = 90
@@ -540,7 +538,7 @@ def add_config_if_not_exist(key: ConfigEnum, val: str | int, child_id: int | Non
         child_id = Child.current().id
 
     old_val = hconfig(key, child_id)
-    print(key, val, child_id, old_val)
+    hutils.utils.error(f'{key}, {val}, {child_id}, {old_val}')
     if old_val is None:
         set_hconfig(key, val)
 
@@ -559,7 +557,7 @@ def execute(query: str):
 
         db_execute(query)
     except BaseException as e:
-        print(e)
+        hutils.utils.error(e)
         pass
 
 
@@ -599,7 +597,7 @@ def add_new_enum_values():
         # Add the new value to the enum column in the database
         enumstr = ','.join([f"'{a}'" for a in [*existing_values, *old_values]])
 
-        db_execute(text(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});"))
+        db_execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});")
 
         db.session.commit()
 
@@ -620,14 +618,14 @@ def upgrade_database():
     if not os.path.isdir(backup_root) or len(os.listdir(backup_root)) == 0:
         if os.path.isfile(sqlite_db):
             os.rename(sqlite_db, sqlite_db + ".old")
-        print("no backup found...")
+        hutils.utils.error("no backup found...")
         return
     if os.path.isfile(sqlite_db):
-        hiddify.error("Finding Old Version Database... importing configs from latest backup")
+        hutils.utils.error("Finding Old Version Database... importing configs from latest backup")
         newest_file = max([(f, os.path.getmtime(os.path.join(backup_root, f)))
                           for f in os.listdir(backup_root) if os.path.isfile(os.path.join(backup_root, f))], key=lambda x: x[1])[0]
         with open(f'{backup_root}{newest_file}', 'r') as f:
-            hiddify.error(f"importing configs from {newest_file}")
+            hutils.utils.error(f"importing configs from {newest_file}")
             json_data = json.load(f)
             hiddify.set_db_from_json(json_data,
                                      set_users=True,
@@ -644,7 +642,8 @@ def upgrade_database():
             db_version = int([d['value'] for d in json_data['hconfigs'] if d['key'] == "db_version"][0])
             os.rename(sqlite_db, sqlite_db + ".old")
             set_hconfig(ConfigEnum.db_version, db_version, commit=True)
-        hiddify.error("Upgrading to the new dataset succuess.")
+
+        hutils.utils.error("Upgrading to the new dataset succuess.")
 
 
 def init_db():
@@ -677,7 +676,7 @@ def init_db():
             if not db_action or (start_version == 0 and ver == 10):
                 continue
 
-            hiddify.error(f"Updating db from version {db_version} for node {child.id}")
+            hutils.utils.error(f"Updating db from version {db_version} for node {child.id}")
 
             if ver < 70:
                 if child.id != 0:
@@ -687,7 +686,7 @@ def init_db():
                 db_action(child.id)
 
             Events.db_init_event.notify(db_version=db_version)
-            hiddify.error(f"Updated successfuly db from version {db_version} to {ver}")
+            hutils.utils.error(f"Updated successfuly db from version {db_version} to {ver}")
 
             db_version = ver
             db.session.commit()

{hiddifypanel-10.15.0.dev1.dist-info → hiddifypanel-10.15.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.15.0.dev1
+Version: 10.15.0.dev4
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

{hiddifypanel-10.15.0.dev1.dist-info → hiddifypanel-10.15.0.dev4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=d6FSbdY9xXG61ASYSN6u18wCpJiEVxRz-Sx4HcKBl0g,13
-hiddifypanel/VERSION.py,sha256=7vuX8jDjp9ltKbbhFl3OC8uy2xR2GlB23EYESPJsCoY,118
+hiddifypanel/VERSION,sha256=60iE1LDQ778D75q94VxQ5vFWh8PZSYyJz89tCYtUbIw,13
+hiddifypanel/VERSION.py,sha256=6oWtF-egCtYEAXZCyPxuYlN3GKlK3vyc5NvGMoUnuPI,118
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=5GUwwKCRY90RS0WTKPfqzuOYuLuwGLpNLpnKmubf7DE,7405
@@ -63,7 +63,7 @@ hiddifypanel/panel/cli.py,sha256=a2rTpUlUsjv3aEkqAK0aa8_PW3e1IzpXWaJPb4EVIyg,936
 hiddifypanel/panel/common.py,sha256=8qLShJ1pPrZiChZOzi0PGFWAigRfj_DEGgLr4_5K8-E,8012
 hiddifypanel/panel/custom_widgets.py,sha256=9qI_fNX8NKqB1r8ljgcaisGZaDM89_PM_rOBZbGaTYs,2506
 hiddifypanel/panel/hiddify.py,sha256=K8obO2Chc8A0Dh0FwMWT2NyvPbI8eGSHY3wLpCB2XoU,14436
-hiddifypanel/panel/init_db.py,sha256=UJyjhv9ghq5lbQbXyv6KhPxsbrzVza-gVGlntzC84gI,32657
+hiddifypanel/panel/init_db.py,sha256=5N-y7br2PBQ9hydT8kAHjB0ujlmEmBcjqF1e5n0FkFM,32667
 hiddifypanel/panel/run_commander.py,sha256=D9y-My0xSe2adHWXKV5UPYGl-9WwKURzniq55MRu6tE,3259
 hiddifypanel/panel/usage.py,sha256=zYXhd0OTGWWV7K_UErb4mCoEla2qE2f_Rzl4-C13ia4,4828
 hiddifypanel/panel/admin/Actions.py,sha256=Ea2eFbHzPcXQcuGh1oihaMjlszuHcmSuE70azysaZ7M,8794
@@ -820,24 +820,24 @@ hiddifypanel/templates/redirect.html,sha256=K9x_O4P96vEkqBhOXIhoGrWw1KIqd2bL0BjI
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/actions.html,sha256=2NeITe2e-lPKCk_o511tCIqVtrPu8LYHE1wTCtrFUrI,1331
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=MBGrTqZpzNLe4sZy0RozvXNr8seFUQc2C6v88BJtNWc,11095
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=0a8ls9Xp9609LmqwJ7mIFlSc04DTdr0b-T7wj10rqsI,74266
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=1t0QRQyXctEGG8dDjKh6Lbs11-8HpF9il4w5mlhnnSI,74266
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=htfXb1yD7U4vfsyeF9ECctKBrfJOwnaAfPp8cUiZvTE,77415
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=LFV5a9jkEUBOJXLCtq2q6LUzurbKxc_514MV7ux7UKk,94799
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=uSkBdIecpEv_VuT5s8y3pWHo0U1B97mQ3lZfp3Ker9c,94799
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=kfaTzdmS1eJCb0NjrHLfltd_y-FGXI2LCQxDEannE4E,99980
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=xUEvIgZGUpzv4s8r-FcJ0aNg9sCVDmeO7tf40EPS8IU,60612
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=9arbXWGfogQTuEdEWfOXTVawdaPx3AkRUTVeq7ilD9Q,60612
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=tUp3Ed-ZBDZeD99yb7o6I76wWUU_QQT2i_cQfNV_7Zk,69869
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=tfwcy7INWXeWucGgJiBLrp85GWF-iDjikChFoPeaj8g,95543
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=x0GOEb1huOkW_KMo6A227Jf0INCzmvc-SsTCxd_VRbA,95543
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=ojNL5z1gvjgiO-5hjccCLhK0Z-CeZKrwE3yiEE4ekeg,102007
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=0xZ_0gWyz428zdniTrfFiJdw3nwfeAx02TVRqHkGrtA,60878
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=KAFuLEkkPqCFHwOk0Kg1IJewXMMNJpo1Qlzfok2-Ne0,60878
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=f0fv1MW5_Okc5GixUoPv5BkV0XwM6wKrjK7khLeiv18,69040
 hiddifypanel/translations.i18n/en.json,sha256=07z5rKyF0AADkYOPjJVAN9aFrbtj4V8ZAQM5wK4f4bc,67420
 hiddifypanel/translations.i18n/fa.json,sha256=M5-D3rdRCbrWQqT3N4hw0OEmjfsBAIWOLeLmqSshyCw,89976
 hiddifypanel/translations.i18n/pt.json,sha256=Wh72C6ToJUVXgAfB_2JqJKQjw0_Rvv7gsYIp8-Nbd8Q,60171
 hiddifypanel/translations.i18n/ru.json,sha256=WNSflb5-l-CWOQ71SWhDSkgQLkJVHeZ_dehn3lRyv0s,91988
 hiddifypanel/translations.i18n/zh.json,sha256=17fERyiPhWV2899MMynfIeuZL6X7u-_pWd0h5n6FJUo,59588
-hiddifypanel-10.15.0.dev1.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.15.0.dev1.dist-info/METADATA,sha256=mKLgYXPVmlOrLhVbtRaua2c-fQ_pAVZhx8219w8oeUc,4013
-hiddifypanel-10.15.0.dev1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hiddifypanel-10.15.0.dev1.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.15.0.dev1.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.15.0.dev1.dist-info/RECORD,,
+hiddifypanel-10.15.0.dev4.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.15.0.dev4.dist-info/METADATA,sha256=93jI_NSoLjG5hZ9V6AsP4Ccxo4AmSuKSdBWv5BA0Hfc,4013
+hiddifypanel-10.15.0.dev4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hiddifypanel-10.15.0.dev4.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.15.0.dev4.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.15.0.dev4.dist-info/RECORD,,