Skip to content

Commit 9393ce5

Browse files
avinxshKDavinxshKD
committed
Fix filename parsing for multiple dots
Use rsplit('.', 1) instead of split('.')
1 parent 3b6756b commit 9393ce5

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

‎mkconcore.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@
589589
for node in nodes_dict:
590590
containername,sourcecode = nodes_dict[node].split(':')
591591
if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
592-
dockername,langext = sourcecode.split(".")
592+
dockername,langext = sourcecode.rsplit(".", 1)
593593
if not os.path.exists(outdir+"/src/Dockerfile."+dockername): # 3/30/21
594594
try:
595595
if langext=="py":
@@ -628,7 +628,7 @@
628628
for node in nodes_dict:
629629
containername,sourcecode = nodes_dict[node].split(':')
630630
if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
631-
dockername,langext = sourcecode.split(".")
631+
dockername,langext = sourcecode.rsplit(".", 1)
632632
fbuild.write("mkdir docker-"+dockername+"\n")
633633
fbuild.write("cd docker-"+dockername+"\n")
634634
fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
@@ -664,7 +664,7 @@
664664
logging.debug(f"Generating Docker run command: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} {DOCKEREPO}/docker- {sourcecode}")
665665
frun.write(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" "+DOCKEREPO+"/docker-"+sourcecode+"&\n")
666666
else:
667-
dockername,langext = sourcecode.split(".")
667+
dockername,langext = sourcecode.rsplit(".", 1)
668668
logging.debug(f"Generating Docker run command for {dockername}: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} docker-{dockername}")
669669
frun.write(DOCKEREXE+' run --name='+containername+volswr[i]+volsro[i]+" docker-"+dockername+"&\n")
670670
#if langext != "m": #3/27/21
@@ -681,8 +681,8 @@
681681
for node in nodes_dict:
682682
containername,sourcecode = nodes_dict[node].split(':')
683683
if len(sourcecode)!=0:
684-
#dockername,langext = sourcecode.split(".")
685-
dockername = sourcecode.split(".")[0] # 3/28/21
684+
#dockername,langext = sourcecode.rsplit(".", 1)
685+
dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
686686
fstop.write(DOCKEREXE+' stop '+containername+"\n")
687687
fstop.write(DOCKEREXE+' rm '+containername+"\n")
688688
i=i+1
@@ -693,7 +693,7 @@
693693
for node in nodes_dict:
694694
containername,sourcecode = nodes_dict[node].split(':')
695695
if len(sourcecode)!=0:
696-
dockername = sourcecode.split(".")[0] #3/28/21
696+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
697697
writeedges = volswr[i]
698698
while writeedges.find(":") != -1:
699699
fclear.write(DOCKEREXE+' volume rm ' +writeedges.split(":")[0].split("-v")[1]+"\n")
@@ -711,7 +711,7 @@
711711
for node in nodes_dict:
712712
containername,sourcecode = nodes_dict[node].split(':')
713713
if len(sourcecode)!=0:
714-
dockername = sourcecode.split(".")[0] #3/28/21
714+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
715715
writeedges = volswr[i]
716716
while writeedges.find(":") != -1:
717717
fmaxtime.write(' -v ')
@@ -726,7 +726,7 @@
726726
for node in nodes_dict:
727727
containername,sourcecode = nodes_dict[node].split(':')
728728
if len(sourcecode)!=0:
729-
dockername = sourcecode.split(".")[0] #3/28/21
729+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
730730
writeedges = volswr[i]
731731
while writeedges.find(":") != -1:
732732
fmaxtime.write('sudo docker cp concore.maxtime concore:/')
@@ -750,7 +750,7 @@
750750
for node in nodes_dict:
751751
containername,sourcecode = nodes_dict[node].split(':')
752752
if len(sourcecode)!=0:
753-
dockername = sourcecode.split(".")[0] #3/28/21
753+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
754754
writeedges = volswr[i]
755755
while writeedges.find(":") != -1:
756756
fparams.write(' -v ')
@@ -765,7 +765,7 @@
765765
for node in nodes_dict:
766766
containername,sourcecode = nodes_dict[node].split(':')
767767
if len(sourcecode)!=0:
768-
dockername = sourcecode.split(".")[0] #3/28/21
768+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
769769
writeedges = volswr[i]
770770
while writeedges.find(":") != -1:
771771
fparams.write('sudo docker cp concore.params concore:/')
@@ -788,7 +788,7 @@
788788
for node in nodes_dict:
789789
containername,sourcecode = nodes_dict[node].split(':')
790790
if len(sourcecode)!=0:
791-
dockername = sourcecode.split(".")[0] #3/28/21
791+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
792792
writeedges = volswr[i]
793793
while writeedges.find(":") != -1:
794794
funlock.write(' -v ')
@@ -803,7 +803,7 @@
803803
for node in nodes_dict:
804804
containername,sourcecode = nodes_dict[node].split(':')
805805
if len(sourcecode)!=0:
806-
dockername = sourcecode.split(".")[0] #3/28/21
806+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
807807
writeedges = volswr[i]
808808
while writeedges.find(":") != -1:
809809
funlock.write('sudo docker cp ~/concore.apikey concore:/')
@@ -821,7 +821,7 @@
821821
for node in nodes_dict:
822822
containername,sourcecode = nodes_dict[node].split(':')
823823
if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
824-
dockername,langext = sourcecode.split(".")
824+
dockername,langext = sourcecode.rsplit(".", 1)
825825
fdebug.write(DOCKEREXE+' run -it --name='+containername+volswr[i]+volsro[i]+" docker-"+dockername+"&\n")
826826
i=i+1
827827
fdebug.close()
@@ -847,7 +847,7 @@
847847
if sourcecode.find(".")==-1:
848848
logging.error("cannot pull container "+sourcecode+" with control core type "+concoretype) #3/28/21
849849
quit()
850-
dockername,langext = sourcecode.split(".")
850+
dockername,langext = sourcecode.rsplit(".", 1)
851851
fbuild.write('mkdir '+containername+"\n")
852852
if concoretype == "windows":
853853
fbuild.write("copy .\\src\\"+sourcecode+" .\\"+containername+"\\"+sourcecode+"\n")
@@ -898,7 +898,7 @@
898898
containername,sourcecode = edges_dict[edges][0].split(':')
899899
outcount[nodes_num[edges_dict[edges][0]]] += 1
900900
if len(sourcecode)!=0:
901-
dockername,langext = sourcecode.split(".")
901+
dockername,langext = sourcecode.rsplit(".", 1)
902902
fbuild.write('cd '+containername+"\n")
903903
if concoretype=="windows":
904904
fbuild.write("mklink /J out"+str(outcount[nodes_num[edges_dict[edges][0]]])+" ..\\"+str(edges)+"\n")
@@ -911,7 +911,7 @@
911911
for node in nodes_dict:
912912
containername,sourcecode = nodes_dict[node].split(':')
913913
if len(sourcecode)!=0:
914-
dockername,langext = sourcecode.split(".")
914+
dockername,langext = sourcecode.rsplit(".", 1)
915915
fbuild.write('cd '+containername+"\n")
916916
for pair in indir[i]:
917917
volname,dirname = pair.split(':/')
@@ -932,7 +932,7 @@
932932
for node in nodes_dict:
933933
containername,sourcecode = nodes_dict[node].split(':')
934934
if len(sourcecode)!=0:
935-
dockername,langext = sourcecode.split(".")
935+
dockername,langext = sourcecode.rsplit(".", 1)
936936
if not (langext in ["py","m","sh","cpp","v"]): # 6/22/21
937937
logging.error(f"Extension .{langext} is unsupported")
938938
quit()
@@ -1028,7 +1028,7 @@
10281028
for node in nodes_dict:
10291029
containername,sourcecode = nodes_dict[node].split(':')
10301030
if len(sourcecode)!=0:
1031-
dockername = sourcecode.split(".")[0] # 3/28/21
1031+
dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
10321032
if concoretype=="windows":
10331033
fstop.write('cmd /C '+containername+"\\concorekill\n")
10341034
fstop.write('del '+containername+"\\concorekill.bat\n")
@@ -1044,7 +1044,7 @@
10441044
for node in nodes_dict:
10451045
containername,sourcecode = nodes_dict[node].split(':')
10461046
if len(sourcecode)!=0:
1047-
dockername = sourcecode.split(".")[0] #3/28/21
1047+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
10481048
writeedges = volswr[i]
10491049
while writeedges.find(":") != -1:
10501050
if concoretype=="windows":
@@ -1061,7 +1061,7 @@
10611061
for node in nodes_dict:
10621062
containername,sourcecode = nodes_dict[node].split(':')
10631063
if len(sourcecode)!=0:
1064-
dockername = sourcecode.split(".")[0] #3/28/21
1064+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
10651065
writeedges = volswr[i]
10661066
while writeedges.find(":") != -1:
10671067
if concoretype=="windows":
@@ -1078,7 +1078,7 @@
10781078
for node in nodes_dict:
10791079
containername,sourcecode = nodes_dict[node].split(':')
10801080
if len(sourcecode)!=0:
1081-
dockername = sourcecode.split(".")[0] #3/28/21
1081+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
10821082
writeedges = volswr[i]
10831083
while writeedges.find(":") != -1:
10841084
if concoretype=="windows":
@@ -1095,7 +1095,7 @@
10951095
for node in nodes_dict:
10961096
containername,sourcecode = nodes_dict[node].split(':')
10971097
if len(sourcecode)!=0:
1098-
dockername = sourcecode.split(".")[0] #3/28/21
1098+
dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
10991099
writeedges = volswr[i]
11001100
while writeedges.find(":") != -1:
11011101
if concoretype=="windows":

0 commit comments

Comments
 (0)