feat: Add progress bar to spotify widget

Reviewed-on: #2

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM python:3.10-alpine AS builder
+FROM --platform=$BUILDPLATFORM python:3.13-alpine AS builder
 
 RUN apk add curl
 WORKDIR /app

blueprints/api.py

@@ -7,6 +7,7 @@ from mail import sendEmail
 from tools import getClientIP, getGitCommit, json_response, parse_date, get_tools_data
 from blueprints.sol import sol_bp
 from dateutil import parser as date_parser
+from blueprints.spotify import get_spotify_track
 
 # Constants
 HTTP_OK = 200
@@ -43,6 +44,8 @@ def help():
             "/project": "Get the current project from git",
             "/version": "Get the current version of the website",
             "/page_date?url=URL&verbose=BOOL": "Get the last modified date of a webpage (verbose is optional, default false)",
+            "/tools": "Get a list of tools used by Nathan Woodburn",
+            "/playing": "Get the currently playing Spotify track",
             "/status": "Just check if the site is up",
             "/ping": "Just check if the site is up",
             "/help": "Get this help message"
@@ -180,6 +183,14 @@ def tools():
         
     return json_response(request, {"tools": tools}, HTTP_OK)
 
+@api_bp.route("/playing")
+def playing():
+    """Get the currently playing Spotify track."""
+    track_info = get_spotify_track()
+    if "error" in track_info:
+        return json_response(request, track_info, HTTP_OK)
+    return json_response(request, {"spotify": track_info}, HTTP_OK)
+
 @api_bp.route("/page_date")
 def page_date():
     url = request.args.get("url")

blueprints/spotify.py

