pis-manual-fixes (#95)

Reviewed-on: #95

.gitea/workflows/auto_pr.yaml

@@ -6,6 +6,7 @@ on:
         branches:
             - auto-*
             - workflow_update
+            - pis-*
 
 jobs:
     validate_and_release:

pis/dg-manual-again.yaml

@@ -1,76 +0,0 @@
-
-  - code: "6446"
-    #headcode: 1F01
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [wsb,wmn,sal,rom,cfr,esl,frm,csa,ftn,pms,pmh]
-  - code: "6451"
-    #headcode: 1F18
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,csa,frm,esl,cfr,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
-  - code: "6539"
-    #headcode: 2V53
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pms,ftn,csa,frm,esl,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
-  - code: "6449"
-    #headcode: 1F07
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,cfr,esl,frm,csa,ftn,pms,pmh]
-  - code: "6456"
-    #headcode: 1F06
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,csa,frm,esl,cfr,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
-  - code: "6454"
-    #headcode: 1F13
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,cfr,esl,frm,csa,ftn,pms,pmh]
-  - code: "6452"
-    #headcode: 1F28
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,csa,frm,esl,cfr,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
-  - code: "6450"
-    #headcode: 1F29
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,cfr,esl,frm,ftn,pms,pmh]
-  - code: "6461"
-    #headcode: 1F33
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,cfr,esl,frm,ftn,pms,pmh]
-  - code: "6458"
-    #headcode: 1F26
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,csa,frm,esl,cfr,rom,sal,wmn,wsb,tro,boa,bth,kyn,bri,fit,stj,nwp,cdf]
-  - code: "6455"
-    #headcode: 1F35
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,cfr,esl,frm,ftn,pms]
-  - code: "6460"
-    #headcode: 2M95
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,frm,esl,cfr,rom,sal,wmn,dmh,wsb]
-  - code: "6448"
-    #headcode: 1F11
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,cfr,esl,frm,csa,ftn,pms,pmh]
-  - code: "6447"
-    #headcode: 1F03
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,cfr,esl,frm,csa,ftn,pms,pmh]
-  - code: "6453"
-    #headcode: 1F34
-    #date: 2024-10-26 00:00:00
-    #source_file: 1026 SO 26th October 2024 - West DVR SCards - Main Issue.docx
-    stops: [pmh,pms,ftn,frm,esl,cfr,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]

scripts/merge-yaml.js

@@ -31,15 +31,17 @@ function sortAndMergeYAMLFiles() {
             return codeA - codeB
         })
 
-        const mergedYaml = yaml.stringify(mergedData);
+        
 
-        // Construct the output string
+        // Construct the output string, removing duplicates
         let outputString = "pis:\n";
+        const seenCodes = new Set();
         mergedData.forEach(item => {
-            if (item.stops.length > 0) {
+            if (!seenCodes.has(item.code) && item.stops.length > 0) {
+                seenCodes.add(item.code);
                 outputString += `  - code: "${item.code}"\n`;
                 outputString += `    stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`;
-                outputString += `    toc: "gw"\n`;
+                outputString += `    toc: "${item.toc || "gw"}"\n`;
             }
         });
 
@@ -50,8 +52,9 @@ function sortAndMergeYAMLFiles() {
             console.error("Error writing gw.pis", err)
         }
 
+        // Remove any files created by dgp2
         files.forEach(file => {
-            if (file.startsWith('dg_parser')) {
+            if (file.startsWith('auto-')) {
                 fs.unlinkSync(directoryPath + file);
                 console.log(`Deleted file: ${file}`);
             }