buffyverse.epls: Fix the title numbering for the start of Buffy season 6.

Everything got thrown off because `Bargaining' is actually presented as
a single title, not two separate episodes.

diff --git a/buffyverse.epls b/buffyverse.epls
index c73054f9bc54d03ea220a06c3e867148c772d04a..8c209ea581291d3dcbc5f2a5c3f59fa96765c0fc 100644 (file)
--- a/buffyverse.epls
+++ b/buffyverse.epls
@@ -221,14 +221,13 @@ a,3       There's No Place Like Plrtz Glrb
 a,1    Heartthrob
 a,2    That Vision Thing
 
 a,1    Heartthrob
 a,2    That Vision Thing
 

-b,1    Bargaining (part 1)
-b,2    Bargaining (part 2)
+b,1,n=2        Bargaining

 
 a,3    That Old Gang of Mine
 
 a,3    That Old Gang of Mine

-b,3    After Life
+b,2    After Life

 
 a,4    Carpe noctem
 
 a,4    Carpe noctem

-b,4    Flooded
+b,3    Flooded

 
 a,1    Fredless
 b,1    Life Serial
 
 a,1    Fredless
 b,1    Life Serial

diff --git a/ref/btvs.m3u8 b/ref/btvs.m3u8
index dc23e93c00288ed7b8a22bf2ba1f6e3ccb3ca2e2..6cf9aaa4083750b7d4b55f59b4b7d4e200a4cea3 100644 (file)
--- a/ref/btvs.m3u8
+++ b/ref/btvs.m3u8
@@ -205,14 +205,12 @@ dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S05D06.%20E20%e2%80%9322
 #EXTINF:0,,5.22. The Gift
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S05D06.%20E20%e2%80%9322.iso#3
 
 #EXTINF:0,,5.22. The Gift
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S05D06.%20E20%e2%80%9322.iso#3
 

-#EXTINF:0,,6.1. Bargaining (part 1)
+#EXTINF:0,,6.1, 2. Bargaining

 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#1
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#1

-#EXTINF:0,,6.2. Bargaining (part 2)
-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#2

 #EXTINF:0,,6.3. After Life
 #EXTINF:0,,6.3. After Life

-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#3
+dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#2

 #EXTINF:0,,6.4. Flooded
 #EXTINF:0,,6.4. Flooded

-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#4
+dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#3

 #EXTINF:0,,6.5. Life Serial
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D02.%20E05%e2%80%9308.iso#1
 #EXTINF:0,,6.6. All the Way
 #EXTINF:0,,6.5. Life Serial
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D02.%20E05%e2%80%9308.iso#1
 #EXTINF:0,,6.6. All the Way

diff --git a/ref/buffyverse.m3u8 b/ref/buffyverse.m3u8
index be75921a30e49069989747b5d9778da0fe197b0f..fc42d21648ade5ea9daf493dfda59037b26e9b95 100644 (file)
--- a/ref/buffyverse.m3u8
+++ b/ref/buffyverse.m3u8
@@ -297,18 +297,16 @@ dvd:///mnt/dvd/archive/A/Angel/S02D06.%20E20%e2%80%9322.iso#3
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#1
 #EXTINF:0,,Angel 3.2. That Vision Thing
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#2
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#1
 #EXTINF:0,,Angel 3.2. That Vision Thing
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#2

-#EXTINF:0,,Buffy the Vampire Slayer 6.1. Bargaining (part 1)
+#EXTINF:0,,Buffy the Vampire Slayer 6.1, 2. Bargaining

 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#1
 dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#1

-#EXTINF:0,,Buffy the Vampire Slayer 6.2. Bargaining (part 2)
-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#2

 #EXTINF:0,,Angel 3.3. That Old Gang of Mine
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#3
 #EXTINF:0,,Buffy the Vampire Slayer 6.3. After Life
 #EXTINF:0,,Angel 3.3. That Old Gang of Mine
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#3
 #EXTINF:0,,Buffy the Vampire Slayer 6.3. After Life

-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#3
+dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#2

 #EXTINF:0,,Angel 3.4. Carpe noctem
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#4
 #EXTINF:0,,Buffy the Vampire Slayer 6.4. Flooded
 #EXTINF:0,,Angel 3.4. Carpe noctem
 dvd:///mnt/dvd/archive/A/Angel/S03D01.%20E01%e2%80%9304.iso#4
 #EXTINF:0,,Buffy the Vampire Slayer 6.4. Flooded

-dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#4
+dvd:///mnt/dvd/archive/B/Buffy%20the%20Vampire%20Slayer/S06D01.%20E01%e2%80%9304.iso#3

 #EXTINF:0,,Angel 3.5. Fredless
 dvd:///mnt/dvd/archive/A/Angel/S03D02.%20E05%e2%80%9308.iso#1
 #EXTINF:0,,Buffy the Vampire Slayer 6.5. Life Serial
 #EXTINF:0,,Angel 3.5. Fredless
 dvd:///mnt/dvd/archive/A/Angel/S03D02.%20E05%e2%80%9308.iso#1
 #EXTINF:0,,Buffy the Vampire Slayer 6.5. Life Serial