@@ -0,0 +1,126 @@
+from flask import redirect, request, Blueprint, url_for
+from tools import json_response
+import os
+import requests
+import time
+import base64
+
+spotify_bp = Blueprint('spotify', __name__)
+
+CLIENT_ID = os.getenv("SPOTIFY_CLIENT_ID")
+CLIENT_SECRET = os.getenv("SPOTIFY_CLIENT_SECRET")
+ALLOWED_SPOTIFY_USER_ID = os.getenv("SPOTIFY_USER_ID")
+
+SPOTIFY_AUTH_URL = "https://accounts.spotify.com/authorize"
+SPOTIFY_TOKEN_URL = "https://accounts.spotify.com/api/token"
+SPOTIFY_CURRENTLY_PLAYING_URL = "https://api.spotify.com/v1/me/player/currently-playing"
+
+SCOPE = "user-read-currently-playing user-read-playback-state"
+
+ACCESS_TOKEN = None
+REFRESH_TOKEN = os.getenv("SPOTIFY_REFRESH_TOKEN")
+TOKEN_EXPIRES = 0
+
+def refresh_access_token():
+    """Refresh Spotify access token when expired."""
+    global ACCESS_TOKEN, TOKEN_EXPIRES
+
+    # If still valid, reuse it
+    if ACCESS_TOKEN and time.time() < TOKEN_EXPIRES - 60:
+        return ACCESS_TOKEN
+
+    auth_str = f"{CLIENT_ID}:{CLIENT_SECRET}"
+    b64_auth = base64.b64encode(auth_str.encode()).decode()
+
+    data = {
+        "grant_type": "refresh_token",
+        "refresh_token": REFRESH_TOKEN,
+    }
+    headers = {"Authorization": f"Basic {b64_auth}"}
+
+    response = requests.post(SPOTIFY_TOKEN_URL, data=data, headers=headers)
+    if response.status_code != 200:
+        print("Failed to refresh token:", response.text)
+        return None
+
+    token_info = response.json()
+    ACCESS_TOKEN = token_info["access_token"]
+    TOKEN_EXPIRES = time.time() + token_info.get("expires_in", 3600)
+    return ACCESS_TOKEN
+
+@spotify_bp.route("/login")
+def login():
+    auth_query = (
+        f"{SPOTIFY_AUTH_URL}?response_type=code&client_id={CLIENT_ID}"
+        f"&redirect_uri={url_for('spotify.callback', _external=True)}&scope={SCOPE}"
+    )
+    return redirect(auth_query)
+
+@spotify_bp.route("/callback")
+def callback():
+    code = request.args.get("code")
+    if not code:
+        return "Authorization failed.", 400
+
+    data = {
+        "grant_type": "authorization_code",
+        "code": code,
+        "redirect_uri": url_for("spotify.callback", _external=True),
+        "client_id": CLIENT_ID,
+        "client_secret": CLIENT_SECRET,
+    }
+    response = requests.post(SPOTIFY_TOKEN_URL, data=data)
+    token_info = response.json()
+    if "access_token" not in token_info:
+        return json_response(request, {"error": "Failed to obtain token", "details": token_info}, 400)
+
+    access_token = token_info["access_token"]
+    me = requests.get(
+        "https://api.spotify.com/v1/me",
+        headers={"Authorization": f"Bearer {access_token}"}
+    ).json()
+
+    if me.get("id") != ALLOWED_SPOTIFY_USER_ID:
+        return json_response(request, {"error": "Unauthorized user"}, 403)
+
+    global REFRESH_TOKEN
+    REFRESH_TOKEN = token_info.get("refresh_token")
+    print("Spotify authorization successful.")
+    print("Refresh Token:", REFRESH_TOKEN)
+    return redirect(url_for("spotify.currently_playing"))
+
+@spotify_bp.route("/")
+@spotify_bp.route("/currently-playing")
+def currently_playing():
+    """Public endpoint showing your current track."""
+    track = get_spotify_track()
+    return json_response(request, {"spotify":track}, 200)
+
+def get_spotify_track():
+    """Internal function to get current playing track without HTTP context."""
+    token = refresh_access_token()
+    if not token:
+        return json_response(request, {"error": "Failed to refresh access token"}, 500)
+
+    headers = {"Authorization": f"Bearer {token}"}
+    response = requests.get(SPOTIFY_CURRENTLY_PLAYING_URL, headers=headers)
+
+    if response.status_code == 204:
+        return {"error": "Nothing is currently playing."}
+    elif response.status_code != 200:
+        return {"error": "Spotify API error", "status": response.status_code}
+
+    data = response.json()
+    if not data.get("item"):
+        return {"error": "Nothing is currently playing."}
+
+    track = {
+        "song_name": data["item"]["name"],
+        "artist": ", ".join([artist["name"] for artist in data["item"]["artists"]]),
+        "album_name": data["item"]["album"]["name"],
+        "album_art": data["item"]["album"]["images"][0]["url"],
+        "is_playing": data["is_playing"],
+        "progress_ms": data.get("progress_ms",0),
+        "duration_ms": data["item"].get("duration_ms",1)
+    }
+    return track

curl.py

@@ -3,6 +3,7 @@ from tools import error_response, getAddress, get_tools_data, getClientIP
 import os
 from functools import lru_cache
 import requests
+from blueprints.spotify import get_spotify_track
 
 
 def clean_path(path:str):
@@ -32,7 +33,9 @@ def get_current_project():
     repo_name = git["repo"]["name"]
     repo_name = repo_name.lower()
     repo_description = git["repo"]["description"]    
-    return f"{repo_name} - {repo_description}"
+    if not repo_description:
+        return f"{repo_name}"
+    return f"{repo_name} - {repo_description}"
 
 
 @lru_cache(maxsize=1)
@@ -81,7 +84,7 @@ def curl_response(request):
     # Handle special cases
     if path == "index":
         # Get current project
-        return render_template("index.ascii",repo=get_current_project(), ip=getClientIP(request)), 200, {'Content-Type': 'text/plain; charset=utf-8'}
+        return render_template("index.ascii",repo=get_current_project(), ip=getClientIP(request), spotify=get_spotify_track()), 200, {'Content-Type': 'text/plain; charset=utf-8'}
     if path == "projects":
         # Get projects
         return render_template("projects.ascii",header=get_header(),projects=get_projects()), 200, {'Content-Type': 'text/plain; charset=utf-8'}
