From f8b9c373fd3996f58a1214adc3135b6dc5f27d45 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sun, 15 Jan 2023 15:43:41 +0000 Subject: [PATCH] mkm3u: Allow explicit setting of series-name separator. Now we can delete the trailing `:' of the Doctor Who series names, and avoid awful `::' in the `Extras' seasons. --- drwho.epls | 311 +++++++++++++++++++++++++------------------------ mkm3u | 13 ++- ref/drwho-snowmen.m3u8 | 20 ++-- 3 files changed, 177 insertions(+), 167 deletions(-) diff --git a/drwho.epls b/drwho.epls index ac36cef..5cf6c04 100644 --- a/drwho.epls +++ b/drwho.epls @@ -1,6 +1,7 @@ ;;; -*-fundamental-*- !single +!sep : !title Doctor Who !epname Part @@ -14,14 +15,14 @@ !season:- 1 !explen 24:10/10% -!series:unearthly 1.1 (A). An Unearthly Child: +!series:unearthly 1.1 (A). An Unearthly Child !dvd:unearthly D/Doctor Who/S01E01 A. An Unearthly Child.iso unearthly,6 An Unearthly Child unearthly,8 The Cave of Skulls unearthly,13 The Forest of Fear unearthly,15 The Firemaker -!series:daleks 1.2 (B). The Daleks: +!series:daleks 1.2 (B). The Daleks !dvd:daleks D/Doctor Who/S01E02 B. The Daleks.iso daleks,8 The Dead Planet daleks,3 The Survivors @@ -31,12 +32,12 @@ daleks,12 The Expedition daleks,13 The Ordeal daleks,15 The Rescue -!series:edge 1.3 (C). The Edge of Destruction: +!series:edge 1.3 (C). The Edge of Destruction !dvd:edge D/Doctor Who/S01E03 C. The Edge of Destruction.iso edge,6 The Edge of Destruction edge,7 The Brink of Disaster -!series:marco-polo 1.4 (D). Marco Polo: +!series:marco-polo 1.4 (D). Marco Polo !vdir:marco-polo D/Doctor Who (telesnap reconstructions)/S01E04 D. Marco Polo (black & white) marco-polo,- The Roof of the World marco-polo,-,l=27:20 The Singing Sands @@ -46,7 +47,7 @@ marco-polo,- Rider from Shang-tu marco-polo,- Mighty Kublai Khan marco-polo,- Assassin at Peking -!series:marinus 1.5 (E). The Keys of Marinus: +!series:marinus 1.5 (E). The Keys of Marinus !dvd:marinus D/Doctor Who/S01E05 E. The Keys of Marinus.iso marinus,5 The Sea of Death marinus,6 The Velvet Web @@ -55,14 +56,14 @@ marinus,8 The Snows of Terror marinus,9 Sentence of Death marinus,10 The keys of Marinus -!series:aztecs 1.6 (F). The Aztecs: +!series:aztecs 1.6 (F). The Aztecs !dvd:aztecs D/Doctor Who/S01E06 F. The Aztecs (episodes).iso aztecs,4 The Temple of Evil aztecs,5 The Warriors of Death aztecs,6 The Bride of Scarifice aztecs,8 The Day of Darkness -!series:sensorites 1.7 (G). The Sensorites: +!series:sensorites 1.7 (G). The Sensorites !dvd:sensorites D/Doctor Who/S01E07 G. The Sensorites.iso sensorites,3 Strangers in Space sensorites,4 The Unwilling Warriors @@ -71,7 +72,7 @@ sensorites,6 A Race Against Death sensorites,8 Kidnap sensorites,9 A Desperate Venture -!series:reign 1.8 (H). The Reign of Terror: +!series:reign 1.8 (H). The Reign of Terror !dvd:reign D/Doctor Who/S01E08 H. The Reign of Terror.iso reign,6 A Land of Fear reign,7 Guests of Madame Guillotine @@ -84,13 +85,13 @@ reign,10 Prisoners of Conciergerie !season:- 2 !explen 24:30/10% -!series:giants 2.1 (J). Planet of Giants: +!series:giants 2.1 (J). Planet of Giants !dvd:giants D/Doctor Who/S02E01 J. Planet of Giants.iso giants,2 Planet of Giants giants,3 Dangerous Journey giants,4 Crisis -!series:daleks-invasion 2.2 (K). The Dalek Invasion of Earth: +!series:daleks-invasion 2.2 (K). The Dalek Invasion of Earth !dvd:daleks-invasion D/Doctor Who/S02E02 K. The Dalek Invasion of Earth (episodes).iso daleks-invasion,1 World's End daleks-invasion,2 The Daleks @@ -99,19 +100,19 @@ daleks-invasion,4 The End of Tomorrow daleks-invasion,5 The Waking Ally daleks-invasion,6 Flashpoint -!series:rescue 2.3 (L). The Rescue: +!series:rescue 2.3 (L). The Rescue !dvd:rescue D/Doctor Who/S02E03 L. The Rescue.iso rescue,3 The Powerful Enemy rescue,4 Desperate Measures -!series:romans 2.4 (M). The Romans: +!series:romans 2.4 (M). The Romans !dvd:romans D/Doctor Who/S02E04 M. The Romans.iso romans,3 The Slave Traders romans,4 All Roads Lead to Rome romans,5 Conspiracy romans,6 Inferno -!series:web-planet 2.5 (N). The Web Planet: +!series:web-planet 2.5 (N). The Web Planet !dvd:web-planet D/Doctor Who/S02E05 N. The Web Planet.iso web-planet,4 The Web Planet web-planet,5 The Zarbi @@ -120,7 +121,7 @@ web-planet,7 Crater of Needles web-planet,8 Invasion web-planet,9 The Centre -!series:crusade 2.6 (P). The Crusade: +!series:crusade 2.6 (P). The Crusade !vdir:crusade D/Doctor Who (telesnap reconstructions)/S02E06 P. The Crusade !dvd:crusade D/Doctor Who—Lost in Time/01. Hartnell era.iso crusade,10 The Lion @@ -128,14 +129,14 @@ crusade,- The Knight of Jaffa crusade,7 The Wheel of Fortune crusade,- The Warlords -!series:museum 2.7 (Q). The Space Museum: +!series:museum 2.7 (Q). The Space Museum !dvd:museum D/Doctor Who/S02E07 Q. The Space Museum.iso museum,3 The Space Museum museum,4 The Dimensions of Time museum,5 The Search museum,6 The Final Phase -!series:chase 2.8 (R). The Chase: +!series:chase 2.8 (R). The Chase !dvd:chase D/Doctor Who/S02E08 R. The Chase (episodes).iso chase,3 The Executioners chase,4 The Death of Time @@ -144,7 +145,7 @@ chase,6 Journey into Terror chase,7 The Death of Doctor Who chase,8 The Planet of Decision -!series:meddler 2.9 (S). The Time Meddler: +!series:meddler 2.9 (S). The Time Meddler !dvd:meddler D/Doctor Who/S02E09 S. The Time Meddler.iso meddler,8 The Watcher meddler,9 The Meddling Monk @@ -155,7 +156,7 @@ meddler,11 Checkmate !season:- 3 !explen 24:45/5% -!series:galaxy-4 3.1 (T). Galaxy 4: +!series:galaxy-4 3.1 (T). Galaxy 4 !dvd:galaxy-4 D/Doctor Who/S03E01 T. Galaxy 4 (black & white).iso galaxy-4,3,l=23:05 Four Hundred Dawns galaxy-4,4 Trap of Steel @@ -165,7 +166,7 @@ galaxy-4,6 The Exploding Planet !vdir:daleks-masterplan D/Doctor Who (telesnap reconstructions)/S03E02 T-A. Mission to the Unknown daleks-masterplan,-,ep=0 3.2 (T/A). Mission to the Unknown -!series:myth-makers 3.3 (U). The Myth Makers: +!series:myth-makers 3.3 (U). The Myth Makers !vdir:myth-makers D/Doctor Who (telesnap reconstructions)/S03E03 U. The Myth Makers myth-makers,- Temple of Secrets myth-makers,- Small Prophet, Quick Return @@ -188,21 +189,21 @@ daleks-masterplan,14 3.4 (V). The Daleks' Master Plan: 10. Escape Switch daleks-masterplan,- 3.4 (V). The Daleks' Master Plan: 11. The Abandoned Planet daleks-masterplan,- 3.4 (V). The Daleks' Master Plan: 12. Destruction of Time -!series:massacre 3.5 (W). The Massacre of St Bartholomew's Eve: +!series:massacre 3.5 (W). The Massacre of St Bartholomew's Eve !vdir:massacre D/Doctor Who (telesnap reconstructions)/S03E05 W. The Massacre of St Bartholomew's Eve massacre,- War of God massacre,- The Sea Beggar massacre,- Priest of Death massacre,- Bell of Doom -!series:ark 3.6 (X). The Ark: +!series:ark 3.6 (X). The Ark !dvd:ark D/Doctor Who/S03E06 X. The Ark.iso ark,2 The Steel Sky ark,3 The Plague ark,4 The Return ark,5 The Bomb -!series:toymaker 3.7 (Y). The Celestial Toymaker: +!series:toymaker 3.7 (Y). The Celestial Toymaker !vdir:toymaker D/Doctor Who (telesnap reconstructions)/S03E07 Y. The Celestial Toymaker !dvd:toymaker D/Doctor Who—Lost in Time/01. Hartnell era.iso toymaker,- The Celestial Toyroom @@ -210,21 +211,21 @@ toymaker,- The Hall of Dolls toymaker,- The Dancing Floor toymaker,15 The Final Test -!series:gunfighters 3.8 (Z). The Gunfighters: +!series:gunfighters 3.8 (Z). The Gunfighters !dvd:gunfighters D/Doctor Who/S03E08 Z. The Gunfighters.iso gunfighters,2 A Holiday for the Doctor gunfighters,3 Don't Shoot the Pianist gunfighters,4 Johnny Ringo gunfighters,5 The O.K. Corral -!series:savages 3.9 (AA). The Savages: +!series:savages 3.9 (AA). The Savages !vdir:savages D/Doctor Who (telesnap reconstructions)/S03E09 AA. The Savages savages,- savages,- savages,- savages,- -!series:war-machines 3.10 (BB). The War Machines: +!series:war-machines 3.10 (BB). The War Machines !dvd:war-machines D/Doctor Who/S03E10 BB. The War Machines.iso war-machines,3 war-machines,4 @@ -235,21 +236,21 @@ war-machines,6,l=23:15 !season:- 4 !explen 24:30/10% -!series:smugglers 4.1 (CC). The Smugglers: +!series:smugglers 4.1 (CC). The Smugglers !vdir:smugglers D/Doctor Who (telesnap reconstructions)/S04E01 CC. The Smugglers smugglers,- smugglers,- smugglers,- smugglers,- -!series:tenth-planet 4.2 (DD). The Tenth Planet: +!series:tenth-planet 4.2 (DD). The Tenth Planet !dvd:tenth-planet D/Doctor Who/S04E02 DD. The Tenth Planet (episodes).iso tenth-planet,2 tenth-planet,4 tenth-planet,5 tenth-planet,7 -!series:daleks-power 4.3 (EE). The Power of the Daleks: +!series:daleks-power 4.3 (EE). The Power of the Daleks !dvd:daleks-power D/Doctor Who/S04E03 EE. The Power of the Daleks (episodes).iso daleks-power,2,l=28:10 daleks-power,3 @@ -258,35 +259,35 @@ daleks-power,5 daleks-power,6 daleks-power,7 -!series:highlanders 4.4 (FF). The Highlanders: +!series:highlanders 4.4 (FF). The Highlanders !vdir:highlanders D/Doctor Who (telesnap reconstructions)/S04E04 FF. The Highlanders highlanders,- highlanders,- highlanders,- highlanders,- -!series:underwater 4.5 (GG). The Underwater Menace: +!series:underwater 4.5 (GG). The Underwater Menace !dvd:underwater D/Doctor Who/S04E05 GG. The Underwater Menace.iso underwater,5 underwater,10 underwater,11 underwater,6 -!series:moonbase 4.6 (HH). The Moonbase: +!series:moonbase 4.6 (HH). The Moonbase !dvd:moonbase D/Doctor Who/S04E06 HH. The Moonbase.iso moonbase,4 moonbase,9 moonbase,5 moonbase,11 -!series:macra 4.7 (JJ). The Macra Terror: +!series:macra 4.7 (JJ). The Macra Terror !dvd:macra D/Doctor Who/S04E07 JJ. The Macra Terror (black & white).iso macra,3 macra,4 macra,5 macra,6 -!series:faceless 4.8 (KK). The Faceless Ones: +!series:faceless 4.8 (KK). The Faceless Ones !dvd:faceless D/Doctor Who/S04E08 KK. The Faceless Ones (black & white).iso faceless,9 faceless,4 @@ -295,7 +296,7 @@ faceless,6 faceless,7 faceless,8 -!series:daleks-evil 4.9 (LL). The Evil of the Daleks: +!series:daleks-evil 4.9 (LL). The Evil of the Daleks !dvd:daleks-evil D/Doctor Who/S04E09 LL. The Evil of the Daleks (black & white).iso daleks-evil,3 daleks-evil,16 @@ -309,14 +310,14 @@ daleks-evil,10 !season:- 5 !explen 24:10/10% -!series:cyber-tomb 5.1 (MM). The Tomb of the Cybermen: +!series:cyber-tomb 5.1 (MM). The Tomb of the Cybermen !dvd:cyber-tomb D/Doctor Who/S05E01 MM. The Tomb of the Cybermen (episodes).iso cyber-tomb,2 cyber-tomb,3 cyber-tomb,4 cyber-tomb,5 -!series:snowmen 5.2 (NN). The Abominable Snowmen: +!series:snowmen 5.2 (NN). The Abominable Snowmen !dvd:snowmen D/Doctor Who/S05E02 NN. The Abominable Snowmen (black & white).iso snowmen,3 snowmen,11 @@ -325,7 +326,7 @@ snowmen,6 snowmen,9 snowmen,10 -!series:ice-warriors 5.3 (OO). The Ice Warriors: +!series:ice-warriors 5.3 (OO). The Ice Warriors !dvd:ice-warriors D/Doctor Who/S05E03 OO. The Ice Warriors (episodes).iso ice-warriors,3 ice-warriors,9 @@ -334,7 +335,7 @@ ice-warriors,4 ice-warriors,6 ice-warriors,7 -!series:enemy 5.4 (PP). The Enemy of the World: +!series:enemy 5.4 (PP). The Enemy of the World !dvd:enemy D/Doctor Who/S05E04 PP. The Enemy of the World.iso enemy,2 enemy,7 @@ -343,7 +344,7 @@ enemy,3 enemy,5 enemy,6,l=21:41 -!series:web-fear 5.5 (QQ). The Web of Fear: +!series:web-fear 5.5 (QQ). The Web of Fear !dvd:web-fear D/Doctor Who/S05E05 QQ. The Web of Fear (episodes).iso web-fear,12 web-fear,4 @@ -352,7 +353,7 @@ web-fear,6 web-fear,7 web-fear,8 -!series:fury 5.6 (RR). Fury from the Deep: +!series:fury 5.6 (RR). Fury from the Deep !dvd:fury D/Doctor Who/S05E06 RR. Fury from the Deep (black & white).iso fury,3 fury,4 @@ -361,7 +362,7 @@ fury,6 fury,7 fury,8,l=26:40 -!series:wheel 5.7 (SS). The Wheel in Space: +!series:wheel 5.7 (SS). The Wheel in Space !vdir:wheel D/Doctor Who (telesnap reconstructions)/S05E07 SS. The Wheel in Space !dvd:wheel D/Doctor Who—Lost in Time/03. Troughton era, seasons 5 & 6.iso -,wheel @@ -375,7 +376,7 @@ fury,8,l=26:40 !season:- 6 !explen 24:10/5% -!series:dominators 6.1 (TT). The Dominators: +!series:dominators 6.1 (TT). The Dominators !dvd:dominators D/Doctor Who/S06E01 TT. The Dominators.iso dominators,4 dominators,5 @@ -383,7 +384,7 @@ dominators,6 dominators,7 dominators,8 -!series:mind-robber 6.2 (UU). The Mind Robber: +!series:mind-robber 6.2 (UU). The Mind Robber !dvd:mind-robber D/Doctor Who/S06E02 UU. The Mind Robber.iso mind-robber,5,l=21:00 mind-robber,6,l=21:00 @@ -391,7 +392,7 @@ mind-robber,7,l=20:00 mind-robber,8,l=20:00 mind-robber,9,l=18:00 -!series:invasion 6.3 (VV). The Invasion: +!series:invasion 6.3 (VV). The Invasion !dvd:invasion D/Doctor Who/S06E03 VV. The Invasion (parts 1–4).iso invasion,3 invasion,4 @@ -403,14 +404,14 @@ invasion,5 invasion,6 invasion,7 -!series:krotons 6.4 (WW). The Krotons: +!series:krotons 6.4 (WW). The Krotons !dvd:krotons D/Doctor Who/S06E04 WW. The Krotons.iso krotons,2 krotons,3 krotons,4,l=21:50 krotons,5,l=22:45 -!series:seeds-death 6.5 (XX). The Seeds of Death: +!series:seeds-death 6.5 (XX). The Seeds of Death !dvd:seeds-death D/Doctor Who/S06E05 XX. The Seeds of Death (episodes).iso seeds-death,3 seeds-death,4 @@ -419,7 +420,7 @@ seeds-death,6 seeds-death,7 seeds-death,8 -!series:pirates 6.6 (YY). The Space Pirates: +!series:pirates 6.6 (YY). The Space Pirates !vdir:pirates D/Doctor Who (telesnap reconstructions)/S06E06 YY. The Space Pirates !dvd:pirates D/Doctor Who—Lost in Time/03. Troughton era, seasons 5 & 6.iso pirates,- @@ -429,7 +430,7 @@ pirates,-,l=22:27 pirates,- pirates,- -!series:war-games 6.7 (ZZ). The War Games: +!series:war-games 6.7 (ZZ). The War Games !dvd:war-games D/Doctor Who/S06E07 ZZ. The War Games (parts 1–5).iso war-games,3 war-games,4 @@ -447,14 +448,14 @@ war-games,7 !season:- 7 !explen 24:00/5% -!series:spearhead 7.1 (AAA). Spearhead from Space: +!series:spearhead 7.1 (AAA). Spearhead from Space !dvd:spearhead D/Doctor Who/S07E01 AAA. Spearhead from Space.iso spearhead,2 spearhead,3 spearhead,4 spearhead,5 -!series:silurians 7.2 (BBB). Doctor Who and the Silurians: +!series:silurians 7.2 (BBB). Doctor Who and the Silurians !dvd:silurians D/Doctor Who/S07E02 BBB. Doctor Who and the Silurians (parts 1–4).iso silurians,3 silurians,4 @@ -465,7 +466,7 @@ silurians,3 silurians,4 silurians,5 -!series:ambassadors 7.3 (CCC). The Ambassadors of Death: +!series:ambassadors 7.3 (CCC). The Ambassadors of Death !dvd:ambassadors D/Doctor Who/S07E03 CCC. The Ambassadors of Death (episodes).iso ambassadors,2 ambassadors,3 @@ -475,7 +476,7 @@ ambassadors,7 ambassadors,8 ambassadors,9 -!series:inferno 7.4 (DDD). Inferno: +!series:inferno 7.4 (DDD). Inferno !dvd:inferno D/Doctor Who/S07E04 DDD. Inferno (episodes).iso inferno,3 inferno,4,l=22:10 @@ -489,14 +490,14 @@ inferno,10 !season:- 8 !explen 24:15/5% -!series:autons-terror 8.1 (EEE). Terror of the Autons: +!series:autons-terror 8.1 (EEE). Terror of the Autons !dvd:autons-terror D/Doctor Who/S08E01 EEE. Terror of the Autons.iso autons-terror,2 autons-terror,3 autons-terror,4 autons-terror,5,l=22:15 -!series:mind-evil 8.2 (FFF). The Mind of Evil: +!series:mind-evil 8.2 (FFF). The Mind of Evil !dvd:mind-evil D/Doctor Who/S08E02 FFF. The Mind of Evil (episodes).iso mind-evil,3 mind-evil,4 @@ -505,14 +506,14 @@ mind-evil,6 mind-evil,7 mind-evil,8 -!series:axos 8.3 (GGG). The Claws of Axos: +!series:axos 8.3 (GGG). The Claws of Axos !dvd:axos D/Doctor Who/S08E03 GGG. The Claws of Axos (episodes).iso axos,2 axos,3 axos,4 axos,5 -!series:colony 8.4 (HHH). Colony in Space: +!series:colony 8.4 (HHH). Colony in Space !dvd:colony D/Doctor Who/S08E04 HHH. Colony in Space.iso colony,2 colony,3,l=22:45 @@ -521,7 +522,7 @@ colony,5 colony,7 colony,8 -!series:daemons 8.5 (JJJ). The Dæmons: +!series:daemons 8.5 (JJJ). The Dæmons !dvd:daemons D/Doctor Who/S08E05 JJJ. The Dæmons (episodes).iso daemons,2 daemons,3 @@ -533,21 +534,21 @@ daemons,7 !season:- 9 !explen 24:30/5% -!series:daleks-day 9.1 (KKK). Day of the Daleks: +!series:daleks-day 9.1 (KKK). Day of the Daleks !dvd:daleks-day D/Doctor Who/S09E01 KKK. Day of the Daleks (broadcast version).iso daleks-day,2 daleks-day,3 daleks-day,4 daleks-day,5 -!series:peladon-curse 9.2 (MMM). The Curse of Peladon: +!series:peladon-curse 9.2 (MMM). The Curse of Peladon !dvd:peladon-curse D/Doctor Who/S09E02 MMM. The Curse of Peladon.iso peladon-curse,3 peladon-curse,4 peladon-curse,5 peladon-curse,6 -!series:sea-devils 9.3 (LLL). The Sea Devils: +!series:sea-devils 9.3 (LLL). The Sea Devils !dvd:sea-devils D/Doctor Who/S09E03 LLL. The Sea Devils.iso sea-devils,3 sea-devils,4 @@ -556,7 +557,7 @@ sea-devils,6 sea-devils,7 sea-devils,8 -!series:mutants 9.4 (NNN). The Mutants: +!series:mutants 9.4 (NNN). The Mutants !dvd:mutants D/Doctor Who/S09E04 NNN. The Mutants (episodes).iso mutants,3 mutants,4 @@ -565,7 +566,7 @@ mutants,6 mutants,7 mutants,8 -!series:time-monster 9.5 (OOO). The Time Monster: +!series:time-monster 9.5 (OOO). The Time Monster !dvd:time-monster D/Doctor Who/S09E05 OOO. The Time Monster.iso time-monster,3 time-monster,4 @@ -578,21 +579,21 @@ time-monster,8 !season:- 10 !explen 24:20/10% -!series:three-doctors 10.1 (RRR). The Three Doctors: +!series:three-doctors 10.1 (RRR). The Three Doctors !dvd:three-doctors D/Doctor Who/S10E01 RRR. The Three Doctors (episodes).iso three-doctors,2 three-doctors,3 three-doctors,4 three-doctors,5 -!series:carnival 10.2 (PPP). Carnival of Monsters: +!series:carnival 10.2 (PPP). Carnival of Monsters !dvd:carnival D/Doctor Who/S10E02 PPP. Carnival of Monsters (episodes).iso carnival,2 carnival,3 carnival,4 carnival,5 -!series:frontier 10.3 (QQQ). Frontier in Space: +!series:frontier 10.3 (QQQ). Frontier in Space !dvd:frontier D/Doctor Who/S10E03 QQQ. Frontier in Space (episodes).iso frontier,3 frontier,4 @@ -601,7 +602,7 @@ frontier,6 frontier,7 frontier,8 -!series:daleks-planet 10.4 (SSS). Planet of the Daleks: +!series:daleks-planet 10.4 (SSS). Planet of the Daleks !dvd:daleks-planet D/Doctor Who/S10E04 SSS. Planet of the Daleks (episodes).iso daleks-planet,3 daleks-planet,4 @@ -610,7 +611,7 @@ daleks-planet,6 daleks-planet,7 daleks-planet,8 -!series:green 10.5 (TTT). The Green Death: +!series:green 10.5 (TTT). The Green Death !dvd:green D/Doctor Who/S10E05 TTT. The Green Death (episodes).iso green,3 green,4 @@ -623,14 +624,14 @@ green,9 !season:- 11 !explen 24:30/5% -!series:time-warrior 11.1 (UUU). The Time Warrior: +!series:time-warrior 11.1 (UUU). The Time Warrior !dvd:time-warrior D/Doctor Who/S11E01 UUU. The Time Warrior.iso time-warrior,3 time-warrior,4 time-warrior,5 time-warrior,6 -!series:dinosaurs 11.2 (WWW). Invasion of the Dinosaurs: +!series:dinosaurs 11.2 (WWW). Invasion of the Dinosaurs !dvd:dinosaurs D/Doctor Who/S11E02 WWW. Invasion of the Dinosaurs (episodes).iso dinosaurs,2 dinosaurs,3 @@ -639,14 +640,14 @@ dinosaurs,5 dinosaurs,7 dinosaurs,8 -!series:daleks-death 11.3 (XXX). Death to the Daleks: +!series:daleks-death 11.3 (XXX). Death to the Daleks !dvd:daleks-death D/Doctor Who/S11E03 XXX. Death to the Daleks.iso daleks-death,2 daleks-death,3 daleks-death,4 daleks-death,5 -!series:peladon-monster 11.4 (YYY). The Monster of Peladon: +!series:peladon-monster 11.4 (YYY). The Monster of Peladon !dvd:peladon-monster D/Doctor Who/S11E04 YYY. The Monster of Peladon (episodes).iso peladon-monster,3 peladon-monster,4 @@ -655,7 +656,7 @@ peladon-monster,6 peladon-monster,7 peladon-monster,8 -!series:spiders 11.5 (ZZZ). Planet of the Spiders: +!series:spiders 11.5 (ZZZ). Planet of the Spiders !dvd:spiders D/Doctor Who/S11E05 ZZZ. Planet of the Spiders (episodes).iso spiders,3 spiders,4 @@ -668,26 +669,26 @@ spiders,8 !season:- 12 !explen 24:00/5% -!series:robot 12.1 (4A). Robot: +!series:robot 12.1 (4A). Robot !dvd:robot D/Doctor Who/S12E01 4A. Robot.iso robot,4 robot,5 robot,6 robot,7 -!series:ark-in-space 12.2 (4C). The Ark in Space: +!series:ark-in-space 12.2 (4C). The Ark in Space !dvd:ark-in-space D/Doctor Who/S12E02 4C. The Ark in Space (episodes).iso ark-in-space,3 ark-in-space,4 ark-in-space,5 ark-in-space,7 -!series:experiment 12.3 (4B). The Sontaran Experiment: +!series:experiment 12.3 (4B). The Sontaran Experiment !dvd:experiment D/Doctor Who/S12E03 4B. The Sontaran Experiment.iso experiment,3 experiment,4 -!series:daleks-genesis 12.4 (4E). Genesis of the Daleks: +!series:daleks-genesis 12.4 (4E). Genesis of the Daleks !dvd:daleks-genesis D/Doctor Who/S12E04 4E. Genesis of the Daleks (episodes).iso daleks-genesis,3 daleks-genesis,4 @@ -696,7 +697,7 @@ daleks-genesis,6 daleks-genesis,7 daleks-genesis,8 -!series:cyber-revenge 12.5 (4D). Revenge of the Cybermen: +!series:cyber-revenge 12.5 (4D). Revenge of the Cybermen !dvd:cyber-revenge D/Doctor Who/S12E05 4D. Revenge of the Cybermen.iso cyber-revenge,3 cyber-revenge,4 @@ -707,42 +708,42 @@ cyber-revenge,6 !season:- 13 !explen 24:20/5% -!series:zygons 13.1 (4F). Terror of the Zygons: +!series:zygons 13.1 (4F). Terror of the Zygons !dvd:zygons D/Doctor Who/S13E01 4F. Terror of the Zygons (episodes).iso zygons,2,l=21:45 zygons,3 zygons,4 zygons,5 -!series:planet-evil 13.2 (4H). Planet of Evil: +!series:planet-evil 13.2 (4H). Planet of Evil !dvd:planet-evil D/Doctor Who/S13E02 4H. Planet of Evil.iso planet-evil,3 planet-evil,4,l=22:30 planet-evil,5 planet-evil,6 -!series:pyramids 13.3 (4G). Pyramids of Mars: +!series:pyramids 13.3 (4G). Pyramids of Mars !dvd:pyramids D/Doctor Who/S13E03 4G. Pyramids of Mars.iso pyramids,6 pyramids,7 pyramids,8 pyramids,9 -!series:android-invasion 13.4 (4J). The Android Invasion: +!series:android-invasion 13.4 (4J). The Android Invasion !dvd:android-invasion D/Doctor Who/S13E04 4J. The Android Invasion.iso android-invasion,2 android-invasion,3 android-invasion,4 android-invasion,5,l=22:41 -!series:morbius 13.5 (4K). The Brain of Morbius: +!series:morbius 13.5 (4K). The Brain of Morbius !dvd:morbius D/Doctor Who/S13E05 4K. The Brain of Morbius.iso morbius,3 morbius,4 morbius,5 morbius,6 -!series:seeds-doom 13.6 (4L). The Seeds of Doom: +!series:seeds-doom 13.6 (4L). The Seeds of Doom !dvd:seeds-doom D/Doctor Who/S13E06 4L. The Seeds of Doom (episodes).iso seeds-doom,3 seeds-doom,4 @@ -755,42 +756,42 @@ seeds-doom,8,l=22:00 !season:- 14 !explen 24:30/5% -!series:masque 14.1 (4M). The Masque of Mandragora: +!series:masque 14.1 (4M). The Masque of Mandragora !dvd:masque D/Doctor Who/S14E01 4M. The Masque of Mandragora.iso masque,3 masque,4 masque,5 masque,6 -!series:hand 14.2 (4N). The Hand of Fear: +!series:hand 14.2 (4N). The Hand of Fear !dvd:hand D/Doctor Who/S14E02 4N. The Hand of Fear.iso hand,6 hand,7 hand,8 hand,9 -!series:assassin 14.3 (4P). The Deadly Assassin: +!series:assassin 14.3 (4P). The Deadly Assassin !dvd:assassin D/Doctor Who/S14E03 4P. The Deadly Assassin.iso assassin,3,l=21:15 assassin,4 assassin,5 assassin,6 -!series:face 14.4 (4Q). The Face of Evil: +!series:face 14.4 (4Q). The Face of Evil !dvd:face D/Doctor Who/S14E04 4Q. The Face of Evil.iso face,2 face,3 face,4 face,5 -!series:robots-death 14.5 (4R). The Robots of Death: +!series:robots-death 14.5 (4R). The Robots of Death !dvd:robots-death D/Doctor Who/S14E05 4R. The Robots of Death.iso robots-death,2 robots-death,3 robots-death,4 robots-death,5 -!series:talons 14.6 (4S). The Talons of Weng-Chiang: +!series:talons 14.6 (4S). The Talons of Weng-Chiang !dvd:talons D/Doctor Who/S14E06 4S. The Talons of Weng-Chiang (episodes).iso talons,3 talons,4 @@ -803,42 +804,42 @@ talons,8 !season:- 15 !explen 24:00/6% -!series:fang-rock 15.1 (4V). Horror of Fang Rock: +!series:fang-rock 15.1 (4V). Horror of Fang Rock !dvd:fang-rock D/Doctor Who/S15E01 4V. Horror of Fang Rock.iso fang-rock,7 fang-rock,8 fang-rock,9 fang-rock,10 -!series:invisible 15.2 (4T). The Invisible Enemy: +!series:invisible 15.2 (4T). The Invisible Enemy !dvd:invisible D/Doctor Who/S15E02 4T. The Invisible Enemy.iso invisible,3 invisible,4 invisible,5 invisible,6,l=21:25 -!series:fendahl 15.3 (4X). Image of the Fendahl: +!series:fendahl 15.3 (4X). Image of the Fendahl !dvd:fendahl D/Doctor Who/S15E03 4X. Image of the Fendahl.iso fendahl,3 fendahl,4 fendahl,5 fendahl,6,l=20:35 -!series:sun-makers 15.4 (4W). The Sun Makers: +!series:sun-makers 15.4 (4W). The Sun Makers !dvd:sun-makers D/Doctor Who/S15E04 4W. The Sun Makers.iso sun-makers,2 sun-makers,3 sun-makers,4 sun-makers,5 -!series:underworld 15.5 (4Y). Underworld: +!series:underworld 15.5 (4Y). Underworld !dvd:underworld D/Doctor Who/S15E05 4Y. Underworld.iso underworld,3 underworld,4,l=21:20 underworld,5,l=22:20 underworld,6,l=23:50 -!series:invasion-time 15.6 (4Z). The Invasion of Time: +!series:invasion-time 15.6 (4Z). The Invasion of Time !dvd:invasion-time D/Doctor Who/S15E06 4Z. The Invasion of Time (episodes).iso invasion-time,3 invasion-time,4 @@ -851,42 +852,42 @@ invasion-time,8,l=25:50 !season:- 16 !explen 24:30/6% -!series:ribos 16.1 (5A). The Key to Time—The Ribos Operation: +!series:ribos 16.1 (5A). The Key to Time—The Ribos Operation !dvd:ribos D/Doctor Who/S16E01 5A. The Ribos Operation.iso ribos,3 ribos,4 ribos,5 ribos,6 -!series:pirate-planet 16.2 (5B). The Key to Time—The Pirate Planet: +!series:pirate-planet 16.2 (5B). The Key to Time—The Pirate Planet !dvd:pirate-planet D/Doctor Who/S16E02 5B. The Pirate Planet.iso pirate-planet,3 pirate-planet,4 pirate-planet,5 pirate-planet,6 -!series:stones 16.3 (5C). The Key to Time—The Stones of Blood: +!series:stones 16.3 (5C). The Key to Time—The Stones of Blood !dvd:stones D/Doctor Who/S16E03 5C. The Stones of Blood.iso stones,3 stones,4 stones,5 stones,6 -!series:tara 16.4 (5D). The Key to Time—The Androids of Tara: +!series:tara 16.4 (5D). The Key to Time—The Androids of Tara !dvd:tara D/Doctor Who/S16E04 5D. The Androids of Tara.iso tara,3 tara,4 tara,5 tara,6 -!series:kroll 16.5 (5E). The Key to Time—The Power of Kroll: +!series:kroll 16.5 (5E). The Key to Time—The Power of Kroll !dvd:kroll D/Doctor Who/S16E05 5E. The Power of Kroll.iso kroll,3 kroll,4 kroll,5,l=22:00 kroll,6,l=22:00 -!series:armageddon 16.6 (5F). The Key to Time—The Armageddon Factor: +!series:armageddon 16.6 (5F). The Key to Time—The Armageddon Factor !dvd:armageddon D/Doctor Who/S16E06 5F. The Armageddon Factor (episodes).iso armageddon,3 armageddon,4 @@ -899,35 +900,35 @@ armageddon,8 !season:- 17 !explen 25:00/10% -!series:daleks-destiny 17.1 (5J). Destiny of the Daleks: +!series:daleks-destiny 17.1 (5J). Destiny of the Daleks !dvd:daleks-destiny D/Doctor Who/S17E01 5J. Destiny of the Daleks.iso daleks-destiny,4 daleks-destiny,5 daleks-destiny,6 daleks-destiny,7 -!series:city 17.2 (5H). City of Death: +!series:city 17.2 (5H). City of Death !dvd:city D/Doctor Who/S17E02 5H. City of Death (episodes).iso city,3 city,4 city,5 city,6 -!series:pit 17.3 (5G). The Creature from the Pit: +!series:pit 17.3 (5G). The Creature from the Pit !dvd:pit D/Doctor Who/S17E03 5G. The Creature from the Pit.iso pit,3 pit,4 pit,5 pit,6 -!series:eden 17.4 (5K). Nightmare of Eden: +!series:eden 17.4 (5K). Nightmare of Eden !dvd:eden D/Doctor Who/S17E04 5K. Nightmare of Eden.iso eden,2 eden,3 eden,4 eden,5 -!series:nimon 17.5 (5L). The Horns of Nimon: +!series:nimon 17.5 (5L). The Horns of Nimon !dvd:nimon D/Doctor Who/S17E05 5L. The Horns of Nimon.iso nimon,3 nimon,4 @@ -943,49 +944,49 @@ shada,2,l=2:18:00 17.6 (5M). Shada !season:- 18 !explen 23:30/10% -!series:hive 18.1 (5N). The Leisure Hive: +!series:hive 18.1 (5N). The Leisure Hive !dvd:hive D/Doctor Who/S18E01 5N. The Leisure Hive.iso hive,5 hive,6,l=20:50 hive,7 hive,8 -!series:meglos 18.2 (5Q). Meglos: +!series:meglos 18.2 (5Q). Meglos !dvd:meglos D/Doctor Who/S18E02 5Q. Meglos.iso meglos,3 meglos,4 meglos,5 meglos,6,l=19:36 -!series:circle 18.3 (5R). Full Circle: +!series:circle 18.3 (5R). Full Circle !dvd:circle D/Doctor Who/S18E03 5R. Full Circle.iso circle,3 circle,4 circle,5 circle,6 -!series:decay 18.4 (5P). State of Decay: +!series:decay 18.4 (5P). State of Decay !dvd:decay D/Doctor Who/S18E04 5P. State of Decay.iso decay,3 decay,4 decay,5 decay,6 -!series:gate 18.5 (5S). Warriors' Gate: +!series:gate 18.5 (5S). Warriors' Gate !dvd:gate D/Doctor Who/S18E05 5S. Warriors' Gate.iso gate,3 gate,4 gate,5 gate,6 -!series:traken 18.6 (5T). The Keeper of Traken: +!series:traken 18.6 (5T). The Keeper of Traken !dvd:traken D/Doctor Who/S18E06 5T. The Keeper of Traken.iso traken,4 traken,5 traken,6 traken,7 -!series:logopolis 18.7 (5V). Logopolis: +!series:logopolis 18.7 (5V). Logopolis !dvd:logopolis D/Doctor Who/S18E07 5V. Logopolis.iso logopolis,7 logopolis,8 @@ -996,47 +997,47 @@ logopolis,10 !season:- 19 !explen 24:00/5% -!series:castrovalva 19.1 (5Z). Castrovalva: +!series:castrovalva 19.1 (5Z). Castrovalva !dvd:castrovalva D/Doctor Who/S19E01 5Z. Castrovalva.iso castrovalva,5 castrovalva,6 castrovalva,7 castrovalva,8 -!series:doomsday 19.2 (5W). Four to Doomsday: +!series:doomsday 19.2 (5W). Four to Doomsday !dvd:doomsday D/Doctor Who/S19E02 5W. Four to Doomsday.iso doomsday,3 doomsday,4 doomsday,5 doomsday,6 -!series:kinda 19.3 (5Y). Kinda: +!series:kinda 19.3 (5Y). Kinda !dvd:kinda D/Doctor Who/S19E03 5Y. Kinda.iso kinda,2 kinda,3 kinda,4 kinda,5 -!series:visitation 19.4 (5X). The Visitation: +!series:visitation 19.4 (5X). The Visitation !dvd:visitation D/Doctor Who/S19E04 5X. The Visitation (episodes).iso visitation,4 visitation,5 visitation,6 visitation,8 -!series:orchid 19.5 (6A). Black Orchid: +!series:orchid 19.5 (6A). Black Orchid !dvd:orchid D/Doctor Who/S19E05 6A. Black Orchid.iso orchid,3 orchid,4 -!series:earthshock 19.6 (6B). Earthshock: +!series:earthshock 19.6 (6B). Earthshock !dvd:earthshock D/Doctor Who/S19E06 6B. Earthshock.iso earthshock,8 earthshock,9 earthshock,10 earthshock,11 -!series:timeflight 19.7 (6C). Time-Flight: +!series:timeflight 19.7 (6C). Time-Flight !dvd:timeflight D/Doctor Who/S19E07 6C. Time-Flight.iso timeflight,4 timeflight,5 @@ -1047,42 +1048,42 @@ timeflight,7 !season:- 20 !explen 25:00/5% -!series:arc 20.1 (6E). Arc of Infinity: +!series:arc 20.1 (6E). Arc of Infinity !dvd:arc D/Doctor Who/S20E01 6E. Arc of Infinity.iso arc,4 arc,5 arc,6 arc,7 -!series:snakedance 20.2 (6D). Snakedance: +!series:snakedance 20.2 (6D). Snakedance !dvd:snakedance D/Doctor Who/S20E02 6D. Snakedance.iso snakedance,2 snakedance,3 snakedance,4 snakedance,5 -!series:mawdryn 20.3 (6F). Mawdryn Undead: +!series:mawdryn 20.3 (6F). Mawdryn Undead !dvd:mawdryn D/Doctor Who/S20E03 6F. Mawdryn Undead.iso mawdryn,4 mawdryn,5 mawdryn,6 mawdryn,7 -!series:terminus 20.4 (6G). Terminus: +!series:terminus 20.4 (6G). Terminus !dvd:terminus D/Doctor Who/S20E04 6G. Terminus.iso terminus,4 terminus,5 terminus,6 terminus,7 -!series:enlightenment 20.5 (6H). Enlightenment: +!series:enlightenment 20.5 (6H). Enlightenment !dvd:enlightenment D/Doctor Who/S20E05 6H. Enlightenment (broadcast version).iso enlightenment,4 enlightenment,5 enlightenment,6 enlightenment,7 -!series:kings-demons 20.6 (6J). The King's Demons: +!series:kings-demons 20.6 (6J). The King's Demons !dvd:kings-demons D/Doctor Who/S20E06 6J. The King's Demons.iso kings-demons,4 kings-demons,6 @@ -1096,47 +1097,47 @@ five-doctors,2,l=1:40:00 20.7 (6K). The Five Doctors !season:- 21 !explen 25:00/5% -!series:warriors-deep 21.1 (6L). Warriors of the Deep: +!series:warriors-deep 21.1 (6L). Warriors of the Deep !dvd:warriors-deep D/Doctor Who/S21E01 6L. Warriors of the Deep.iso warriors-deep,3 warriors-deep,4 warriors-deep,5 warriors-deep,6 -!series:awakening 21.2 (6M). The Awakening: +!series:awakening 21.2 (6M). The Awakening !dvd:awakening D/Doctor Who/S21E02 6M. The Awakening.iso awakening,2 awakening,3 -!series:frontios 21.3 (6N). Frontios: +!series:frontios 21.3 (6N). Frontios !dvd:frontios D/Doctor Who/S21E03 6N. Frontios.iso frontios,2 frontios,3 frontios,4 frontios,5 -!series:daleks-resurrection 21.4 (6P). Resurrection of the Daleks: +!series:daleks-resurrection 21.4 (6P). Resurrection of the Daleks !dvd:daleks-resurrection D/Doctor Who/S21E04 6P. Resurrection of the Daleks (four-episode version).iso daleks-resurrection,2 daleks-resurrection,3 daleks-resurrection,4 daleks-resurrection,5 -!series:planet-fire 21.5 (6Q). Planet of Fire: +!series:planet-fire 21.5 (6Q). Planet of Fire !dvd:planet-fire D/Doctor Who/S21E05 6Q. Planet of Fire (broadcast version).iso planet-fire,3 planet-fire,4 planet-fire,5 planet-fire,6 -!series:caves 21.6 (6R). The Caves of Androzani: +!series:caves 21.6 (6R). The Caves of Androzani !dvd:caves D/Doctor Who/S21E06 6R. The Caves of Androzani (episodes).iso caves,3 caves,4 caves,5 caves,6 -!series:twin-dilemma 21.7 (6S). The Twin Dilemma: +!series:twin-dilemma 21.7 (6S). The Twin Dilemma !dvd:twin-dilemma D/Doctor Who/S21E07 6S. The Twin Dilemma.iso twin-dilemma,3 twin-dilemma,4 @@ -1147,33 +1148,33 @@ twin-dilemma,6 !season:- 22 !explen 44:00/5% -!series:cyber-attack 22.1 (6T). Attack of the Cybermen: +!series:cyber-attack 22.1 (6T). Attack of the Cybermen !dvd:cyber-attack D/Doctor Who/S22E01 6T. Attack of the Cybermen.iso cyber-attack,3 cyber-attack,4 -!series:varos 22.2 (6V). Vengeance on Varos: +!series:varos 22.2 (6V). Vengeance on Varos !dvd:varos D/Doctor Who/S22E02 6V. Vengeance on Varos (episodes).iso varos,2 varos,3 -!series:rani-mark 22.3 (6X). The Mark of the Rani: +!series:rani-mark 22.3 (6X). The Mark of the Rani !dvd:rani-mark D/Doctor Who/S22E03 6X. The Mark of the Rani.iso rani-mark,4 rani-mark,5 -!series:two-doctors 22.4 (6W). The Two Doctors: +!series:two-doctors 22.4 (6W). The Two Doctors !dvd:two-doctors D/Doctor Who/S22E04 6W. The Two Doctors (episodes).iso two-doctors,4 two-doctors,5 two-doctors,6 -!series:timelash 22.5 (6Y). Timelash: +!series:timelash 22.5 (6Y). Timelash !dvd:timelash D/Doctor Who/S22E05 6Y. Timelash.iso timelash,3 timelash,4 -!series:daleks-revelation 22.6 (6Z). Revelation of the Daleks: +!series:daleks-revelation 22.6 (6Z). Revelation of the Daleks !dvd:daleks-revelation D/Doctor Who/S22E06 6Z. Revelation of the Daleks.iso daleks-revelation,8 daleks-revelation,9 @@ -1182,28 +1183,28 @@ daleks-revelation,9 !season:- 23 !explen 25:00/5% -!series:mysterious-planet 23.1 (7A). The Trial of a Time Lord—The Mysterious Planet: +!series:mysterious-planet 23.1 (7A). The Trial of a Time Lord—The Mysterious Planet !dvd:mysterious-planet D/Doctor Who/S23E01 7A. The Trial of a Time Lord—The Mysterious Planet.iso mysterious-planet,8 mysterious-planet,4 mysterious-planet,5 mysterious-planet,6 -!series:mindwarp 23.2 (7B). The Trial of a Time Lord—Mindwarp: +!series:mindwarp 23.2 (7B). The Trial of a Time Lord—Mindwarp !dvd:mindwarp D/Doctor Who/S23E02 7B. The Trial of a Time Lord—Mindwarp.iso mindwarp,3 mindwarp,4 mindwarp,5 mindwarp,6 -!series:vervoids 23.3 (7C). The Trial of a Time Lord—Terror of the Vervoids: +!series:vervoids 23.3 (7C). The Trial of a Time Lord—Terror of the Vervoids !dvd:vervoids D/Doctor Who/S23E03 7C. The Trial of a Time Lord—Terror of the Vervoids.iso vervoids,3 vervoids,4 vervoids,5 vervoids,6 -!series:ultimate-foe 23.4 (7C). The Trial of a Time Lord—The Ultimate Foe: +!series:ultimate-foe 23.4 (7C). The Trial of a Time Lord—The Ultimate Foe !dvd:ultimate-foe D/Doctor Who/S23E04 7C. The Trial of a Time Lord—The Ultimate Foe.iso ultimate-foe,6 ultimate-foe,4,l=29:40 @@ -1212,27 +1213,27 @@ ultimate-foe,4,l=29:40 !season:- 24 !explen 25:00/5% -!series:rani-time 24.1 (7D). Time and the Rani: +!series:rani-time 24.1 (7D). Time and the Rani !dvd:rani-time D/Doctor Who/S24E01 7D. Time and the Rani.iso rani-time,3 rani-time,4 rani-time,5 rani-time,6 -!series:paradise 24.2 (7E). Paradise Towers: +!series:paradise 24.2 (7E). Paradise Towers !dvd:paradise D/Doctor Who/S24E02 7E. Paradise Towers.iso paradise,2 paradise,3 paradise,4 paradise,5 -!series:delta 24.3 (7F). Delta and the Bannermen: +!series:delta 24.3 (7F). Delta and the Bannermen !dvd:delta D/Doctor Who/S24E03 7F. Delta and the Bannermen.iso delta,3 delta,4 delta,5 -!series:dragonfire 24.4 (7G). Dragonfire: +!series:dragonfire 24.4 (7G). Dragonfire !dvd:dragonfire D/Doctor Who/S24E04 7G. Dragonfire.iso dragonfire,2 dragonfire,3 @@ -1242,26 +1243,26 @@ dragonfire,4 !season:- 25 !explen 25:00/5% -!series:daleks-remembrance 25.1 (7H). Remembrance of the Daleks: +!series:daleks-remembrance 25.1 (7H). Remembrance of the Daleks !dvd:daleks-remembrance D/Doctor Who/S25E01 7H. Remembrance of the Daleks.iso daleks-remembrance,4 daleks-remembrance,5 daleks-remembrance,6 daleks-remembrance,7 -!series:happiness 25.2 (7L). The Happiness Patrol: +!series:happiness 25.2 (7L). The Happiness Patrol !dvd:happiness D/Doctor Who/S25E02 7L. The Happiness Patrol.iso happiness,2 happiness,3 happiness,4 -!series:silver-nemesis 25.3 (7K). Silver Nemesis: +!series:silver-nemesis 25.3 (7K). Silver Nemesis !dvd:silver-nemesis D/Doctor Who/S25E03 7K. Silver Nemesis.iso silver-nemesis,4 silver-nemesis,5 silver-nemesis,6 -!series:greatest-show 25.4 (7J). The Greatest Show in the Galaxy: +!series:greatest-show 25.4 (7J). The Greatest Show in the Galaxy !dvd:greatest-show D/Doctor Who/S25E04 7J. The Greatest Show in the Galaxy.iso greatest-show,2 greatest-show,3 @@ -1272,27 +1273,27 @@ greatest-show,6 !season:- 26 !explen 25:00/5% -!series:battlefield 26.1 (7N). Battlefield: +!series:battlefield 26.1 (7N). Battlefield !dvd:battlefield D/Doctor Who/S26E01 7N. Battlefield (broadcast version).iso battlefield,3 battlefield,4 battlefield,5 battlefield,6 -!series:ghost-light 26.2 (7Q). Ghost Light: +!series:ghost-light 26.2 (7Q). Ghost Light !dvd:ghost-light D/Doctor Who/S26E02 7Q. Ghost Light.iso ghost-light,7 ghost-light,8 ghost-light,9 -!series:fenric 26.3 (7M). The Curse of Fenric: +!series:fenric 26.3 (7M). The Curse of Fenric !dvd:fenric D/Doctor Who/S26E03 7M. The Curse of Fenric (broadcast version).iso fenric,3 fenric,4 fenric,5 fenric,6 -!series:survival 26.4 (7P). Survival: +!series:survival 26.4 (7P). Survival !dvd:survival D/Doctor Who/S26E04 7P. Survival (broadcast version).iso survival,4 survival,5 diff --git a/mkm3u b/mkm3u index b1d9fd2..ea60ddc 100755 --- a/mkm3u +++ b/mkm3u @@ -547,6 +547,7 @@ class Playlist (object): me.nseries = 0 me.single_series_p = False me.series_title = None + me.series_sep = "" def add_episode(me, episode): me.episodes.append(episode) @@ -564,9 +565,9 @@ class Playlist (object): label = ep.label() if me.nseries > 1 and ep.series_title_p 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 ep.season.i is None: sep = ":" + else: sep = me.series_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: @@ -588,7 +589,7 @@ class Playlist (object): title = ep.season.series.full_title if me.single_series_p: stag = "-" - if title is not None: label = title + " " + label + if title is not None: label = title + me.series_sep + " " + label else: if title is None: title = me.series_title stag = ep.season.series.name @@ -817,6 +818,10 @@ class EpisodeListParser (object): src = me._auto_epsrc(series) src.nuses += n + elif cmd == "sep": + sep = ww.rest(); check(sep is not None, "missing separator") + me._pl.series_sep = sep + else: raise ExpectedError("unknown command `%s'" % cmd) diff --git a/ref/drwho-snowmen.m3u8 b/ref/drwho-snowmen.m3u8 index 7843201..3a731e5 100644 --- a/ref/drwho-snowmen.m3u8 +++ b/ref/drwho-snowmen.m3u8 @@ -1,10 +1,14 @@ #EXTM3U -#EXTINF:1378,,Part 1 -file:///mnt/dvd/archive/D/Doctor%20Who%e2%80%94The%20Lost%20TV%20Episodes%20%28audio%29/S05E02%20NN.%20The%20Abominable%20Snowmen/E01.flac -#EXTINF:1395,,Part 2 -dvd:///mnt/dvd/archive/D/Doctor%20Who%e2%80%94Lost%20in%20Time/03.%20Troughton%20era,%20seasons%205%20%26%206.iso#12 -#EXTINF:1432,,Part 3 -file:///mnt/dvd/archive/D/Doctor%20Who%e2%80%94The%20Lost%20TV%20Episodes%20%28audio%29/S05E02%20NN.%20The%20Abominable%20Snowmen/E03.flac -#EXTINF:1463,,Part 4 -file:///mnt/dvd/archive/D/Doctor%20Who%e2%80%94The%20Lost%20TV%20Episodes%20%28audio%29/S05E02%20NN.%20The%20Abominable%20Snowmen/E04.flac +#EXTINF:1427,,Part 1 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#3 +#EXTINF:1403,,Part 2 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#11 +#EXTINF:1493,,Part 3 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#5 +#EXTINF:1515,,Part 4 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#6 +#EXTINF:1497,,Part 5 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#9 +#EXTINF:1490,,Part 6 +dvd:///mnt/dvd/archive/D/Doctor%20Who/S05E02%20NN.%20The%20Abominable%20Snowmen%20%28black%20%26%20white%29.iso#10 -- 2.11.0