From 48d26ec885e01d55ee92487bd3f07d478ebd9a9f Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 Mar 2022 00:10:33 +0000
Subject: [PATCH] mkm3u: Fix formatting of movies with series prefix.

---
 mkm3u             | 5 ++++-
 ref/stargate.m3u8 | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mkm3u b/mkm3u
index bc963d5..5867236 100755
--- a/mkm3u
+++ b/mkm3u
@@ -437,7 +437,10 @@ class Playlist (object):
       f.write("\n")
       for ep in season:
         label = ep.label()
-        if me.nseries > 1: label = ep.season.series.title + " " + label
+        if me.nseries > 1 and ep.season.series.title is not None:
+          if ep.season.i is None: sep = "—"
+          else: sep = " "
+          label = ep.season.series.title + sep + label
         if not ep.chapters:
           f.write("#EXTINF:%d,,%s\n%s\n" % (ep.duration, label, ep.url))
         else:
diff --git a/ref/stargate.m3u8 b/ref/stargate.m3u8
index 9c1f9b4..c18f682 100644
--- a/ref/stargate.m3u8
+++ b/ref/stargate.m3u8
@@ -1,6 +1,6 @@
 #EXTM3U
 
-#EXTINF:7495,,Stargate Stargate
+#EXTINF:7495,,Stargate—Stargate
 dvd:///mnt/dvd/archive/S/Stargate.iso#14
 
 #EXTINF:5587,,Stargate SG-1 1.1. Children of the Gods
@@ -553,7 +553,7 @@ dvd:///mnt/dvd/archive/S/Stargate%20SG-1/S10D05.%20E17%e2%80%9320.iso#4
 #EXTINF:2510,,Stargate Atlantis 3.20. First Strike
 dvd:///mnt/dvd/archive/S/Stargate%20Atlantis/S03D05.%20E17%e2%80%9320.iso#4
 
-#EXTINF:5863,,Stargate SG-1 Stargate—The Ark of Truth
+#EXTINF:5863,,Stargate SG-1—Stargate—The Ark of Truth
 dvd:///mnt/dvd/archive/S/Stargate%e2%80%94The%20Ark%20of%20Truth.iso#2
 
 #EXTINF:2507,,Stargate Atlantis 4.1. Adrift
@@ -599,7 +599,7 @@ dvd:///mnt/dvd/archive/S/Stargate%20Atlantis/S04D05.%20E17%e2%80%9320.iso#7
 
 #EXTINF:2510,,Stargate Atlantis 5.1. Search and Rescue
 dvd:///mnt/dvd/archive/S/Stargate%20Atlantis/S05D01.%20E01%e2%80%9304.iso#3
-#EXTINF:5674,,Stargate SG-1 Stargate—Continuum
+#EXTINF:5674,,Stargate SG-1—Stargate—Continuum
 dvd:///mnt/dvd/archive/S/Stargate%e2%80%94Continuum.iso#3
 #EXTINF:2506,,Stargate Atlantis 5.2. The Seed
 dvd:///mnt/dvd/archive/S/Stargate%20Atlantis/S05D01.%20E01%e2%80%9304.iso#4
-- 
2.11.0