Skip to content

Commit 487d163

Browse files
mbridakmbridak
authored
Merge pull request #466 from mbridak/465-correct-cabrillo-operators-line
Corrected the Cabrillo OPERATORS line.
2 parents 95e81b4 + d04396a commit 487d163

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+386
-129
lines changed

‎not1mm/plugins/10_10_fall_cw.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,14 @@ def cabrillo(self, file_encoding):
283283
file_descriptor,
284284
file_encoding,
285285
)
286-
ops = f"@{self.station.get('Call','')}"
286+
ops = ""
287287
list_of_ops = self.database.get_ops()
288288
for op in list_of_ops:
289-
ops += f", {op.get('Operator', '')}"
289+
ops += f"{op.get('Operator', '')}, "
290+
if self.station.get("Call", "") not in ops:
291+
ops += f"@{self.station.get('Call','')}"
292+
else:
293+
ops = ops.rstrip(", ")
290294
output_cabrillo_line(
291295
f"OPERATORS: {ops}",
292296
"\r\n",

‎not1mm/plugins/10_10_spring_cw.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,14 @@ def cabrillo(self, file_encoding):
282282
file_descriptor,
283283
file_encoding,
284284
)
285-
ops = f"@{self.station.get('Call','')}"
285+
ops = ""
286286
list_of_ops = self.database.get_ops()
287287
for op in list_of_ops:
288-
ops += f", {op.get('Operator', '')}"
288+
ops += f"{op.get('Operator', '')}, "
289+
if self.station.get("Call", "") not in ops:
290+
ops += f"@{self.station.get('Call','')}"
291+
else:
292+
ops = ops.rstrip(", ")
289293
output_cabrillo_line(
290294
f"OPERATORS: {ops}",
291295
"\r\n",

‎not1mm/plugins/10_10_summer_phone.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,14 @@ def cabrillo(self, file_encoding):
286286
file_descriptor,
287287
file_encoding,
288288
)
289-
ops = f"@{self.station.get('Call','')}"
289+
ops = ""
290290
list_of_ops = self.database.get_ops()
291291
for op in list_of_ops:
292-
ops += f", {op.get('Operator', '')}"
292+
ops += f"{op.get('Operator', '')}, "
293+
if self.station.get("Call", "") not in ops:
294+
ops += f"@{self.station.get('Call','')}"
295+
else:
296+
ops = ops.rstrip(", ")
293297
output_cabrillo_line(
294298
f"OPERATORS: {ops}",
295299
"\r\n",

‎not1mm/plugins/10_10_winter_phone.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,14 @@ def cabrillo(self, file_encoding):
284284
file_descriptor,
285285
file_encoding,
286286
)
287-
ops = f"@{self.station.get('Call','')}"
287+
ops = ""
288288
list_of_ops = self.database.get_ops()
289289
for op in list_of_ops:
290-
ops += f", {op.get('Operator', '')}"
290+
ops += f"{op.get('Operator', '')}, "
291+
if self.station.get("Call", "") not in ops:
292+
ops += f"@{self.station.get('Call','')}"
293+
else:
294+
ops = ops.rstrip(", ")
291295
output_cabrillo_line(
292296
f"OPERATORS: {ops}",
293297
"\r\n",

‎not1mm/plugins/ari_40_80.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,14 @@ def cabrillo(self, file_encoding):
279279
file_descriptor,
280280
file_encoding,
281281
)
282-
ops = f"@{self.station.get('Call','')}"
282+
ops = ""
283283
list_of_ops = self.database.get_ops()
284284
for op in list_of_ops:
285-
ops += f", {op.get('Operator', '')}"
285+
ops += f"{op.get('Operator', '')}, "
286+
if self.station.get("Call", "") not in ops:
287+
ops += f"@{self.station.get('Call','')}"
288+
else:
289+
ops = ops.rstrip(", ")
286290
output_cabrillo_line(
287291
f"OPERATORS: {ops}",
288292
"\r\n",

‎not1mm/plugins/ari_dx.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,14 @@ def cabrillo(self, file_encoding):
361361
file_descriptor,
362362
file_encoding,
363363
)
364-
ops = f"@{self.station.get('Call','')}"
364+
ops = ""
365365
list_of_ops = self.database.get_ops()
366366
for op in list_of_ops:
367-
ops += f", {op.get('Operator', '')}"
367+
ops += f"{op.get('Operator', '')}, "
368+
if self.station.get("Call", "") not in ops:
369+
ops += f"@{self.station.get('Call','')}"
370+
else:
371+
ops = ops.rstrip(", ")
368372
output_cabrillo_line(
369373
f"OPERATORS: {ops}",
370374
"\r\n",

‎not1mm/plugins/arrl_10m.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,14 @@ def cabrillo(self, file_encoding):
369369
file_descriptor,
370370
file_encoding,
371371
)
372-
ops = f"@{self.station.get('Call','')}"
372+
ops = ""
373373
list_of_ops = self.database.get_ops()
374374
for op in list_of_ops:
375-
ops += f", {op.get('Operator', '')}"
375+
ops += f"{op.get('Operator', '')}, "
376+
if self.station.get("Call", "") not in ops:
377+
ops += f"@{self.station.get('Call','')}"
378+
else:
379+
ops = ops.rstrip(", ")
376380
output_cabrillo_line(
377381
f"OPERATORS: {ops}",
378382
"\r\n",

‎not1mm/plugins/arrl_160m.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,14 @@ def cabrillo(self, file_encoding):
376376
file_descriptor,
377377
file_encoding,
378378
)
379-
ops = f"@{self.station.get('Call','')}"
379+
ops = ""
380380
list_of_ops = self.database.get_ops()
381381
for op in list_of_ops:
382-
ops += f", {op.get('Operator', '')}"
382+
ops += f"{op.get('Operator', '')}, "
383+
if self.station.get("Call", "") not in ops:
384+
ops += f"@{self.station.get('Call','')}"
385+
else:
386+
ops = ops.rstrip(", ")
383387
output_cabrillo_line(
384388
f"OPERATORS: {ops}",
385389
"\r\n",

‎not1mm/plugins/arrl_dx_cw.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,14 @@ def cabrillo(self, file_encoding):
312312
file_descriptor,
313313
file_encoding,
314314
)
315-
ops = f"@{self.station.get('Call','')}"
315+
ops = ""
316316
list_of_ops = self.database.get_ops()
317317
for op in list_of_ops:
318-
ops += f", {op.get('Operator', '')}"
318+
ops += f"{op.get('Operator', '')}, "
319+
if self.station.get("Call", "") not in ops:
320+
ops += f"@{self.station.get('Call','')}"
321+
else:
322+
ops = ops.rstrip(", ")
319323
output_cabrillo_line(
320324
f"OPERATORS: {ops}",
321325
"\r\n",

‎not1mm/plugins/arrl_dx_ssb.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,14 @@ def cabrillo(self, file_encoding):
312312
file_descriptor,
313313
file_encoding,
314314
)
315-
ops = f"@{self.station.get('Call','')}"
315+
ops = ""
316316
list_of_ops = self.database.get_ops()
317317
for op in list_of_ops:
318-
ops += f", {op.get('Operator', '')}"
318+
ops += f"{op.get('Operator', '')}, "
319+
if self.station.get("Call", "") not in ops:
320+
ops += f"@{self.station.get('Call','')}"
321+
else:
322+
ops = ops.rstrip(", ")
319323
output_cabrillo_line(
320324
f"OPERATORS: {ops}",
321325
"\r\n",

0 commit comments

Comments
 (0)