Skip to content

Commit 1ef272f

Browse files
piggykingpiggyking
committed
bug fixed5-can't cancel add SDG
1 parent 068b7c8 commit 1ef272f

File tree

2 files changed

+37
-23
lines changed

2 files changed

+37
-23
lines changed

‎megamenu-remote.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def details1(num):
228228
h.add(li, 0, n + 5)
229229
bb = CompactButton('返回')
230230
h.add(bb, 0, 14)
231-
rc = h.runOnce(44,3)
231+
rc = h.runOnce(43,3)
232232
if rc == "ESC" or "snack.CompactButton" in str(rc):
233233
return ADPSelect()
234234
elif li.current() == 1:
@@ -332,7 +332,7 @@ def pdinfo(num):
332332
f.add(li2, 0, 1)
333333
bb2 = CompactButton('返回')
334334
f.add(bb2, 0, 2)
335-
rf = f.runOnce(44,3)
335+
rf = f.runOnce(43,3)
336336
if rf == 'ESC' or 'snack.CompactButton' in str(rf) :
337337
return pdinfo(num)
338338
elif li2.current() == 1:
@@ -443,7 +443,7 @@ def vdinfo(num):
443443
f.add(li2, 0, 1)
444444
bb2 = CompactButton('返回')
445445
f.add(bb2, 0, 2)
446-
rf = f.runOnce(44,3)
446+
rf = f.runOnce(43,3)
447447
if rf == 'ESC' or 'snack.CompactButton' in str(rf) :
448448
return vdinfo(num)
449449
elif li2.current() == 1:
@@ -500,7 +500,7 @@ def vdinfo(num):
500500
bb = CompactButton('返回')
501501
h.add(Textbox(55, 15, gethsp, scroll = 1, wrap = 1), 0, 1)
502502
h.add(bb, 0, 2)
503-
rq = h.runOnce(44,3)
503+
rq = h.runOnce(43,3)
504504
return vdinfo(num)
505505
elif li2.current() == 4:
506506
r, t, y = client.exec_command(megacli + " -adpbootdrive -set -l" + str(selectDG) + " -a" + num + " -nolog")
@@ -545,7 +545,7 @@ def CommandList(num):
545545
g = GridForm(screen, "命令清单", 1, 10)
546546
g.add(li, 0, 1)
547547
g.add(bb, 0, 2)
548-
rc = g.runOnce(44, 3)
548+
rc = g.runOnce(43, 3)
549549
if rc == 'ESC' or 'snack.CompactButton' in str(rc) :
550550
return ADPSelect()
551551
elif li.current() == 1:
@@ -577,12 +577,13 @@ def AddSDG(num):
577577
li.append("\tRaid-10", 1)
578578
li.append("\tRaid-50", 2)
579579
li.append("\tRaid-60", 3)
580-
li.append("\t 返回", 4)
581580
g = GridForm(screen, "选择RAID级别", 1, 10)
581+
bb = CompactButton('返回')
582582
g.add(li, 0, 1)
583-
rc = g.runOnce(44,3)
583+
g.add(bb, 0, 2)
584+
rc = g.runOnce(43,3)
584585
SelectRaidLevel = li.current()
585-
if li.current() == 4 or rc == 'ESC':
586+
if 'snack.CompactButton' in str(rc) or rc == 'ESC':
586587
return CommandList(num)
587588
if li.current() == 1:
588589
if diskcount < 4 :
@@ -652,7 +653,7 @@ def AddSDGR10(num):
652653
g.add(ct, 0, 2)
653654
g.add(Label(" "), 1, 2)
654655
g.add(bb, 0, 3, growx = 1)
655-
rc = g.runOnce(44,3)
656+
rc = g.runOnce(43,3)
656657
else:
657658
warwindows(screen, "警告", "剩余磁盘不足")
658659
return CommandList(num)
@@ -798,6 +799,8 @@ def AddSDGR10(num):
798799
g.add(CachePolicyRB, 1, 4)
799800
g.add(bb, 3, 2, growx = 1)
800801
rc = g.runOnce(25,3)
802+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
803+
return AddSDG(num)
801804
arraygroup = ''
802805
for i in j:
803806
arraygroup = arraygroup + str(i).strip('\n')
@@ -1035,6 +1038,8 @@ def AddSDGR50(num):
10351038
g.add(CachePolicyRB, 1, 4)
10361039
g.add(bb, 3, 2, growx = 1)
10371040
rc = g.runOnce(25,3)
1041+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
1042+
return AddSDG(num)
10381043
arraygroup = ''
10391044
for i in j:
10401045
arraygroup = arraygroup + str(i).strip('\n')
@@ -1272,6 +1277,8 @@ def AddSDGR60(num):
12721277
g.add(CachePolicyRB, 1, 4)
12731278
g.add(bb, 3, 2, growx = 1)
12741279
rc = g.runOnce(25,3)
1280+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
1281+
return AddSDG(num)
12751282
arraygroup = ''
12761283
for i in j:
12771284
arraygroup = arraygroup + str(i).strip('\n')
@@ -1541,7 +1548,7 @@ def ADPSelect():
15411548
li.setCurrent(adpl)
15421549
h.add(li, 0, 1)
15431550
h.add(bb, 0, 9)
1544-
rc = h.run(25,3)
1551+
rc = h.run(24,3)
15451552
if "snack.CompactButton" in str(rc) or rc == 'ESC':
15461553
return mainform()
15471554
else :
@@ -1568,7 +1575,7 @@ def QCCMDList(num):
15681575
g = GridForm(screen, "命令清单", 1, 10)
15691576
g.add(li, 0, 1)
15701577
g.add(bb, 0, 2)
1571-
rc = g.runOnce(44, 3)
1578+
rc = g.runOnce(43, 3)
15721579
if rc == 'ESC' or "snack.CompactButton" in str(rc):
15731580
return ADPSelect()
15741581
elif li.current() == 1:

