Test: Validate for GUIDS and Locations

Signed-off-by: Luis Garcia <git@luigi311.com>

.github/workflows/ci.yml

@@ -88,7 +88,7 @@ jobs:
         run: |
           mv test/ci_guids.env .env
           python main.py
-          python test/validate_ci_marklog.py --dry
+          python test/validate_ci_marklog.py --guids
           
           rm mark.log
 
@@ -96,7 +96,7 @@ jobs:
         run: |
           mv test/ci_locations.env .env
           python main.py
-          python test/validate_ci_marklog.py --dry
+          python test/validate_ci_marklog.py --locations
           
           rm mark.log
 

test/validate_ci_marklog.py

@@ -8,7 +8,10 @@ def parse_args():
         description="Check the mark.log file that is generated by the CI to make sure it contains the expected values"
     )
     parser.add_argument(
-        "--dry", action="store_true", help="Check the mark.log file for dry-run"
+        "--guids", action="store_true", help="Check the mark.log file for guids"
+    )
+    parser.add_argument(
+        "--locations", action="store_true", help="Check the mark.log file for locations"
     )
     parser.add_argument(
         "--write", action="store_true", help="Check the mark.log file for write-run"
@@ -74,12 +77,16 @@ def check_marklog(lines, expected_values):
 def main():
     args = parse_args()
     expected_jellyfin = [
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom Movies/Movie Two (2021)",
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom TV Shows/Greatest Show Ever 3000/Episode 2",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/Five Nights at Freddy's",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/The Hunger Games: The Ballad of Songbirds & Snakes/301215",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Doctor Who (2005)/Rose",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Doctor Who (2005)/The End of the World/300670",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Aftermath",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Departure/300741",
+        "Emby/Emby-Server/jellyplex_watched/Custom Movies/Movie Two",
+        "Emby/Emby-Server/jellyplex_watched/Custom TV Shows/Greatest Show Ever (3000)/S01E02",
         "Emby/Emby-Server/jellyplex_watched/Movies/The Family Plan",
         "Emby/Emby-Server/jellyplex_watched/Movies/Five Nights at Freddy's",
         "Emby/Emby-Server/jellyplex_watched/Movies/The Hunger Games: The Ballad of Songbirds & Snakes/5",
@@ -89,31 +96,44 @@ def main():
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/The Way Out",
     ]
     expected_emby = [
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom Movies/Movie Three (2022)",
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom TV Shows/Greatest Show Ever 3000/Episode 3",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/Tears of Steel",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Aftermath",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Parallels and Interiors/240429",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom Movies/Movie Three (2022)",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom TV Shows/Greatest Show Ever (3000)/S01E03",
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Tears of Steel",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
     ]
     expected_plex = [
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Big Buck Bunny",
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Killers of the Flower Moon/4",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom TV Shows/Greatest Show Ever (3000)/S01E01",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Doctor Who/The Unquiet Dead",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Doctor Who/Aliens of London (1)/4",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Secrets and Lies",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom Movies/Movie One (2020)",
         "Emby/Emby-Server/jellyplex_watched/Movies/Big Buck Bunny",
         "Emby/Emby-Server/jellyplex_watched/Movies/The Family Plan",
         "Emby/Emby-Server/jellyplex_watched/Movies/Killers of the Flower Moon/4",
+        "Emby/Emby-Server/jellyplex_watched/Custom TV Shows/Greatest Show Ever (3000)/S01E01",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Doctor Who (2005)/The Unquiet Dead",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Doctor Who (2005)/Aliens of London (1)/4",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Secrets and Lies",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/The Way Out",
+        "Emby/Emby-Server/jellyplex_watched/Custom Movies/Movie One",
     ]
 
-    expected_dry = expected_emby + expected_plex + expected_jellyfin
+    expected_locations = expected_emby + expected_plex + expected_jellyfin
+    # Remove Custom Movies/TV Shows as they should not have guids
+    expected_guids = [item for item in expected_locations if "Custom" not in item ]
+
 
     expected_write = [
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom Movies/Movie Two (2021)",
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom TV Shows/Greatest Show Ever 3000/Episode 2",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/Five Nights at Freddy's",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/The Hunger Games: The Ballad of Songbirds & Snakes/301215",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Doctor Who (2005)/Rose",
@@ -122,10 +142,14 @@ def main():
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Departure/300741",
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Big Buck Bunny",
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Killers of the Flower Moon/4",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom TV Shows/Greatest Show Ever (3000)/S01E01",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Doctor Who/The Unquiet Dead",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Doctor Who/Aliens of London (1)/4",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Secrets and Lies",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom Movies/Movie One (2020)",
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom Movies/Movie Three (2022)",
+        "Plex/JellyPlex-CI/jellyplex_watched/Custom TV Shows/Greatest Show Ever 3000/Episode 3",
         "Plex/JellyPlex-CI/jellyplex_watched/Movies/Tears of Steel",
         "Plex/JellyPlex-CI/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Parallels and Interiors/240429",
         "Emby/Emby-Server/jellyplex_watched/Movies/Big Buck Bunny",
@@ -133,6 +157,8 @@ def main():
         "Emby/Emby-Server/jellyplex_watched/Movies/Five Nights at Freddy's",
         "Emby/Emby-Server/jellyplex_watched/Movies/The Hunger Games: The Ballad of Songbirds & Snakes/5",
         "Emby/Emby-Server/jellyplex_watched/Movies/Killers of the Flower Moon/4",
+        "Emby/Emby-Server/jellyplex_watched/Custom TV Shows/Greatest Show Ever (3000)/S01E01",
+        "Emby/Emby-Server/jellyplex_watched/Custom TV Shows/Greatest Show Ever (3000)/S01E02",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Doctor Who (2005)/Rose",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Doctor Who (2005)/The End of the World/5",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Doctor Who (2005)/The Unquiet Dead",
@@ -140,6 +166,10 @@ def main():
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Departure/5",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/Secrets and Lies",
         "Emby/Emby-Server/jellyplex_watched/TV Shows/Monarch: Legacy of Monsters/The Way Out",
+        "Emby/Emby-Server/jellyplex_watched/Custom Movies/Movie One",
+        "Emby/Emby-Server/jellyplex_watched/Custom Movies/Movie Two",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom Movies/Movie Three (2022)",
+        "Jellyfin/Jellyfin-Server/JellyUser/Custom TV Shows/Greatest Show Ever (3000)/S01E03",
         "Jellyfin/Jellyfin-Server/JellyUser/Movies/Tears of Steel",
         "Jellyfin/Jellyfin-Server/JellyUser/Shows/Monarch: Legacy of Monsters/Parallels and Interiors/4"
     ]
@@ -147,8 +177,10 @@ def main():
     # Expected values for the mark.log file, dry-run is slightly different than write-run
     # due to some of the items being copied over from one server to another and now being there
     # for the next server run.
-    if args.dry:
+    if args.guids:
-        expected_values = expected_dry
+        expected_values = expected_guids
+    elif args.locations:
+        expected_values = expected_locations
     elif args.write:
         expected_values = expected_write
     elif args.plex: