Symlink fixes (#76)

* Fix range index issues on episode check

* Fix docstring

* Added requested_by, and other tweaks.

* Lots of tweaks everywhere. Ready for Review

* make corrections for ids. change to watchlist count.

* Add fixes for requested changes

* remove unnecessary function

* Add latest changes

---------

Co-authored-by: Dreu Lavelle <[email protected]>
Co-authored-by: Spoked <Spoked@localhost>

Dockerfile

@@ -34,4 +34,4 @@ COPY entrypoint.sh ./entrypoint.sh
 RUN chmod +x ./entrypoint.sh
 ENTRYPOINT ["/iceberg/entrypoint.sh"]
 
-EXPOSE 3000 8080
+EXPOSE 3000 8080

README.md

@@ -85,10 +85,12 @@ You can view the readme in `make` to get started!
 make
 ```
 
-To get started you can simply
+To get started you can simply do this. This will stop any previous Iceberg containers and remove previous image.
+As well as rebuild the image using cached layers. If your a developer, then any files changed in the code will not get cached, 
+and thus rebuilt in the image.
 
 ```sh
 make start
 ```
 
-You can restart with `make restart` **or** `make restart-nocache` to build the image without caching layers.
+You can also restart the container with `make restart`, or view the logs with `make logs`. 

backend/program/content/mdblist.py

@@ -40,10 +40,12 @@ def run(self):
                         items += self._get_items_from_list(
                             list_id, self.settings["api_key"]
                         )
-                if len(items) != len(self.last_items):
+                if len(items) != len(self.media_items):
                     self.last_items = items
                     new_items = [item for item in items if item not in self.media_items]
                     container = self.updater.create_items(new_items)
+                    for item in container:
+                        item.set("requested_by", "Mdblist")
                     added_items = self.media_items.extend(container)
                     if len(added_items) > 0:
                         logger.info("Added %s items", len(added_items))

backend/program/content/overseerr.py

@@ -41,6 +41,8 @@ def run(self):
             self.last_items = items
             new_items = [item for item in items if item not in self.media_items]
             container = self.updater.create_items(new_items)
+            for item in container:
+                item.set("requested_by", "Overseerr")
             added_items = self.media_items.extend(container)
             if len(added_items) > 0:
                 logger.info("Added %s items", len(added_items))

backend/program/content/plex_watchlist.py

@@ -15,6 +15,7 @@ def __init__(self, media_items: MediaItemContainer):
         self.initialized = False
         self.media_items = media_items
         self.watchlist_url = settings.get("plex")["watchlist"]
+        self.previous_added_items_count = 0
         if not self.watchlist_url or not self._validate_settings():
             logger.info(
                 "Plex watchlist RSS URL is not configured and will not be used."
@@ -39,25 +40,32 @@ def run(self):
         items = self._get_items_from_plex_watchlist()
         new_items = [item for item in items if item not in self.media_items]
         container = self.updater.create_items(new_items)
+        for item in container:
+            item.set("requested_by", "Plex Watchlist")
+        previous_count = len(self.media_items)
         added_items = self.media_items.extend(container)
-        if len(added_items) > 0:
-            logger.info("Added %s items", len(added_items))
+        added_items_count = len(self.media_items) - previous_count
+        if added_items_count != self.previous_added_items_count and added_items_count > 0:
+            logger.info("Added %s items", added_items_count)
+            self.previous_added_items_count = added_items_count
+        if added_items_count > 0:
+            for added_item in added_items:
+                logger.debug("Added %s", added_item.title)
 
     def _get_items_from_plex_watchlist(self) -> list:
         """Fetch media from Plex watchlist"""
-        response_obj = get(self.watchlist_url, timeout=5)
+        response_obj = get(self.watchlist_url, timeout=30)
         watchlist_data = json.loads(response_obj.response.content)
         items = watchlist_data.get("items", [])
         ids = []
         for item in items:
-            imdb_id = next(
-                (
-                    guid.split("//")[-1]
-                    for guid in item.get("guids")
-                    if "imdb://" in guid
-                ),
-                None,
-            )
-            ids.append(imdb_id)
-        logger.debug("Found %s items", len(ids))
+            imdb_id = next((guid.split("//")[-1] for guid in item.get("guids") if "imdb://" in guid), None)
+            if imdb_id:
+                tvdb_id = next((guid.split("//")[-1] for guid in item.get("guids") if "tvdb://" in guid), None)
+                if tvdb_id:
+                    # TODO: Convert tvdb to imdb. Will work on this later.
+                    logger.debug("Found imdb id %s and tvdb id %s for %s", imdb_id, tvdb_id, item.get("title"))
+                else:
+                    # TODO: Needs testing to determine if streams only return tvdb/imdb or if there are other options.
+                    logger.debug("No imdb id or tvdb id found for %s", item.get("title"))
         return ids

backend/program/debrid/realdebrid.py

@@ -129,9 +129,9 @@ def _download_item(self, item):
         if item.type == "movie":
             log_string = item.title
         if item.type == "season":
-            log_string = f"{item.parent.title} season {item.number}"
+            log_string = f"{item.parent.title} S{item.number}"
         if item.type == "episode":
-            log_string = f"{item.parent.parent.title} season {item.parent.number} episode {item.number}"
+            log_string = f"{item.parent.parent.title} S{item.parent.number}E{item.number}"
 
         logger.debug("Downloaded %s", log_string)
         return 1

backend/program/media.py

@@ -32,6 +32,7 @@ def __init__(self, item):
         self.streams = {}
         self.symlinked = False
         self.requested_at = item.get("requested_at", None) or datetime.datetime.now()
+        self.requested_by = item.get("requested_by", None)
 
         # Media related
         self.title = item.get("title", None)
@@ -88,6 +89,7 @@ def to_dict(self):
             "genres": self.genres,
             "guid": self.guid,
             "requested_at": self.requested_at,
+            "requested_by": self.requested_by
         }
 
     def to_extended_dict(self):

backend/program/scrapers/torrentio.py

@@ -63,16 +63,14 @@ def _scrape_items(self, items: list):
         amount_scraped = 0
         for item in items:
             data = self.api_scrape(item)
-            log_string = item.title
             if item.type == "season":
-                log_string = f"{item.parent.title} season {item.number}"
+                log_string = f"{item.parent.title} S{item.number}"
             if item.type == "episode":
-                log_string = f"{item.parent.parent.title} season {item.parent.number} episode {item.number}"
+                log_string = f"{item.parent.parent.title} S{item.parent.number}E{item.number}"
             if len(data) > 0:
                 item.set("streams", data)
                 logger.debug("Found %s streams for %s", len(data), log_string)
                 amount_scraped += 1
-                continue
             logger.debug("Could not find streams for %s", log_string)
         return amount_scraped
 

backend/program/updaters/trakt.py

@@ -1,8 +1,8 @@
 """Trakt updater module"""
 from datetime import datetime
 from os import path
-from utils.logger import get_data_path, logger
-from utils.request import get
+from backend.utils.logger import get_data_path, logger
+from backend.utils.request import get
 from program.media import (
     Episode,
     MediaItemContainer,
@@ -130,3 +130,14 @@ def create_item_from_imdb_id(imdb_id: str):
             if data:
                 return _map_item_from_data(data, media_type)
     return None
+
+def get_imdb_id_from_tvdb(tvdb_id: str) -> str:
+    """Get IMDb ID from TVDB ID in Trakt"""
+    url = f"https://api.trakt.tv/search/tvdb/{tvdb_id}?extended=full"
+    response = get(
+        url,
+        additional_headers={"trakt-api-version": "2", "trakt-api-key": CLIENT_ID},
+    )
+    if response.is_ok and len(response.data) > 0:
+            return response.data[0].show.ids.imdb
+    return None

backend/utils/default_settings.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.2.1",
-  "debug": true,
+  "version": "0.3.0",
+  "debug": false,
   "log": true,
   "host_mount": "",
   "container_mount": "",

backend/utils/logger.py

@@ -20,6 +20,7 @@ def __init__(self):
             "api_key": re.compile(r"(\'api_key\'\s*:\s*\')[^\']*\'", re.IGNORECASE),
             "token": re.compile(r"(\'token\'\s*:\s*\')[^\']*\'", re.IGNORECASE),
             "user": re.compile(r"(\'user\'\s*:\s*\')[^\']*\'", re.IGNORECASE),
+            "watchlist": re.compile(r"(\'watchlist\'\s*:\s*\')[^\']*\'", re.IGNORECASE),
         }
 
     def _redact_string(self, data):

entrypoint.sh

@@ -31,4 +31,4 @@ fi
 chown -R ${USERNAME}:${GROUPNAME} /iceberg
 
 echo "Container Initialization complete."
-exec su -m $USERNAME -c 'cd backend && source /venv/bin/activate && exec python /iceberg/backend/main.py & node /iceberg/frontend/build'
+exec su -m $USERNAME -c 'cd backend && source /venv/bin/activate && exec python /iceberg/backend/main.py & node /iceberg/frontend/build'

makefile

@@ -1,4 +1,4 @@
-.PHONY: help start reset stop restart rebuild logs exec sc ec update
+.PHONY: help start stop restart logs exec sc ec update
 
 # Detect operating system
 ifeq ($(OS),Windows_NT)
@@ -13,7 +13,6 @@ help:
 	@echo Iceberg Local Development Environment
 	@echo -------------------------------------------------------------------------
 	@echo start     : Build and run the Iceberg container
-	@echo reset     : Build and run the Iceberg container without caching image
 	@echo stop      : Stop and remove the Iceberg container and image
 	@echo restart   : Restart the Iceberg container (without rebuilding image)
 	@echo rebuild   : Rebuild the Iceberg container (with rebuilding image)
@@ -24,33 +23,24 @@ help:
 	@echo update    : Update this repository from GitHub and rebuild image
 	@echo -------------------------------------------------------------------------
 
-start: 
+start: stop
 	@docker build -t iceberg:latest -f Dockerfile .
 	@docker run -d --name iceberg --hostname iceberg -p 3000:3000 -p 8080:8080 -e PUID=1000 -e PGID=1000 -v $(DATA_PATH):/iceberg/data iceberg:latest
 	@echo Iceberg Frontend is running on http://localhost:3000/status/
 	@echo Iceberg Backend is running on http://localhost:8080/items/
 	@docker logs iceberg -f
 
-reset: 
-	@docker build --no-cache -t iceberg:latest -f Dockerfile .
-	@docker run -d --name iceberg --hostname iceberg -p 3000:3000 -p 8080:8080 -e PUID=1000 -e PGID=1000 -v $(DATA_PATH):/iceberg/data iceberg:latest
-	@echo Iceberg Frontend is running on http://localhost:3000/status/
-	@echo Iceberg Backend is running on http://localhost:8080/items/
-	@docker logs iceberg -f
-
 stop:
-	@-docker stop iceberg
-	@-docker rm iceberg
-	@-docker rmi iceberg:latest
+	@-docker stop iceberg --time 0
+	@-docker rm iceberg --force
+	@-docker rmi iceberg:latest --force
 
 restart: 
 	@-docker restart iceberg
 	@echo Iceberg Frontend is running on http://localhost:3000/status/
 	@echo Iceberg Backend is running on http://localhost:8080/items/
 	@docker logs iceberg -f
 
-rebuild: stop reset
-
 logs:
 	@docker logs iceberg -f