Qilan2 commited on
Commit
df08812
·
verified ·
1 Parent(s): f5ea8ab

Update Card_Hub.py

Browse files
Files changed (1) hide show
  1. Card_Hub.py +80 -14
Card_Hub.py CHANGED
@@ -536,12 +536,24 @@ def Run_SillyTavern():
536
 
537
  # 修复启动脚本和依赖的权限
538
  subprocess.run('chmod +x ./start.sh', shell=True)
539
- subprocess.run('chmod +x ./server/node_modules/.bin/nodemon', shell=True)
540
- subprocess.run('chmod +x ./client/node_modules/.bin/vite', shell=True)
541
 
542
- # 确保 node_modules 目录权限正确
543
- subprocess.run('chmod -R 755 ./server/node_modules', shell=True)
544
- subprocess.run('chmod -R 755 ./client/node_modules', shell=True)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
545
 
546
  # 启动服务
547
  subprocess.run('sh ./start.sh', shell=True, check=True)
@@ -554,18 +566,51 @@ def Run_SillyTavern():
554
  def install_dependencies():
555
  """安装必要的依赖"""
556
  try:
557
- # 安装 nodemon
558
- subprocess.run('npm install -g nodemon', shell=True)
559
- # 安装 vite
560
- subprocess.run('npm install -g vite', shell=True)
561
- # 安装项目依赖
562
  os.chdir('/Card_Hub/RoleCardSite/server')
563
  subprocess.run('npm install', shell=True)
 
 
564
  os.chdir('/Card_Hub/RoleCardSite/client')
565
  subprocess.run('npm install', shell=True)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
566
  except Exception as e:
567
  print(f"安装依赖时出错: {e}")
568
 
 
 
 
 
 
 
 
 
 
569
  def SillyTavern():
570
  print('-----------SillyTavern开始-------------')
571
  # 创建目录并写入 kaggle.json
@@ -613,14 +658,35 @@ def SillyTavern():
613
  os.system("ls /Card-Hub")
614
  os.system(f"tar -xvpf /card-hub.tar.gz -C / --use-compress-program=pigz > /dev/null")
615
 
616
- # 添加权限修复
617
- subprocess.run('chmod +x /Card_Hub/RoleCardSite/start.sh', shell=True)
618
- subprocess.run('chmod -R 755 /Card_Hub/RoleCardSite/server/node_modules', shell=True)
619
- subprocess.run('chmod -R 755 /Card_Hub/RoleCardSite/client/node_modules', shell=True)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
620
 
621
  print('更新文件')
622
  os.system("rm -r /card-hub.tar.gz /card-hub.zip /Card_Hub.ctk")
 
623
  install_dependencies()
 
624
  print('-----------SillyTavern结束-------------')
625
  threading.Thread(target=SillyTavern, daemon=True).start()
626
  time.sleep(60)
 
536
 
537
  # 修复启动脚本和依赖的权限
538
  subprocess.run('chmod +x ./start.sh', shell=True)
 
 
539
 
540
+ # 修复客户端权限
541
+ client_path = './client'
542
+ subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
543
+ subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
544
+
545
+ # 特别修复 esbuild 权限
546
+ esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
547
+ if os.path.exists(esbuild_path):
548
+ subprocess.run(f'chmod +x {esbuild_path}', shell=True)
549
+
550
+ # 修复服务器权限
551
+ server_path = './server'
552
+ subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
553
+ subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
554
+
555
+ # 修复项目文件权限
556
+ subprocess.run('chmod -R 755 .', shell=True)
557
 
558
  # 启动服务
559
  subprocess.run('sh ./start.sh', shell=True, check=True)
 
566
  def install_dependencies():
567
  """安装必要的依赖"""
568
  try:
569
+ # 安装全局依赖
570
+ subprocess.run('npm install -g nodemon vite', shell=True)
571
+
572
+ # 安装服务器依赖
 
573
  os.chdir('/Card_Hub/RoleCardSite/server')
574
  subprocess.run('npm install', shell=True)
575
+
576
+ # 安装客户端依赖
577
  os.chdir('/Card_Hub/RoleCardSite/client')
578
  subprocess.run('npm install', shell=True)
579
+
580
+ # 修复所有相关目录的权限
581
+ client_path = '/Card_Hub/RoleCardSite/client'
582
+ server_path = '/Card_Hub/RoleCardSite/server'
583
+
584
+ # 修复 node_modules 权限
585
+ subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
586
+ subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
587
+
588
+ # 特别修复 esbuild 权限
589
+ esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
590
+ if os.path.exists(esbuild_path):
591
+ subprocess.run(f'chmod +x {esbuild_path}', shell=True)
592
+
593
+ # 修复其他可执行文件权限
594
+ subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
595
+ subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
596
+
597
+ # 修复项目文件权限
598
+ subprocess.run(f'chmod -R 755 {client_path}', shell=True)
599
+ subprocess.run(f'chmod -R 755 {server_path}', shell=True)
600
+
601
+ print("依赖安装和权限修复完成")
602
  except Exception as e:
603
  print(f"安装依赖时出错: {e}")
604
 
605
+ def check_vite_config():
606
+ """检查并修复 vite 配置文件权限"""
607
+ vite_config_path = '/Card_Hub/RoleCardSite/client/vite.config.js'
608
+ if os.path.exists(vite_config_path):
609
+ subprocess.run(f'chmod 644 {vite_config_path}', shell=True)
610
+ print("vite.config.js 权限已修复")
611
+ else:
612
+ print("警告: vite.config.js 文件不存在")
613
+
614
  def SillyTavern():
615
  print('-----------SillyTavern开始-------------')
616
  # 创建目录并写入 kaggle.json
 
658
  os.system("ls /Card-Hub")
659
  os.system(f"tar -xvpf /card-hub.tar.gz -C / --use-compress-program=pigz > /dev/null")
660
 
661
+ # 添加全面的权限修复
662
+ project_path = '/Card_Hub/RoleCardSite'
663
+ client_path = f'{project_path}/client'
664
+ server_path = f'{project_path}/server'
665
+
666
+ # 修复项目根目录权限
667
+ subprocess.run(f'chmod -R 755 {project_path}', shell=True)
668
+
669
+ # 修复客户端权限
670
+ subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
671
+ subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
672
+
673
+ # 特别修复 esbuild 权限
674
+ esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
675
+ if os.path.exists(esbuild_path):
676
+ subprocess.run(f'chmod +x {esbuild_path}', shell=True)
677
+
678
+ # 修复服务器权限
679
+ subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
680
+ subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
681
+
682
+ # 修复启动脚本权限
683
+ subprocess.run(f'chmod +x {project_path}/start.sh', shell=True)
684
 
685
  print('更新文件')
686
  os.system("rm -r /card-hub.tar.gz /card-hub.zip /Card_Hub.ctk")
687
+
688
  install_dependencies()
689
+ check_vite_config()
690
  print('-----------SillyTavern结束-------------')
691
  threading.Thread(target=SillyTavern, daemon=True).start()
692
  time.sleep(60)