fix: docker skill issue

client/bs_shutdown.py

@@ -1,4 +1,6 @@
-import urllib.request
+import sys
+sys.path = [p for p in sys.path if 'Python27' not in p] # uglyfix
+from urllib import request
 import json
 import socket
 from datetime import datetime
@@ -18,7 +20,7 @@ payload = {
 def get_data():
     data = json.dumps(payload).encode("utf-8")
 
-    req = urllib.request.Request(
+    req = request.Request(
         url,
         headers={"Content-Type": "application/json"},
         data=data,
@@ -26,7 +28,7 @@ def get_data():
     )
 
     try:
-        with urllib.request.urlopen(req, timeout=10) as response:
+        with request.urlopen(req, timeout=10) as response:
             data = response.read()
             json_data = json.loads(data)
             print(json_data)
@@ -44,12 +46,12 @@ def set_shutdown(time, now):
         return
     LAST_VALUE = time
     print("[BS Shutdown] shutting down in " + str(time - now) + " seconds")
-    # subprocess.run(["shutdown", "/s", "/t", (time - now), " "])
+    subprocess.run(["shutdown", "-r", "-f", "-t", str(time - now)])
 
 
 def remove_shutdown():
     print("[BS Shutdown] Removed shutdown")
-    # subprocess.run(["shutdown", "/a"])
+    subprocess.run(["shutdown", "-a"])
 
 def update():
     global LAST_VALUE
@@ -77,10 +79,10 @@ def update():
     if (LAST_VALUE != 0):
         remove_shutdown()
         print("[BS Shutdown] New value")
-    LAST_VALUE = time
-    set_shutdown(time, now)
+    if (time - now) < 1800:
+        set_shutdown(time, now)
 
 if __name__ == '__main__':
     while True:
         update()
-        time.sleep(30)
+        time.sleep(900)

server/docker-compose.yml

@@ -4,5 +4,8 @@ services:
     build: ./src
     volumes:
       - "./src/data:/data"
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+
     ports:
       - "5000:5000"

server/src/data/app.py

@@ -1,16 +1,19 @@
 from flask import Flask, render_template, request, redirect, url_for, jsonify
 import sqlite3
 import re
+from datetime import datetime
 
+# -- INIT --
 app = Flask(__name__)
-
 pattern = re.compile(r"^(?:[01]\d|2[0-3]):[0-5]\d$") # Regex "XX:XX"
 
+# -- GLOBAL VAR --
 DB_PATH = "data.db"
+DEFAULT_TIME = "21:00"
 
+## -- INIT DB --
 conn = sqlite3.connect(DB_PATH)
 cursor = conn.cursor()
-
 cursor.execute("""
 CREATE TABLE IF NOT EXISTS items (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -24,29 +27,35 @@ CREATE TABLE IF NOT EXISTS val (
     default_time TEXT NOT NULL DEFAULT '21:00'
 )
 """)
+cursor.execute("SELECT COUNT(*) FROM val")
+count = cursor.fetchone()[0]
+if count == 0:
+    cursor.execute("INSERT INTO val (default_time) VALUES (?)", ('21:00',))
 conn.commit()
 conn.close()
+# -- END --
 
 def get_db_connection():
     conn = sqlite3.connect(DB_PATH)
     conn.row_factory = sqlite3.Row
     return conn
 
+# --- MAIN ---
 @app.route("/")
 def mainpage():
     conn = get_db_connection()
     cursor = conn.cursor()
-    cursor.execute("SELECT name, time, noshutdown FROM items ORDER BY name")
+    cursor.execute("SELECT name, time, noshutdown, last_connection FROM items ORDER BY name")
     items = cursor.fetchall()
     cursor.execute("SELECT default_time FROM val")
     default_time_row = cursor.fetchone()
-    default_time = default_time_row[0] if default_time_row else None
+    default_time = default_time_row[0] if default_time_row else DEFAULT_TIME
     conn.close()
     return render_template('index.html', title='BS Shutdown', items=items, default_time=default_time)
 
 @app.route('/submit', methods =['POST'])
 def submit():
-    value = request.form.get("query")
+    value = request.form.get("query").upper()
     time_value = request.form.get("time")
     noshutdown = 1 if request.form.get("noshutdown") == "on" else 0
     if not value:
@@ -100,12 +109,14 @@ def delete():
     conn.close()
     return redirect(url_for("mainpage"))
 
+# --- END MAIN ---
+# --- API ---
 @app.route("/lookup", methods=["POST"])
 def lookup():
     data = request.get_json()
     if not data or "name" not in data:
         return jsonify({"error": "Not found"}), 404
-    name = data["name"]
+    name = data["name"].upper()
     conn = get_db_connection()
     cursor = conn.cursor()
     cursor.execute(
@@ -113,9 +124,16 @@ def lookup():
         (name,)
     )
     item = cursor.fetchone()
+    cursor.execute("SELECT default_time FROM val")
+    default_time_row = cursor.fetchone()
+    default_time = default_time_row[0] if default_time_row else DEFAULT_TIME
+    if item:
+        cursor.execute("UPDATE items SET last_connection = ? WHERE name = ?", (datetime.now().replace(microsecond=0), item["name"]))
+        conn.commit()
     conn.close()
 
     if item:
         return jsonify({"name": item["name"], "noshutdown": item["noshutdown"], "time": item["time"]}), 200
     else:
-        return jsonify({"error": "Not found"}), 404
+        return jsonify({"noshutdown": 0, "time": default_time}), 200
+# --- END API ---

server/src/data/templates/base.html

@@ -42,7 +42,10 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav ms-auto">
                     <li class="nav-item">
-                        <a class="nav-link {% if title=='BG Shutdown' %}active{% endif %}" href="{{ url_for('mainpage') }}">Accueil</a>
+                        <a class="nav-link {% if title=='BS Shutdown' %}active{% endif %}" href="{{ url_for('mainpage') }}">Accueil</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link {% if title=='BG Shutdown' %}active{% endif %}" href="{{ url_for('mainpage') }}">Groupes</a>
                     </li>
                 </ul>
             </div>

server/src/data/templates/index.html

@@ -10,14 +10,14 @@
 
         <div class="col-10">
             <form method="post" action="/submit" class="row g-2 align-items-center">
-                <div class="col-md-3">
+                <div class="col-md-2">
                     <input 
                         type="text"
                         name="query"
                         class="form-control bg-dark text-white"
                         placeholder="Nom de la machine">
                 </div>
-                <div class="col-md-3">
+                <div class="col-md-2">
                     <select name="time" class="form-select bg-dark text-white" id="time-select">
                         {% for hour in range(0, 24) %}
                             <option value="{{ '%02d:00'|format(hour) }}">{{ '%02d:00'|format(hour) }}</option>
@@ -33,14 +33,14 @@
                 </div>
                 <div class="col-md-1">
                     <button type="submit" class="btn btn-sm btn-primary w-100">
-                        <i class="bi bi-plus-lg"> Save</i>
+                        <i class="bi bi-plus-lg"> Add</i>
                     </button>
                 </div>
             </form>
         </div>
 
         <div class="col-auto gap-1 ms-auto">
-            <form method="post" action="/submit-default" class="d-flex gap-1">
+            <form method="post" action="/submit-default" class="d-flex align-items-center gap-1">
                 <select name="default-time" class="form-select bg-dark text-white flex-grow-1" id="default-time-select">
                     {% for hour in range(0, 24) %}
                         {% set h1 = '%02d:00'|format(hour) %}
@@ -57,7 +57,7 @@
                         </option>
                     {% endfor %}
                 </select>
-                <button type="submit" class="btn btn-sm btn-primary">
+                <button type="submit" class="btn btn-sm btn-primary w-100">
                     <i class="bi bi-save"> Save</i>
                 </button>
             </form>
@@ -66,48 +66,105 @@
     </div>
 </div>
 
-    <div class="card bg-dark bg-opacity-75 p-3">
-        <h5 class="text-white mb-3">Liste des éléments</h5>
-        <div class="row fw-bold text-white mb-2">
-            <div class="col-4">Nom</div>
-            <div class="col-3">Whitelist</div>
-            <div class="col-3">Time</div>
-            <div class="col-2 text-end">Actions</div>
-        </div>
-        <div class="table-items">
-            {% for item in items %}
-                <div class="row align-items-center py-2">
-                    <div class="col-4 text-white">
-                        {{ item.name }}
+   <div class="card bg-dark bg-opacity-75 p-3">
+    <h5 class="text-white mb-3">Liste des éléments</h5>
+    
+    <div class="row fw-bold text-white mb-2">
+        <div class="col-4">Nom</div>
+        <div class="col-3">Dernier ping</div>
+        <div class="col-2">Whitelist</div>
+        <div class="col-2">Time</div>
+        <div class="col-1 text-end">Actions</div>
+    </div>
+    
+    <div class="table-items">
+        {% for item in items %}
+            <div class="row align-items-center py-2">
+                <div class="col-4 text-white">
+                    {{ item.name }}
+                </div>
+                <div class="col-3 text-white">
+                    {% if item.last_connection %}
+                        {{ item.last_connection }}
+                    {% endif %}
+                </div>
+                <div class="col-2">
+                    {% if item.noshutdown == 1 %}
+                        <span class="text-success">OUI</span>
+                    {% else %}
+                        <span class="text-danger">NON</span>
+                    {% endif %}
+                </div>
+                <div class="col-2 text-white">
+                    {% if item.noshutdown == 0 %}
+                        {{ item.time }}
+                    {% endif %}
+                </div>
+                <div class="col-1 text-end d-flex justify-content-end gap-1">
+                    <button 
+                        type="button"
+                        class="btn btn-sm btn-warning edit-btn"
+                        data-name="{{ item.name }}"
+                        data-noshutdown="{{ item.noshutdown }}"
+                        data-time="{{ item.time }}"
+                        data-bs-toggle="modal"
+                        data-bs-target="#editModal">
+                        <i class="bi bi-pencil"></i>
+                    </button>
+                    <form method="post" action="/delete" class="m-0">
+                        <input type="hidden" name="item_name" value="{{ item.name }}">
+                        <button type="submit" class="btn btn-sm btn-danger">
+                            <i class="bi bi-x-lg"></i>
+                        </button>
+                    </form>
+                </div>
+            </div>
+            {% if not loop.last %}
+                <hr class="border-secondary my-1">
+            {% endif %}
+        {% endfor %}
+            <div class="modal fade" id="editModal" tabindex="-1">
+                <div class="modal-dialog">
+                    <div class="modal-content bg-dark text-white">
+                    <form method="post" action="/submit">
+                        <div class="modal-header">
+                        <h5 class="modal-title">Modifier l'élément</h5>
+                        <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                        </div>
+
+                        <div class="modal-body">
+
+                        <div class="mb-3">
+                            <label class="form-label">Nom</label>
+                            <input type="text" class="form-control" name="query" id="editName" readonly>
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">No Shutdown</label>
+                            <input class="form-check-input" type="checkbox" name="noshutdown" id="editNoshutdown">
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Time</label>
+                            <select class="form-select" name="time" id="editTime">
+                                {% for hour in range(0, 24) %}
+                                    {% set h1 = '%02d:00'|format(hour) %}
+                                    {% set h2 = '%02d:30'|format(hour) %}
+                                    <option value="{{ h1 }}">{{ h1 }}</option>
+                                    <option value="{{ h2 }}">{{ h2 }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
                     </div>
 
-                    <div class="col-3">
-                        {% if item.noshutdown == 1 %}
-                            <span class="text-success">OUI</span>
-                        {% else %}
-                            <span class="text-danger">NON</span>
-                        {% endif %}
+                    <div class="modal-footer">
+                        <button type="submit" class="btn btn-success">Enregistrer</button>
                     </div>
 
-                    <div class="col-3 text-white">
-                        {% if item.noshutdown == 0 %}
-                            {{ item.time }}
-                        {% endif %}
-                    </div>
-
-                    <div class="col-2 text-end">
-                        <form method="post" action="/delete" class="m-0">
-                            <input type="hidden" name="item_name" value="{{ item.name }}">
-                            <button type="submit" class="btn btn-sm btn-danger">
-                                <i class="bi bi-x-lg"></i>Supprimer
-                            </button>
-                        </form>
+                    </form>
                     </div>
                 </div>
-                {% if not loop.last %}
-                    <hr class="border-secondary my-1">
-                {% endif %}
-            {% endfor %}
+            </div>
         </div>
     </div>
 
@@ -122,6 +179,27 @@ timeSelect.disabled = tickCheckbox.checked;
 tickCheckbox.addEventListener('change', function() {
     timeSelect.disabled = this.checked;
 });
+document.querySelectorAll('.edit-btn').forEach(button => {
+  button.addEventListener('click', function () {
+
+    const name = this.dataset.name;
+    const noshutdown = this.dataset.noshutdown;
+    const time = this.dataset.time;
+
+    document.getElementById('editName').value = name;
+
+    document.getElementById('editNoshutdown').checked = (noshutdown == 1);
+    document.getElementById('editTime').value = time;
+    const timeSelect = document.getElementById('editTime');
+    const noshutdownSelect = document.getElementById('editNoshutdown');
+
+    timeSelect.disabled = noshutdownSelect.checked;
+    noshutdownSelect.addEventListener('change', function () {
+        timeSelect.disabled = this.checked;
+    });
+
+  });
+});
 </script>
 
 {% endblock %}