Merge pull request #340 from avinxshKD/fix/multi-dot-filename-parsing

Fix filename parsing for multiple dots

Author: pradeeban

mkconcore.py

@@ -707,7 +707,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             dockerfile_path = os.path.join(outdir, "src", f"Dockerfile.{dockername}")
             if not os.path.exists(dockerfile_path): # 3/30/21
                 try:
@@ -751,7 +751,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             fbuild.write("mkdir docker-"+dockername+"\n")
             fbuild.write("cd docker-"+dockername+"\n")
             fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
@@ -789,7 +789,7 @@ def cleanup_script_files():
                 # Use safe_container
                 frun.write(DOCKEREXE+' run --name='+safe_container+volswr[i]+volsro[i]+" "+DOCKEREPO+"/docker-"+shlex.quote(sourcecode)+"&\n")
             else:    
-                dockername,langext = sourcecode.split(".")
+                dockername,langext = sourcecode.rsplit(".", 1)
                 logging.debug(f"Generating Docker run command for {dockername}: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} docker-{dockername}")
                 # Use safe_container
                 frun.write(DOCKEREXE+' run --name='+safe_container+volswr[i]+volsro[i]+" docker-"+shlex.quote(dockername)+"&\n")
@@ -801,8 +801,8 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            #dockername,langext = sourcecode.split(".")
-            dockername = sourcecode.split(".")[0] # 3/28/21
+            #dockername,langext = sourcecode.rsplit(".", 1)
+            dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
             safe_container = shlex.quote(containername)
             fstop.write(DOCKEREXE+' stop '+safe_container+"\n")
             fstop.write(DOCKEREXE+' rm '+safe_container+"\n")
@@ -814,7 +814,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 #scape volume path using shlex.quote for Docker commands (defense-in-depth)
@@ -834,7 +834,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fmaxtime.write(' -v ')
@@ -851,7 +851,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fmaxtime.write('sudo docker cp concore.maxtime concore:/')
@@ -877,7 +877,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fparams.write(' -v ')
@@ -894,7 +894,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fparams.write('sudo docker cp concore.params concore:/')
@@ -919,7 +919,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 funlock.write(' -v ')
@@ -936,7 +936,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 funlock.write('sudo docker cp ~/concore.apikey concore:/')
@@ -956,7 +956,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             # safe_container added to debug line (POSIX)
             safe_container = shlex.quote(containername) 
             safe_image = shlex.quote("docker-" + dockername) # escape docker image name
@@ -985,7 +985,7 @@ def cleanup_script_files():
         if sourcecode.find(".")==-1:
             logging.error("cannot pull container "+sourcecode+" with control core type "+concoretype) #3/28/21
             quit()
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('mkdir '+containername+"\n")
         source_subdir = os.path.dirname(sourcecode).replace("\\", "/")
         if source_subdir:
@@ -1042,7 +1042,7 @@ def cleanup_script_files():
     containername,sourcecode = edges_dict[edges][0].split(':')
     outcount[nodes_num[edges_dict[edges][0]]] += 1
     if len(sourcecode)!=0:
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('cd '+containername+"\n")
         if concoretype=="windows":
             fbuild.write("mklink /J out"+str(outcount[nodes_num[edges_dict[edges][0]]])+" ..\\"+str(edges)+"\n")
@@ -1055,7 +1055,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('cd '+containername+"\n")
         for pair in indir[i]:
             volname,dirname = pair.split(':/')
@@ -1076,7 +1076,7 @@ def cleanup_script_files():
 for node in nodes_dict:
   containername,sourcecode = nodes_dict[node].split(':')
   if len(sourcecode)!=0:
-      dockername,langext = sourcecode.split(".")
+      dockername,langext = sourcecode.rsplit(".", 1)
       if not (langext in ["py","m","sh","cpp","v"]): # 6/22/21
           logging.error(f"Extension .{langext} is unsupported")
           quit()
@@ -1192,7 +1192,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] # 3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
         if concoretype=="windows":
             q_container = f'"{containername}"'
             fstop.write('cmd /C '+q_container+"\\concorekill\n")
@@ -1210,7 +1210,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1230,7 +1230,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1248,7 +1248,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1266,7 +1266,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()