‎megamenu.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def details1(num):
201201
h.add(li, 0, n + 5)
202202
bb = CompactButton('返回')
203203
h.add(bb, 0, 14)
204-
rc = h.runOnce(44,3)
204+
rc = h.runOnce(43,3)
205205
if rc == "ESC" or "snack.CompactButton" in str(rc):
206206
return ADPSelect()
207207
elif li.current() == 1:
@@ -279,7 +279,7 @@ def pdinfo(num):
279279
if 'None' in pdforeign[n]:
280280
li.append(str(i).strip('\n').replace('Slot Number','槽位') + "\t大小: " + str(pdsize[n]).strip('\n') + "\t状态: " + str(pdstate[n]).strip('\n').replace(' ',''), n + 1)
281281
else:
282-
li.append(str(i).strip('\n').replace('Slot Number','<Foreign>槽位') + "\t大小: " + str(pdsize[n]).strip('\n') + "\t\t状态: " + str(pdstate[n]).strip('\n').replace(' ',''), n + 1)
282+
li.append(str(i).strip('\n').replace('Slot Number','<Foreign>槽位') + "\t大小: " + str(pdsize[n]).strip('\n') + "\t状态: " + str(pdstate[n]).strip('\n').replace(' ',''), n + 1)
283283
n = n + 1
284284
g = GridForm(screen, "物理磁盘信息", 1, 10)
285285
g.add(li, 0, 1)
@@ -301,7 +301,7 @@ def pdinfo(num):
301301
f.add(li2, 0, 1)
302302
bb2 = CompactButton('返回')
303303
f.add(bb2, 0, 2)
304-
rf = f.runOnce(44,3)
304+
rf = f.runOnce(43,3)
305305
if rf == 'ESC' or 'snack.CompactButton' in str(rf) :
306306
return pdinfo(num)
307307
elif li2.current() == 1:
@@ -405,7 +405,7 @@ def vdinfo(num):
405405
f.add(li2, 0, 1)
406406
bb2 = CompactButton('返回')
407407
f.add(bb2, 0, 2)
408-
rf = f.runOnce(44,3)
408+
rf = f.runOnce(43,3)
409409
if rf == 'ESC' or 'snack.CompactButton' in str(rf) :
410410
return vdinfo(num)
411411
elif li2.current() == 1:
@@ -460,7 +460,7 @@ def vdinfo(num):
460460
bb = CompactButton('返回')
461461
h.add(Textbox(55, 15, gethsp, scroll = 1, wrap = 1), 0, 1)
462462
h.add(bb, 0, 2)
463-
rq = h.runOnce(44,3)
463+
rq = h.runOnce(43,3)
464464
return vdinfo(num)
465465
elif li2.current() == 4:
466466
setbootdrv = os.popen(megacli + " -adpbootdrive -set -l" + str(selectDG) + " -a" + num + " -nolog").read()
@@ -502,7 +502,7 @@ def CommandList(num):
502502
g = GridForm(screen, "命令清单", 1, 10)
503503
g.add(li, 0, 1)
504504
g.add(bb, 0, 2)
505-
rc = g.runOnce(44, 3)
505+
rc = g.runOnce(43, 3)
506506
if rc == 'ESC' or 'snack.CompactButton' in str(rc) :
507507
return ADPSelect()
508508
elif li.current() == 1:
@@ -534,12 +534,13 @@ def AddSDG(num):
534534
li.append("\tRaid-10", 1)
535535
li.append("\tRaid-50", 2)
536536
li.append("\tRaid-60", 3)
537-
li.append("\t 返回", 4)
538537
g = GridForm(screen, "选择RAID级别", 1, 10)
538+
bb = CompactButton('返回')
539539
g.add(li, 0, 1)
540-
rc = g.runOnce(44,3)
540+
g.add(bb, 0, 2)
541+
rc = g.runOnce(43,3)
541542
SelectRaidLevel = li.current()
542-
if li.current() == 4 or rc == 'ESC':
543+
if 'snack.CompactButton' in str(rc) or rc == 'ESC':
543544
return CommandList(num)
544545
if li.current() == 1:
545546
if diskcount < 4 :
@@ -609,7 +610,7 @@ def AddSDGR10(num):
609610
g.add(ct, 0, 2)
610611
g.add(Label(" "), 1, 2)
611612
g.add(bb, 0, 3, growx = 1)
612-
rc = g.runOnce(44,3)
613+
rc = g.runOnce(43,3)
613614
else:
614615
warwindows(screen, "警告", "剩余磁盘不足")
615616
return CommandList(num)
@@ -755,6 +756,8 @@ def AddSDGR10(num):
755756
g.add(CachePolicyRB, 1, 4)
756757
g.add(bb, 3, 2, growx = 1)
757758
rc = g.runOnce(25,3)
759+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
760+
return AddSDG(num)
758761
arraygroup = ''
759762
for i in j:
760763
arraygroup = arraygroup + str(i).strip('\n')
@@ -990,6 +993,8 @@ def AddSDGR50(num):
990993
g.add(CachePolicyRB, 1, 4)
991994
g.add(bb, 3, 2, growx = 1)
992995
rc = g.runOnce(25,3)
996+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
997+
return AddSDG(num)
993998
arraygroup = ''
994999
for i in j:
9951000
arraygroup = arraygroup + str(i).strip('\n')
@@ -1225,6 +1230,8 @@ def AddSDGR60(num):
12251230
g.add(CachePolicyRB, 1, 4)
12261231
g.add(bb, 3, 2, growx = 1)
12271232
rc = g.runOnce(25,3)
1233+
if rc == 'ESC' or str(bb.buttonPressed(rc)) == "cancel" :
1234+
return AddSDG(num)
12281235
arraygroup = ''
12291236
for i in j:
12301237
arraygroup = arraygroup + str(i).strip('\n')
@@ -1486,7 +1493,7 @@ def ADPSelect():
14861493
li.setCurrent(adpl)
14871494
h.add(li, 0, 1)
14881495
h.add(bb, 0, 9)
1489-
rc = h.run(25,3)
1496+
rc = h.run(24,3)
14901497
if "snack.CompactButton" in str(rc) or rc == 'ESC':
14911498
return mainform()
14921499
else :
@@ -1513,7 +1520,7 @@ def QCCMDList(num):
15131520
g = GridForm(screen, "命令清单", 1, 10)
15141521
g.add(li, 0, 1)
15151522
g.add(bb, 0, 2)
1516-
rc = g.runOnce(44, 3)
1523+
rc = g.runOnce(43, 3)
15171524
if rc == 'ESC' or "snack.CompactButton" in str(rc):
15181525
return ADPSelect()
15191526
elif li.current() == 1:

0 commit comments

Comments
 (0)