Skip to content

Commit 4f9cdd9

Browse files
LxHTTLxHTT
committed
final version 1.7.0 for mefrp 4.0
1 parent 8d016f1 commit 4f9cdd9

31 files changed

+136
-110
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ encrypt.pyi
3232

3333
# runtime
3434
MEFrp-Launcher-Settings.json
35-
frpc/**
35+
# frpc/**
3636
update/**
3737
config/**
3838
*.zip*

‎MELauncherLib/APIController/Connections.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#

‎MELauncherLib/AppController/ExceptionHandler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, MCSL Team, mailto:services@mcsl.com.cn
1+
# Copyright 2025, MCSL Team, mailto:services@mcsl.com.cn
22
#
33
# Part of "MCSL2", a simple and multifunctional Minecraft server launcher.
44
#

‎MELauncherLib/AppController/Settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#

‎MELauncherLib/AppController/Utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#

‎MELauncherLib/FrpcController/completer.py‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#
@@ -11,14 +11,17 @@
1111
#
1212
################################################################################
1313

14-
import os
15-
from os import path as osp, remove
16-
from shutil import move, rmtree
17-
from platform import system, architecture
14+
# from shutil import move, rmtree
15+
# from platform import system, architecture
16+
# from zipfile import ZipFile
17+
# from ..AppController.Settings import cfg
18+
# import os
19+
# from os import path as osp, remove
20+
from os import path as osp
21+
from platform import system
1822
from PyQt5.QtCore import QProcess
19-
from zipfile import ZipFile
2023
from .. import FRPC_VERSION
21-
from ..AppController.Settings import cfg
24+
2225

2326
frpcDownloadInfo = {
2427
"darwin_amd64": f"MirrorEdgeFrp_{FRPC_VERSION}_darwin_amd64.tar.gz",
@@ -30,47 +33,47 @@
3033
}
3134

3235

33-
def downloadFrpc(parent):
34-
arch = architecture()[0]
35-
if arch == "64bit":
36-
arch = "amd64"
37-
elif arch == "32bit":
38-
arch = "386"
39-
else:
40-
arch = "arm64"
41-
if system().lower() == "macos":
42-
systemType = "darwin"
43-
else:
44-
systemType = system().lower()
45-
try:
46-
url = (
47-
cfg.get(cfg.frpcCompletionSrc)
48-
+ frpcDownloadInfo["{systemType}_{arch}".format(systemType=systemType, arch=arch)]
49-
)
50-
except KeyError:
51-
raise LookupError("Not support this platform!")
52-
parent.systemTrayIcon.showMessage("MEFrp Launcher", "正在补全Frpc，请耐心等待...", 5)
53-
if osp.exists(f"frpc/{osp.basename(url)}"):
54-
remove(f"frpc/{osp.basename(url)}")
55-
os.system(f"aria2c.exe -d frpc {url}")
56-
extractFrpc(file_name=osp.basename(url))
57-
parent.systemTrayIcon.showMessage("MEFrp Launcher", "Frpc补全完毕", 5)
36+
# def downloadFrpc(parent):
37+
# arch = architecture()[0]
38+
# if arch == "64bit":
39+
# arch = "amd64"
40+
# elif arch == "32bit":
41+
# arch = "386"
42+
# else:
43+
# arch = "arm64"
44+
# if system().lower() == "macos":
45+
# systemType = "darwin"
46+
# else:
47+
# systemType = system().lower()
48+
# try:
49+
# url = (
50+
# cfg.get(cfg.frpcCompletionSrc)
51+
# + frpcDownloadInfo["{systemType}_{arch}".format(systemType=systemType, arch=arch)]
52+
# )
53+
# except KeyError:
54+
# raise LookupError("Not support this platform!")
55+
# parent.systemTrayIcon.showMessage("MEFrp Launcher", "正在补全Frpc，请耐心等待...", 5)
56+
# if osp.exists(f"frpc/{osp.basename(url)}"):
57+
# remove(f"frpc/{osp.basename(url)}")
58+
# os.system(f"aria2c.exe -d frpc {url}")
59+
# extractFrpc(file_name=osp.basename(url))
60+
# parent.systemTrayIcon.showMessage("MEFrp Launcher", "Frpc补全完毕", 5)
5861

5962

60-
def extractFrpc(file_name):
61-
frpcProcessName = "frpc.exe" if system().lower() == "windows" else "frpc"
62-
if osp.exists(f"frpc/{frpcProcessName}"):
63-
remove(f"frpc/{frpcProcessName}")
64-
with ZipFile(f"frpc/{file_name}", "r") as frpcArchive:
65-
frpcArchive.extract(
66-
f"{file_name.replace('.zip', '').replace('.tar.gz', '')}/{frpcProcessName}", "frpc"
67-
)
68-
move(
69-
f"frpc/{file_name.replace('.zip', '').replace('.tar.gz', '')}/{frpcProcessName}",
70-
f"frpc/{frpcProcessName}",
71-
)
72-
remove(f"frpc/{file_name}")
73-
rmtree(f"frpc/{file_name.replace('.zip', '').replace('.tar.gz', '')}")
63+
# def extractFrpc(file_name):
64+
# frpcProcessName = "frpc.exe" if system().lower() == "windows" else "frpc"
65+
# if osp.exists(f"frpc/{frpcProcessName}"):
66+
# remove(f"frpc/{frpcProcessName}")
67+
# with ZipFile(f"frpc/{file_name}", "r") as frpcArchive:
68+
# frpcArchive.extract(
69+
# f"{file_name.replace('.zip', '').replace('.tar.gz', '')}/{frpcProcessName}", "frpc"
70+
# )
71+
# move(
72+
# f"frpc/{file_name.replace('.zip', '').replace('.tar.gz', '')}/{frpcProcessName}",
73+
# f"frpc/{frpcProcessName}",
74+
# )
75+
# remove(f"frpc/{file_name}")
76+
# rmtree(f"frpc/{file_name.replace('.zip', '').replace('.tar.gz', '')}")
7477

7578

7679
def checkFrpc(getVersion):

‎MELauncherLib/FrpcController/processCreator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright 2024, MCSL Team, mailto:services@mcsl.com.cn
2+
# Copyright 2025, MCSL Team, mailto:services@mcsl.com.cn
33
#
44
# Part of "MCSL2", a simple and multifunctional Minecraft server launcher.
55
#

‎MELauncherLib/Interfaces/AboutPage.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#
@@ -95,6 +95,14 @@ def __init__(self, parent=None):
9595
self.openMEFrpWebBtn.setSizePolicy(sizePolicy)
9696
self.openMEFrpWebBtn.setObjectName("openMEFrpWebBtn")
9797
self.aboutBtnLayout.addWidget(self.openMEFrpWebBtn)
98+
self.joinMEFrpQQGroupBtn = TonalPushButton(self.aboutBtnWidget)
99+
sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
100+
sizePolicy.setHorizontalStretch(0)
101+
sizePolicy.setVerticalStretch(0)
102+
sizePolicy.setHeightForWidth(self.joinMEFrpQQGroupBtn.sizePolicy().hasHeightForWidth())
103+
self.joinMEFrpQQGroupBtn.setSizePolicy(sizePolicy)
104+
self.joinMEFrpQQGroupBtn.setObjectName("joinMEFrpQQGroupBtn")
105+
self.aboutBtnLayout.addWidget(self.joinMEFrpQQGroupBtn)
98106
self.openLauncherRepoBtn = TonalPushButton(self.aboutBtnWidget)
99107
sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
100108
sizePolicy.setHorizontalStretch(0)
@@ -396,9 +404,10 @@ def __init__(self, parent=None):
396404
self.TitleLabel.setText("关于")
397405
self.launcherTitle.setText("MEFrp-Launcher-Qt")
398406
self.versionLabel.setText(f"当前版本：{VERSION}")
399-
self.copyrightLabel.setText("Copyright © 2024 LxHTT.")
407+
self.copyrightLabel.setText("Copyright © 2025 LxHTT.")
400408
self.openMEFrpWebBtn.setText("打开 ME Frp 官网")
401-
self.openLauncherRepoBtn.setText("打开 GitHub 仓库")
409+
self.joinMEFrpQQGroupBtn.setText("加入官方 QQ 群聊")
410+
self.openLauncherRepoBtn.setText("打开程序 GitHub 仓库")
402411
self.authorTitle.setText("作者")
403412
self.authorLabel.setText("落雪无痕LxHTT")
404413
self.openSourceTitle.setText("开源协议提示")
@@ -407,17 +416,17 @@ def __init__(self, parent=None):
407416
)
408417
self.softwareRegTitle.setText("计算机软件著作权提醒")
409418
self.softwareRegLabel.setText(
410-
"“镜缘映射MEFrp桌面启动器软件” 已进行中华人民共和国计算机软件著作权登记，一切侵权行为将依法追究。\n计算机软件著作权登记号: 2024SR0443831" # noqa: E501
419+
"“镜缘映射MEFrp桌面启动器软件” 已进行中华人民共和国计算机软件著作权登记，一切侵权行为将依法追究。\n计算机软件著作权登记号: 2025SR0443831" # noqa: E501
411420
)
412421
self.openSourceProjectLabel.setText("开源项目引用列表")
413422
self.pyqt5Title.setText("PyQt5")
414423
self.pyqt5Copyright.setText("Copyright © 2023 Riverbank Computing Limited.")
415424
self.pyqt5License.setText("Licensed under the GPL-3.0 License.")
416425
self.mefrplibTitle.setText("MEFrpLib")
417-
self.mefrplibCopyright.setText("Copyright © 2024, LxHTT.")
426+
self.mefrplibCopyright.setText("Copyright © 2025, LxHTT.")
418427
self.mefrplibLicense.setText("Licensed under the GPL-3.0 License.")
419428
self.qmaterialwidgetsxTitle.setText("QMaterialWidgets X")
420-
self.qmaterialwidgetsxCopyright.setText("Copyright © 2024, zhiyiYo and LxHTT.")
429+
self.qmaterialwidgetsxCopyright.setText("Copyright © 2025, zhiyiYo and LxHTT.")
421430
self.requestsTitle.setText("requests")
422431
self.requestsCopyright.setText("Copyright © 2017 by Kenneth Reitz.")
423432
self.requestsLicense.setText("Licensed under the Apache 2.0 License.")
@@ -428,6 +437,7 @@ def __init__(self, parent=None):
428437
self.pydesCopyright.setText("Copyright © 2010, Todd Whiteman.")
429438
self.pydesLicense.setText("Licensed under the MIT License.")
430439
self.openMEFrpWebBtn.clicked.connect(lambda: openWebUrl("https://www.mefrp.com"))
440+
self.openMEFrpWebBtn.clicked.connect(lambda: openWebUrl("https://qm.qq.com/q/pZaRHwiowi"))
431441
self.openLauncherRepoBtn.clicked.connect(
432442
lambda: openWebUrl("https://github.com/LxHTT/MEFrp-Launcher-Qt")
433443
)

‎MELauncherLib/Interfaces/CreateTunnelPage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#

‎MELauncherLib/Interfaces/HomePage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, LxHTT.
1+
# Copyright 2025, LxHTT.
22
#
33
# Part of "MEFrp-Launcher-Qt", a frpc launcher for ME Frp.
44
#

0 commit comments

Comments
 (0)