@@ -120,4 +123,9 @@ def curl_response(request):
     if os.path.exists(f"templates/{path}.html"):
         return render_template(f"{path}.html")
     
-    return error_response(request)
+    # Return curl error page
+    error = {
+        "code": 404,
+        "message": "The requested resource was not found on this server."
+    }
+    return render_template("error.ascii",header=get_header(),error=error), 404, {'Content-Type': 'text/plain; charset=utf-8'}

data/tools.json

@@ -23,6 +23,12 @@
         "url": "https://code.visualstudio.com/",
         "description": "Source-code editor developed by Microsoft"
     },
+    {
+        "name": "Vesktop",
+        "type": "Desktop Applications",
+        "url": "https://vesktop.dev/",
+        "description": "Vesktop is a customizable and privacy friendly Discord desktop app!"
+    },
     {
         "name": "Zellij",
         "type": "Terminal Tools",

server.py

@@ -25,6 +25,7 @@ from blueprints.wellknown import wk_bp
 from blueprints.api import api_bp
 from blueprints.podcast import podcast_bp
 from blueprints.acme import acme_bp
+from blueprints.spotify import spotify_bp
 from tools import isCurl, isCrawler, getAddress, getFilePath, error_response, getClientIP, json_response, getHandshakeScript, get_tools_data
 from curl import curl_response
 
@@ -38,6 +39,7 @@ app.register_blueprint(wk_bp, url_prefix='/.well-known')
 app.register_blueprint(api_bp, url_prefix='/api/v1')
 app.register_blueprint(podcast_bp)
 app.register_blueprint(acme_bp)
+app.register_blueprint(spotify_bp, url_prefix='/spotify')
 
 dotenv.load_dotenv()
 

templates/assets/css/brand-reveal.min.css

@@ -1 +1 @@
-.name-container{display:inline-flex;align-items:center;overflow:hidden;position:absolute;width:fit-content;left:50%;transform:translateX(-50%)}.slider{position:relative;left:0;animation:1s linear 1s forwards slide}@keyframes slide{0%{left:0}100%{left:calc(100%)}}.brand{mask-image:linear-gradient(to right,black 50%,transparent 50%);-webkit-mask-image:linear-gradient(to right,black 50%,transparent 50%);mask-position:100% 0;-webkit-mask-position:100% 0;mask-size:200%;-webkit-mask-size:200%;animation:1s linear 1s forwards reveal}@keyframes reveal{0%{mask-position:100% 0;-webkit-mask-position:100% 0}100%{mask-position:0 0;-webkit-mask-position:0 0}}
+.name-container{display:inline-flex;align-items:center;overflow:hidden;position:absolute;width:fit-content;left:50%;transform:translateX(-50%)}.slider{position:relative;left:0;animation:1s linear 1s forwards slide}@keyframes slide{0%{left:0}100%{left:calc(100%)}}.brand{mask-image:linear-gradient(to right,black 50%,transparent 50%);-webkit-mask-image:linear-gradient(to right,black 50%,transparent 50%);mask-position:100% 0;-webkit-mask-position:100% 0;mask-size:200%;-webkit-mask-size:200%;animation:1s linear 1s forwards reveal}@keyframes reveal{0%{mask-position:100% 0;-webkit-mask-position:100% 0}100%{mask-position:0 0;-webkit-mask-position:0 0}}.now-playing{position:fixed;bottom:0;right:0;border-top-left-radius:10px;background:#10101039;padding:1em}

templates/blog/blog.html

@@ -55,6 +55,7 @@ Find something interesting to read. Or maybe check one of my tutorials">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/blog/template.html

@@ -56,6 +56,7 @@ Find something interesting to read. Or maybe check one of my tutorials">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/donate.html

@@ -53,6 +53,7 @@
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/error.ascii

@@ -0,0 +1,9 @@
+{{header}}
+───────────────────────────────────────────────
+ ERROR: {{ error.code }} 
+────────────
+
+{{ error.message }}
+
+If you believe this is an error, please contact me via my socials listed at /contact
+

templates/hosting.html

@@ -51,6 +51,7 @@
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/index.ascii

@@ -24,6 +24,7 @@ I'm also one of the founders of Handshake AU [https://hns.au],
 working to grow Handshake adoption across Australia.
 
 I'm currently working on: {{ repo | safe }}
+{% if not spotify.message %}Currently listening to: {{ spotify.song_name }} by {{ spotify.artist }}{% endif %}
 
 ───────────────────────────────────────────────
  SKILLS 

templates/index.html

@@ -49,7 +49,7 @@
     <link rel="stylesheet" href="/assets/css/Social-Icons.min.css">
     <link rel="stylesheet" href="/assets/css/swiper.min.css">
 <link rel="me" href="https://mastodon.woodburn.au/@nathanwoodburn" />
-<script async src="https://umami.woodburn.au/script.js" data-website-id="6a55028e-aad3-481c-9a37-3e096ff75589"></script>
+<script async src="https://umami.woodburn.au/script.js" data-website-id="6a55028e-aad3-481c-9a37-3e096ff75589"></script><link rel="preload" as="image" href="/assets/img/bg/BlueMountains.jpg" type="image/jpeg">
 </head>
 
 <body id="page-top" data-bs-spy="scroll" data-bs-target="#mainNav" data-bs-offset="77"><script>
@@ -69,6 +69,7 @@
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>
@@ -78,7 +79,7 @@
     <div class="text-end d-none d-xl-block d-xxl-block" id="downtime"><blockquote class="speech bubble"><em>G'day!</em><br>
 Some services are down.<br>
 Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.webp"></div>
-    <header class="masthead main" style="background: url(&quot;/assets/img/bg/BlueMountains.jpg&quot;) center / cover;position: relative;height: 400px;">
+    <header class="masthead main" style="position: relative;height: 400px;background: url(&quot;/assets/img/bg/BlueMountains.jpg&quot;) center / cover;">
         <div class="intro-body text parallax">
             <div class="name-container" style="padding-right: 1em;">
                 <div class="slider">
@@ -94,7 +95,7 @@ Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.
             <div class="row">
                 <div class="col-lg-8 mx-auto">
                     <h2>About ME</h2>
-                    <div class="profile-container" style="margin-bottom: 2em;"><img class="profile background" src="/assets/img/profile.jpg" style="border-radius: 50%;" alt="My Profile"><img class="profile foreground" src="/assets/img/pfront.webp" alt=""></div>
+                    <div class="profile-container" style="margin-bottom: 2em;"><img class="profile background" src="/assets/img/profile.webp" style="border-radius: 50%;" alt="My Profile"><img class="profile foreground" src="/assets/img/pfront.webp" alt=""></div>
                     <p style="margin-bottom: 5px;">Hi, I'm Nathan Woodburn and I live in Canberra, Australia.<br>I've been home schooled all the way to Yr 12.<br>I'm currently studying a&nbsp;Bachelor of Computer Science.<br>I create tons of random projects so this site is often behind.<br>I'm one of the founders of <a href="https://hns.au" target="_blank">Handshake AU</a>&nbsp;working to increase Handshake adoption in Australia.</p>
                     <p title="{{repo_description}}" style="margin-bottom: 0px;display: inline-block;">I'm currently working on</p>
                     <p data-bs-toggle="tooltip" data-bss-tooltip="" title="{{repo_description}}" style="display: inline-block;">{{repo | safe}}</p>
@@ -126,7 +127,7 @@ Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.
             <div class="swiper">
                 <div class="swiper-wrapper">{% for project in projects %}
             <div class="swiper-slide site" data-url="{{ project.html_url }}">
-                <img class="site-img" src="{{ project.avatar_url }}" />
+                <img class="site-img" src="{{ project.avatar_url }}" alt="{{ project.name }} Icon" />
                 <div class="site-body">
                     <div class="site-detail" style="width: 100%;">
                         <h2 class="site-name" style="text-align: left;">{{ project.name }}</h2>
@@ -291,7 +292,260 @@ Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.
     <div class="d-none d-print-none d-sm-none d-md-block d-lg-block d-xl-block d-xxl-block clock" style="padding: 1em;background: #10101039;border-top-right-radius: 10px;"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20" fill="none" class="fs-2">
 
             <path fill-rule="evenodd" clip-rule="evenodd" d="M10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18ZM11 6C11 5.44772 10.5523 5 10 5C9.44771 5 9 5.44772 9 6V10C9 10.2652 9.10536 10.5196 9.29289 10.7071L12.1213 13.5355C12.5118 13.9261 13.145 13.9261 13.5355 13.5355C13.9261 13.145 13.9261 12.5118 13.5355 12.1213L11 9.58579V6Z" fill="currentColor"></path>
-        </svg><span style="margin-left: 10px;font-family: 'Anonymous Pro', monospace;">{{time|safe}}</span></div>
+        </svg><span style="margin-left: 10px;font-family: 'Anonymous Pro', monospace;">{{time|safe}}</span></div><!-- Pop-out button for mobile -->
+<button id="spotify-toggle" style="
+    display: block;
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    z-index: 9999;
+    width: 50px;
+    height: 50px;
+    border: none;
+    background: none;
+    cursor: pointer;
+    padding: 0;
+    transition: transform 0.5s ease;
+    transform: translateX(200%); /* start hidden off-screen *
+">
+<img src="/assets/img/external/spotify.png" alt="Spotify" style="
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+"></img>
+</button>
+
+<div id="spotify-widget" style="
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    display: flex;
+    align-items: center;
+    background: #121212;
+    color: white;
+    padding: 10px 15px;
+    border-radius: 12px;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.4);
+    font-family: sans-serif;
+    max-width: 300px;
+    z-index: 9999;
+    transition: transform 0.3s ease, opacity 0.3s ease;
+    opacity: 0.9;
+    transform: translateX(120%); /* start hidden off-screen */
+">
+    <img id="spotify-album-art" src="" alt="Album Art" style="
+        width: 56px;
+        height: 56px;
+        border-radius: 6px;
+        margin-right: 12px;
+        flex-shrink: 0;
+    ">
+    <div style="flex: 1; overflow: hidden;">
+        <div id="spotify-song" style="
+            font-weight: bold;
+            font-size: 0.95rem;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        "></div>
+        <div id="spotify-artist" style="
+            font-size: 0.85rem;
+            color: #ccc;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        "></div>
+        <div id="spotify-album" style="
+            font-size: 0.75rem;
+            color: #888;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        "></div>
+        <!-- Progress Bar -->
+        <div style="
+            margin-top: 6px;
+            height: 4px;
+            background: #333;
+            border-radius: 2px;
+            overflow: hidden;
+        ">
+            <div id="spotify-progress" style="
+                width: 0%;
+                height: 100%;
+                background: #1DB954;
+                transition: width 1s linear;
+            "></div>
+        </div>
+    </div>
+</div>
+
+<script>
+const widget = document.getElementById('spotify-widget');
+const toggleBtn = document.getElementById('spotify-toggle');
+
+function isMobile() {
+    return window.innerWidth <= 768;
+}
+
+function updateVisibility() {
+    if(isMobile()){
+        widget.style.transform = 'translateX(120%)'; // hidden off-screen
+        toggleBtn.style.transform = 'translateX(0)'; // visible
+    } else {
+        widget.style.transform = 'translateX(0)'; // visible
+        toggleBtn.style.transform = 'translateX(200%)'; // hidden off-screen
+    }
+}
+
+// Toggle widget slide in/out on mobile
+toggleBtn.addEventListener('click', (e) => {
+    widget.style.transform = 'translateX(0)'; // slide in
+    toggleBtn.style.transform = 'translateX(200%)'; // hide button
+    e.stopPropagation();
+});
+
+// Close widget when clicking outside
+document.addEventListener('click', (e) => {
+    if(isMobile()){
+        if(!widget.contains(e.target) && e.target !== toggleBtn){
+            widget.style.transform = 'translateX(120%)'; // slide out
+            toggleBtn.style.transform = 'translateX(0)'; // show button
+        }
+    }
+});
+
+// Prevent clicks inside widget from closing it
+widget.addEventListener('click', (e) => {
+    e.stopPropagation();
+});
+
+// Variable to track progress bar animation
+let progressInterval = null;
+let progressSpeed = 0;
+let lastUpdateTime = Date.now();
+let currentProgress = 0;
+let targetProgress = 0;
+let trackDuration = 0;
+let currentTrackId = null;
+
+// --- Spotify fetch ---
+async function updateSpotifyWidget() {
+    try {
+        const res = await fetch('/spotify/');
+        if (!res.ok) return;
+
+        const data = await res.json();
+        // Check if data contains an error or message indicating nothing is playing
+        if (data.error || data.message) {
+            // If existing data
+            if (document.getElementById('spotify-song').textContent) {
+                return;
+            }
+            // Alternate text when nothing is playing
+            document.getElementById('spotify-album-art').src = '/assets/img/external/spotify.png';
+            document.getElementById('spotify-song').textContent = 'Not Playing';
+            document.getElementById('spotify-artist').textContent = '';
+            document.getElementById('spotify-album').textContent = '';
+            document.getElementById('spotify-progress').style.width = '0%';
+            clearInterval(progressInterval);
+            progressInterval = null;
+            currentProgress = 0;
+            currentTrackId = null;
+            return;
+        }
+
+        const track = data.spotify;
+        var firstLoad = false;
+        // Check if this is the first time loading data
+        if (!document.getElementById('spotify-song').textContent) {
+            firstLoad = true;
+        }
+
+          // Check if track has changed (new song started)
+        const trackId = track.song_name + track.artist; // Simple track identifier
+        const isNewTrack = currentTrackId !== null && currentTrackId !== trackId;
+        
+        if (isNewTrack) {
+            // Reset progress bar instantly for new track
+            currentProgress = 0;
+            document.getElementById('spotify-progress').style.transition = 'none';
+            document.getElementById('spotify-progress').style.width = '0%';
+            // Force reflow to apply the instant reset
+            document.getElementById('spotify-progress').offsetHeight;
+            // Re-enable transition
+            document.getElementById('spotify-progress').style.transition = 'width 0.1s linear';
+        }
+        
+        currentTrackId = trackId;
+            
+
+        document.getElementById('spotify-album-art').src = track.album_art;
+        document.getElementById('spotify-song').textContent = track.song_name;
+        document.getElementById('spotify-artist').textContent = track.artist;
+        document.getElementById('spotify-album').textContent = track.album_name;
+        
+        // Update progress bar
+        if (track.is_playing) {
+            currentProgress = (track.progress_ms / track.duration_ms) * 100;
+            trackDuration = track.duration_ms;
+            lastUpdateTime = Date.now();
+            
+            document.getElementById('spotify-progress').style.width = currentProgress + '%';
+            
+            // Clear existing interval
+            if (progressInterval) {
+                clearInterval(progressInterval);
+            }
+            // Start interval to animate progress bar
+            progressInterval = setInterval(animateProgressBar, 100);
+        } else {
+            document.getElementById('spotify-progress').style.width = currentProgress + '%';
+            clearInterval(progressInterval);
+            progressInterval = null;
+        }
+        
+        // If first load and desktop, slide in the widget
+        if (firstLoad) {
+            updateVisibility();                   
+        }
+
+    } catch (err) {
+        console.error('Failed to fetch Spotify data', err);
+    }
+}
+
+// Animate progress bar
+function animateProgressBar() {
+    if (trackDuration === 0) return;
+    
+    const now = Date.now();
+    const elapsed = now - lastUpdateTime;
+    lastUpdateTime = now;
+    
+    // Calculate progress increment based on elapsed time
+    const progressIncrement = (elapsed / trackDuration) * 100;
+    currentProgress += progressIncrement;
+    
+    if (currentProgress >= 100) {
+        currentProgress = 100;
+        document.getElementById('spotify-progress').style.width = '100%';
+        clearInterval(progressInterval);
+        progressInterval = null;
+        // Refresh API when progress reaches 100%
+        setTimeout(updateSpotifyWidget, 500);
+    } else {
+        document.getElementById('spotify-progress').style.width = currentProgress + '%';
+    }
+}
+
+// Wait for Spotify API to have responded before initial display
+updateSpotifyWidget();
+
+window.addEventListener('resize', updateVisibility);
+setInterval(updateSpotifyWidget, 15000);
+</script>
+
     <script src="/assets/bootstrap/js/bootstrap.min.js"></script>
     <script src="/assets/js/script.min.js"></script>
     <script src="/assets/js/grayscale.min.js"></script>

templates/now/24_02_18.html

@@ -56,6 +56,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_02_25.html

@@ -56,6 +56,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_04_19.html

@@ -56,6 +56,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_05_20.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_05_28.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_06_06.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_06_17.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_06_24.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_07_15.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_08_05.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_09_07.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_09_27.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_10_07.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_10_15.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_10_22.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/24_12_19.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_01_01.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_01_30.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_03_27.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_05_28.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_06_19.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_07_21.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last little bit">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_08_15.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last little bit">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/25_10_23.html

@@ -55,6 +55,7 @@ Find out what I've been up to in the last little bit">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/old.html

@@ -56,6 +56,7 @@ Find out what I've been up to in the last week">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/now/template.html

@@ -56,6 +56,7 @@ Find out what I've been up to in the last little bit">
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/projects.ascii

@@ -5,3 +5,5 @@
 
 {{projects}}
 
+Look at more projects on my Git: https://git.woodburn.au
+

templates/projects.html

@@ -51,6 +51,7 @@
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

templates/tools.html

@@ -51,6 +51,7 @@
                     <li class="nav-item nav-link"><a class="nav-link" href="/">Home</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/hosting">Hosting</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/projects">Projects</a></li>
+                    <li class="nav-item nav-link"><a class="nav-link" href="/tools">Tools</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/blog">Blog</a></li>
                     <li class="nav-item nav-link"><a class="nav-link" href="/now">Now</a></li>
                 </ul>

tests/api.hurl

@@ -6,10 +6,15 @@ GET http://127.0.0.1:5000/api/v1/ip
 HTTP 200
 [Asserts]
 jsonpath "$.ip" == "127.0.0.1"
+
 GET http://127.0.0.1:5000/api/v1/time
 HTTP 200
 GET http://127.0.0.1:5000/api/v1/timezone
 HTTP 200
+[Asserts]
+jsonpath "$.timezone" >= 10
+jsonpath "$.timezone" <= 12
+
 GET http://127.0.0.1:5000/api/v1/message
 HTTP 200
 GET http://127.0.0.1:5000/api/v1/project
@@ -17,4 +22,7 @@ HTTP 200
 GET http://127.0.0.1:5000/api/v1/tools
 HTTP 200
 [Asserts]
-jsonpath "$.tools" count > 5
+jsonpath "$.tools" count > 5
+
+GET http://127.0.0.1:5000/api/v1/playing
+HTTP 200

tools.py

@@ -12,6 +12,21 @@ HTTP_OK = 200
 HTTP_BAD_REQUEST = 400
 HTTP_NOT_FOUND = 404
 
+CRAWLERS = [
+    "Googlebot",
+    "Bingbot",
+    "Chrome-Lighthouse",
+    "Slurp",
+    "DuckDuckBot",
+    "Baiduspider",
+    "YandexBot",
+    "Sogou",
+    "Exabot",
+    "facebot",
+    "ia_archiver",
+    "Twitterbot"
+]
+
 
 def getClientIP(request: Request) -> str:
     """
@@ -88,7 +103,7 @@ def isCrawler(request: Request) -> bool:
     """
     if request.headers and request.headers.get("User-Agent"):
         user_agent = request.headers.get("User-Agent", "")
-        return "Googlebot" in user_agent or "Bingbot" in user_agent
+        return any(crawler in user_agent for crawler in CRAWLERS)
     return False
 
 @cache