magnax 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- magnax/__init__.py +1 -1
- magnax/templates/404.html +1 -1
- magnax/templates/analysis.html +1 -1
- magnax/templates/analysis_compare.html +1 -1
- magnax/templates/analysis_pk.html +1 -1
- magnax/templates/base.html +12 -10
- magnax/templates/pk.html +1 -1
- magnax/templates/report.html +1 -1
- magnax/web.py +5 -5
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/METADATA +1 -1
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/RECORD +15 -15
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/WHEEL +0 -0
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/entry_points.txt +0 -0
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/licenses/LICENSE +0 -0
- {magnax-1.0.7.dist-info → magnax-1.0.9.dist-info}/top_level.txt +0 -0
magnax/__init__.py
CHANGED
magnax/templates/404.html
CHANGED
magnax/templates/analysis.html
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{% extends 'base.html' %}
|
|
2
|
-
{% block title %}
|
|
2
|
+
{% block title %}MagnaX - {% if lan == 'cn' %} 数据比对 {% else %} Data Comparison {% endif %}{% endblock %}
|
|
3
3
|
|
|
4
4
|
{% block css %}{% endblock %}
|
|
5
5
|
|
magnax/templates/base.html
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<!doctype html>
|
|
2
2
|
<!--
|
|
3
|
-
*
|
|
3
|
+
* MagnaX - real-time collection tool for Android/iOS performance data.
|
|
4
4
|
* @Author Rafa Chen
|
|
5
|
-
* Copyright
|
|
5
|
+
* Copyright MagnaX.2022~now
|
|
6
6
|
-->
|
|
7
7
|
<html lang="en">
|
|
8
8
|
<head>
|
|
@@ -22,6 +22,8 @@
|
|
|
22
22
|
<link rel="stylesheet" href="./static/css/sweetalert2.min.css" />
|
|
23
23
|
<!--highlight-->
|
|
24
24
|
<link rel="stylesheet" href="./static/css/highlight.min.css">
|
|
25
|
+
<!-- MagnaX Dark Theme -->
|
|
26
|
+
<link rel="stylesheet" href="./static/css/magnax-dark-theme.css">
|
|
25
27
|
|
|
26
28
|
{% block css %}
|
|
27
29
|
{% endblock %}
|
|
@@ -34,10 +36,10 @@
|
|
|
34
36
|
<span class="navbar-toggler-icon"></span>
|
|
35
37
|
</button>
|
|
36
38
|
<h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
|
|
37
|
-
<a href="https://github.com/
|
|
38
|
-
<img src="./static/logo/logo.png" width="110" height="32" alt="
|
|
39
|
+
<a href="https://github.com/SoperRookie/MagnaX" target="_blank">
|
|
40
|
+
<img src="./static/logo/logo.png" width="110" height="32" alt="MAGNAX" class="navbar-brand-image">
|
|
39
41
|
</a>
|
|
40
|
-
<label style="margin-left: 10px;font-weight: bolder;font-style: normal;font-size: 25px;">
|
|
42
|
+
<label style="margin-left: 10px;font-weight: bolder;font-style: normal;font-size: 25px;">MAGNAX</label>
|
|
41
43
|
</h1>
|
|
42
44
|
<div class="collapse navbar-collapse" id="navbar-menu" style="margin-left: 20px;">
|
|
43
45
|
<div class="d-flex flex-column flex-md-row flex-fill align-items-stretch align-items-md-center">
|
|
@@ -106,7 +108,7 @@
|
|
|
106
108
|
<ul class="list-inline list-inline-dots mb-0">
|
|
107
109
|
<li class="list-inline-item">
|
|
108
110
|
Copyright © <label id="curYear"></label>
|
|
109
|
-
|
|
111
|
+
MagnaX.{% if lan == 'cn' %} 保留所有权利 {% else %} All rights reserved {% endif %}
|
|
110
112
|
</li>
|
|
111
113
|
</ul>
|
|
112
114
|
</div>
|
|
@@ -131,9 +133,9 @@
|
|
|
131
133
|
<li class="nav-item"><a href="#tab-top-4" class="nav-link" data-bs-toggle="tab">{% if lan == 'cn' %} 远程访问 {% else %} Remote {% endif %}
|
|
132
134
|
{% if lan == 'en' %}
|
|
133
135
|
<span class="form-help" data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true" data-bs-content="
|
|
134
|
-
Start
|
|
136
|
+
Start magnax on the Slave machine first, and then configure the Host here.</p>Note: The port number cannot be the same as the Master machine</p>">?</span>
|
|
135
137
|
{% else %}
|
|
136
|
-
<span class="form-help" data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true" data-bs-content="先在其他机器启动
|
|
138
|
+
<span class="form-help" data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true" data-bs-content="先在其他机器启动magnax,然后将Host配置在这里</p>注意：端口号不能和主机器一样</p> ">?</span>
|
|
137
139
|
{% endif %}</a>
|
|
138
140
|
</li>
|
|
139
141
|
</ul>
|
|
@@ -204,7 +206,7 @@
|
|
|
204
206
|
<svg t="1680252875419" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19154" width="50" height="50"><path d="M471.04 727.04h81.92v184.32h-81.92z" p-id="19155"></path><path d="M307.2 911.36m30.72 0l348.16 0q30.72 0 30.72 30.72l0 0q0 30.72-30.72 30.72l-348.16 0q-30.72 0-30.72-30.72l0 0q0-30.72 30.72-30.72Z" p-id="19156"></path><path d="M20.48 51.2m51.2 0l880.64 0q51.2 0 51.2 51.2l0 573.44q0 51.2-51.2 51.2l-880.64 0q-51.2 0-51.2-51.2l0-573.44q0-51.2 51.2-51.2Z" p-id="19157"></path><path d="M122.88 645.12m20.48 0l737.28 0q20.48 0 20.48 20.48l0 0q0 20.48-20.48 20.48l-737.28 0q-20.48 0-20.48-20.48l0 0q0-20.48 20.48-20.48Z" fill="#EBBA50" p-id="19158"></path></svg>
|
|
205
207
|
</td>
|
|
206
208
|
<td>
|
|
207
|
-
<input id="host" type="text" class="form-control form-control-sm" placeholder="ex : 192.168.10.10:6006" value="{{ settings.
|
|
209
|
+
<input id="host" type="text" class="form-control form-control-sm" placeholder="ex : 192.168.10.10:6006" value="{{ settings.magnax_host }}">
|
|
208
210
|
</td>
|
|
209
211
|
<td>
|
|
210
212
|
<label class="form-check form-switch">
|
|
@@ -346,7 +348,7 @@
|
|
|
346
348
|
betteryWarning:parseInt($('#battery_warning_value').val()),
|
|
347
349
|
gpuWarning:parseInt($('#gpu_warning_value').val()),
|
|
348
350
|
duration:parseInt($('#duration').val()),
|
|
349
|
-
|
|
351
|
+
magnax_host: $('#host').val(),
|
|
350
352
|
host_switch:host_switch
|
|
351
353
|
},
|
|
352
354
|
beforeSend: function () {
|
magnax/templates/pk.html
CHANGED
magnax/templates/report.html
CHANGED
magnax/web.py
CHANGED
|
@@ -85,7 +85,7 @@ def listen(port):
|
|
|
85
85
|
if conn:
|
|
86
86
|
pid = conn[0].pid
|
|
87
87
|
logger.warning('Port {} is used by process {}'.format(port, pid))
|
|
88
|
-
logger.info('you can start
|
|
88
|
+
logger.info('you can start magnax : python -m magnax --host={ip} --port={port}')
|
|
89
89
|
return False
|
|
90
90
|
return True
|
|
91
91
|
|
|
@@ -98,9 +98,9 @@ def status(host: str, port: int):
|
|
|
98
98
|
def open_url(host: str, port: int):
|
|
99
99
|
flag = True
|
|
100
100
|
while flag:
|
|
101
|
-
logger.info('start
|
|
101
|
+
logger.info('start magnax service')
|
|
102
102
|
f = Figlet(font="slant", width=300)
|
|
103
|
-
print(f.renderText("
|
|
103
|
+
print(f.renderText("MAGNAX {}".format(__version__)))
|
|
104
104
|
flag = status(host, port)
|
|
105
105
|
try:
|
|
106
106
|
webbrowser.open('http://{}:{}/?platform=Android&lan=en'.format(host, port), new=2)
|
|
@@ -192,7 +192,7 @@ def _run_with_sudo_linux(cmd_args):
|
|
|
192
192
|
try:
|
|
193
193
|
# Try zenity (GNOME)
|
|
194
194
|
result = subprocess.run(
|
|
195
|
-
['zenity', '--password', '--title=
|
|
195
|
+
['zenity', '--password', '--title=MagnaX - iOS tunneld'],
|
|
196
196
|
capture_output=True,
|
|
197
197
|
text=True,
|
|
198
198
|
timeout=60
|
|
@@ -338,7 +338,7 @@ def main(host=ip(), port=50003):
|
|
|
338
338
|
pool.close()
|
|
339
339
|
pool.join()
|
|
340
340
|
except KeyboardInterrupt:
|
|
341
|
-
logger.info('stop
|
|
341
|
+
logger.info('stop magnax success')
|
|
342
342
|
sys.exit()
|
|
343
343
|
except Exception as e:
|
|
344
344
|
logger.exception(e)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
magnax/__init__.py,sha256=
|
|
1
|
+
magnax/__init__.py,sha256=hmNG4vUzdEbiCWK3ahIYW68yzSpgBEAmzcxy57H6Z4U,49
|
|
2
2
|
magnax/__main__.py,sha256=68w-kiT6T5K21OeMstIIjL1TnZAyH1POhuwA4deKXa0,553
|
|
3
3
|
magnax/debug.py,sha256=9qiGqFyLOMgoC8gAfsU8Id0dysp3aKzKPwemIg1cx8U,1877
|
|
4
|
-
magnax/web.py,sha256=
|
|
4
|
+
magnax/web.py,sha256=IQj24QNgJ7I2YbnU4yu8KGojJfHEYyygqf7ZFYIiL8M,10679
|
|
5
5
|
magnax/public/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
6
6
|
magnax/public/adb.py,sha256=71usHLFn9mlh7V-xgHHMyiTvGzeFJgcSE5ObkP_2LDk,2709
|
|
7
7
|
magnax/public/android_fps.py,sha256=2OA49N6TG10-MlBUQk68rX0nBxfUjpx1Uv_tcnuVATw,34547
|
|
@@ -68,20 +68,20 @@ magnax/static/js/sweetalert2.min.js,sha256=1wdzPaz-33Od8lJ1zr3SgE3mAPkfXkHP5vhuJ
|
|
|
68
68
|
magnax/static/js/tabler.demo.min.js,sha256=-nFJXv3jVmM7zBR7saEuzbv-TjTSkvyCGU3XrfL7wic,2653
|
|
69
69
|
magnax/static/js/tabler.min.js,sha256=Yec_wgeTa-Lbhldsd1R6VeSHgnx3muIs-2Ye9lp5gVo,143123
|
|
70
70
|
magnax/static/logo/logo.png,sha256=kRRxyPFasUOSyo8nMHYsaKrgFaBG-768cE5nWzgk9bw,1820
|
|
71
|
-
magnax/templates/404.html,sha256=
|
|
72
|
-
magnax/templates/analysis.html,sha256=
|
|
73
|
-
magnax/templates/analysis_compare.html,sha256=
|
|
74
|
-
magnax/templates/analysis_pk.html,sha256=
|
|
75
|
-
magnax/templates/base.html,sha256=
|
|
71
|
+
magnax/templates/404.html,sha256=ZphpuMEVvb58o059EntHVQuWfmJiqliBNT6ZOk95yAg,7766
|
|
72
|
+
magnax/templates/analysis.html,sha256=qWE9ai55pRCJ1n_HI-ibt1ONr2191S5Rlld9d4toW2I,101508
|
|
73
|
+
magnax/templates/analysis_compare.html,sha256=4qd5ADvYkcWUkebb0PCYugdKGyXxBdek9qElJyj_-ZI,43225
|
|
74
|
+
magnax/templates/analysis_pk.html,sha256=sAj_sORbSLg31Yr5fUPbuTwX_Jkfe7SuoY6mTqWGe5M,38462
|
|
75
|
+
magnax/templates/base.html,sha256=DPtOX_6bOsxeTAI2pGhaoR1L36zbY6Z5E7b0TXlT1iU,31668
|
|
76
76
|
magnax/templates/index.html,sha256=YlMiz2JxluRwPgxpgAbAFRu7C_j4iveaOsD02zizbEs,163760
|
|
77
|
-
magnax/templates/pk.html,sha256=
|
|
78
|
-
magnax/templates/report.html,sha256=
|
|
77
|
+
magnax/templates/pk.html,sha256=i_ZdkoBGEswDkvmrsYXKOCVMJGikT-59O3TugeWnWjo,56532
|
|
78
|
+
magnax/templates/report.html,sha256=TVr3_Qtnns1I5hWBWPiyvwkHjOrgIHnNITfg2TwuE8s,36916
|
|
79
79
|
magnax/view/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
80
80
|
magnax/view/apis.py,sha256=hxHug7ffXkqYUsIzGs1HT2E-2yyfd8uvyH8F15mp6u4,41235
|
|
81
81
|
magnax/view/pages.py,sha256=xG1aGdAGFyWvyR_ebV7UFqlimBc9jEt2aLQmwDoti1s,4899
|
|
82
|
-
magnax-1.0.
|
|
83
|
-
magnax-1.0.
|
|
84
|
-
magnax-1.0.
|
|
85
|
-
magnax-1.0.
|
|
86
|
-
magnax-1.0.
|
|
87
|
-
magnax-1.0.
|
|
82
|
+
magnax-1.0.9.dist-info/licenses/LICENSE,sha256=09YEeCofSxCb1Asz9e5gZrgIIQqhy0LrIBCpgvQbqqI,1090
|
|
83
|
+
magnax-1.0.9.dist-info/METADATA,sha256=g9W1rrfW2SvEOoVm4TkpP0blKMNO79krVxkHWzE2auY,8859
|
|
84
|
+
magnax-1.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
|
|
85
|
+
magnax-1.0.9.dist-info/entry_points.txt,sha256=L3KQqjbXBQQldfi_ZN5Katb4JyXPSmHAmjkjbFWt4XY,48
|
|
86
|
+
magnax-1.0.9.dist-info/top_level.txt,sha256=45TCGtmk8yUZsPPXDk3AgiZgDTxv2E9YDv9CHIk7NmU,7
|
|
87
|
+
magnax-1.0.9.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|