CHANGES:

- Olympus / Tacview: more secure writing of Export.lua

Author: karel26

extensions/olympus/extension.py

@@ -19,7 +19,7 @@
 
 _ = get_translation(__name__.split('.')[1])
 
-OLYMPUS_EXPORT_LINE = "pcall(function() local olympusLFS=require('lfs');dofile(olympusLFS.writedir()..[[Mods\\Services\\Olympus\\Scripts\\OlympusCameraControl.lua]]); end,nil)\n"
+OLYMPUS_EXPORT_LINE = "pcall(function() local olympusLFS=require('lfs');dofile(olympusLFS.writedir()..[[Mods\\Services\\Olympus\\Scripts\\OlympusCameraControl.lua]]); end,nil)"
 ANSI_ESCAPE_RE = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
 
 server_ports: dict[int, str] = dict()
@@ -222,8 +222,11 @@ async def prepare_exports_lua(self):
         except FileNotFoundError:
             lines = []
 
-        if OLYMPUS_EXPORT_LINE not in lines:
-            lines.append(OLYMPUS_EXPORT_LINE)
+        for line in lines:
+            if OLYMPUS_EXPORT_LINE in line:
+                break
+        else:
+            lines.append(OLYMPUS_EXPORT_LINE + '\n')
             async with aiofiles.open(export_file, mode='w', encoding='utf-8') as outfile:
                 await outfile.writelines(lines)
 

extensions/tacview/extension.py

@@ -15,7 +15,7 @@
 _ = get_translation(__name__.split('.')[1])
 
 TACVIEW_DEFAULT_DIR = os.path.normpath(os.path.expandvars(os.path.join('%USERPROFILE%', 'Documents', 'Tacview')))
-TACVIEW_EXPORT_LINE = "local Tacviewlfs=require('lfs');dofile(Tacviewlfs.writedir()..'Scripts/TacviewGameExport.lua')\n"
+TACVIEW_EXPORT_LINE = "local Tacviewlfs=require('lfs');dofile(Tacviewlfs.writedir()..'Scripts/TacviewGameExport.lua')"
 TACVIEW_PATTERN_MATCH = r'Successfully saved \[(?P<filename>.*?\.acmi)\]'
 
 rtt_ports: dict[int, str] = dict()
@@ -355,8 +355,11 @@ def ignore_funct(dirname, filenames) -> list[str]:
                 lines = await infile.readlines()
         except FileNotFoundError:
             lines = []
-        if TACVIEW_EXPORT_LINE not in lines:
-            lines.append(TACVIEW_EXPORT_LINE)
+        for line in lines:
+            if TACVIEW_EXPORT_LINE in line:
+                break
+        else:
+            lines.append(TACVIEW_EXPORT_LINE + '\n')
             async with aiofiles.open(export_file, mode='w', encoding='utf-8') as outfile:
                 await outfile.writelines(lines)
         # load the configuration