ske087/digiserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated and removed unecesary files

Browse Source
This commit is contained in:
ske087
2025-03-25 14:56:11 +02:00
parent be11dbfc43
commit 74f5670f46
29 changed files with 63 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
app.py
View File

@@ -1,13 +1,13 @@
import os
from flask import Flask, render_template, request, redirect, url_for, session, flash, jsonify, send_from_directory
from flask_sqlalchemy import SQLAlchemy
from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
from flask_bcrypt import Bcrypt
from werkzeug.utils import secure_filename
from functools import wraps
from flask_migrate import Migrate
from pdf2image import convert_from_path
import subprocess
from werkzeug.utils import secure_filename
from functools import wraps
from extensions import db, bcrypt, login_manager
from models import User, Player, Content # Import the models from models.py
from flask_login import login_user, logout_user, login_required, current_user
app = Flask(__name__, instance_relative_config=True)
@@ -21,8 +21,9 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
# Ensure the instance folder exists
os.makedirs(app.instance_path, exist_ok=True)
db = SQLAlchemy(app)
bcrypt = Bcrypt(app)
db.init_app(app)
bcrypt.init_app(app)
login_manager.init_app(app)
UPLOAD_FOLDER = 'static/uploads'
app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
@@ -34,7 +35,6 @@ if not os.path.exists(UPLOAD_FOLDER):
os.makedirs(UPLOAD_FOLDER)
os.makedirs(UPLOAD_FOLDERLOGO)
login_manager = LoginManager(app)
login_manager.login_view = 'login'
migrate = Migrate(app, db)
@@ -43,42 +43,6 @@ migrate = Migrate(app, db)
def load_user(user_id):
return User.query.get(int(user_id))
# Modele pentru baza de date
class User(db.Model, UserMixin):
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
email = db.Column(db.String(120), unique=True, nullable=False)
password = db.Column(db.String(120), nullable=False)
role = db.Column(db.String(20), nullable=False, default='user')
theme = db.Column(db.String(10), nullable=False, default='light')
class Player(db.Model):
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
hostname = db.Column(db.String(120), unique=True, nullable=False)
password = db.Column(db.String(120), nullable=False)
quickconnect_password = db.Column(db.String(120), nullable=False)
def verify_quickconnect_code(self, code):
return bcrypt.check_password_hash(self.quickconnect_password, code)
class Group(db.Model):
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(80), unique=True, nullable=False)
players = db.relationship('Player', secondary='group_player', backref='groups')
group_player = db.Table('group_player',
db.Column('group_id', db.Integer, db.ForeignKey('group.id'), primary_key=True),
db.Column('player_id', db.Integer, db.ForeignKey('player.id'), primary_key=True)
)
class Content(db.Model):
id = db.Column(db.Integer, primary_key=True)
file_name = db.Column(db.String(120), nullable=False)
duration = db.Column(db.Integer, nullable=False)
player_id = db.Column(db.Integer, db.ForeignKey('player.id'), nullable=True)
group_id = db.Column(db.Integer, db.ForeignKey('group.id'), nullable=True)
def admin_required(f):
@wraps(f)
def decorated_function(*args, **kwargs):
@@ -95,18 +59,16 @@ def convert_ppt_to_pdf(input_file, output_file):
@login_required
def dashboard():
players = Player.query.all()
groups = Group.query.all()
logo_exists = os.path.exists(os.path.join(app.config['UPLOAD_FOLDERLOGO'], 'logo.png'))
return render_template('dashboard.html', players=players, groups=groups, logo_exists=logo_exists)
return render_template('dashboard.html', players=players, logo_exists=logo_exists)
@app.route('/register', methods=['GET', 'POST'])
def register():
if request.method == 'POST':
username = request.form['username']
email = request.form['email']
password = request.form['password']
hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
new_user = User(username=username, email=email, password=hashed_password, role='user')
new_user = User(username=username, password=hashed_password, role='user')
db.session.add(new_user)
db.session.commit()
return redirect(url_for('login'))
@@ -157,7 +119,7 @@ def upload_content():
image_filename = f"{os.path.splitext(filename)[0]}_page_{i + 1}.png"
image_path = os.path.join(app.config['UPLOAD_FOLDER'], image_filename)
image.save(image_path, 'PNG')
new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None, group_id=target_id if target_type == 'group' else None)
new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None)
db.session.add(new_content)
os.remove(file_path) # Remove the original PDF file
elif media_type == 'ppt':
@@ -171,12 +133,12 @@ def upload_content():
image_filename = f"{os.path.splitext(filename)[0]}_page_{i + 1}.png"
image_path = os.path.join(app.config['UPLOAD_FOLDER'], image_filename)
image.save(image_path, 'PNG')
new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None, group_id=target_id if target_type == 'group' else None)
new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None)
db.session.add(new_content)
os.remove(file_path) # Remove the original PPT/PPTX file
os.remove(pdf_path) # Remove the intermediate PDF file
else:
new_content = Content(file_name=filename, duration=duration, player_id=target_id if target_type == 'player' else None, group_id=target_id if target_type == 'group' else None)
new_content = Content(file_name=filename, duration=duration, player_id=target_id if target_type == 'player' else None)
db.session.add(new_content)
db.session.commit()
@@ -186,8 +148,7 @@ def upload_content():
target_id = request.args.get('target_id')
return_url = request.args.get('return_url', url_for('dashboard'))
players = Player.query.all()
groups = Group.query.all()
return render_template('upload_content.html', target_type=target_type, target_id=target_id, players=players, groups=groups, return_url=return_url)
return render_template('upload_content.html', target_type=target_type, target_id=target_id, players=players, return_url=return_url)
@app.route('/admin')
@login_required
@@ -222,91 +183,14 @@ def delete_user(user_id):
@admin_required
def create_user():
username = request.form['username']
email = request.form['email']
password = request.form['password']
role = request.form['role']
hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
new_user = User(username=username, email=email, password=hashed_password, role=role)
new_user = User(username=username, password=hashed_password, role=role)
db.session.add(new_user)
db.session.commit()
return redirect(url_for('admin'))
@app.route('/group/<int:group_id>/manage')
@login_required
@admin_required
def manage_group(group_id):
group = Group.query.get_or_404(group_id)
available_players = Player.query.filter(~Player.groups.any(Group.id == group_id)).all()
return render_template('manage_group.html', group=group, available_players=available_players)
@app.route('/group/<int:group_id>/add_player', methods=['POST'])
@login_required
@admin_required
def add_player_to_group(group_id):
group = Group.query.get_or_404(group_id)
player_id = request.form['player_id']
player = Player.query.get_or_404(player_id)
group.players.append(player)
db.session.commit()
return redirect(url_for('manage_group', group_id=group_id))
@app.route('/group/<int:group_id>/remove_player/<int:player_id>', methods=['POST'])
@login_required
@admin_required
def remove_player_from_group(group_id, player_id):
group = Group.query.get_or_404(group_id)
player = Player.query.get_or_404(player_id)
group.players.remove(player)
db.session.commit()
return redirect(url_for('manage_group', group_id=group_id))
@app.route('/group/<int:group_id>/upload', methods=['POST'])
@login_required
@admin_required
def upload_content_to_group(group_id):
group = Group.query.get_or_404(group_id)
files = request.files.getlist('files')
duration = int(request.form['duration'])
for file in files:
filename = secure_filename(file.filename)
file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename)
file.save(file_path)
new_content = Content(file_name=filename, duration=duration, group_id=group_id)
db.session.add(new_content)
db.session.commit()
return redirect(url_for('manage_group', group_id=group_id))
@app.route('/group/content/<int:content_id>/edit', methods=['POST'])
@login_required
@admin_required
def edit_group_content(content_id):
content = Content.query.get_or_404(content_id)
new_duration = int(request.form['duration'])
content.duration = new_duration
db.session.commit()
return redirect(url_for('manage_group', group_id=content.group_id))
@app.route('/group/content/<int:content_id>/delete', methods=['POST'])
@login_required
@admin_required
def delete_group_content(content_id):
content = Content.query.get_or_404(content_id)
group_id = content.group_id
db.session.delete(content)
db.session.commit()
return redirect(url_for('manage_group', group_id=group_id))
@app.route('/group/<int:group_id>/delete', methods=['POST'])
@login_required
@admin_required
def delete_group(group_id):
group = db.session.get(Group, group_id)
db.session.delete(group)
db.session.commit()
return redirect(url_for('dashboard'))
@app.route('/player/<int:player_id>')
@login_required
def player_page(player_id):
@@ -372,24 +256,11 @@ def player_fullscreen(player_id):
authenticated = False
if authenticated or current_user.is_authenticated:
if player.groups:
# If the player is part of a group, get the group's content
group = player.groups[0] # Assuming a player can only be in one group
content = Content.query.filter_by(group_id=group.id).all()
else:
# If the player is not part of a group, get the player's content
content = Content.query.filter_by(player_id=player_id).all()
content = Content.query.filter_by(player_id=player_id).all()
return render_template('player_fullscreen.html', player=player, content=content)
else:
return render_template('player_auth.html', player_id=player_id)
@app.route('/group/<int:group_id>/fullscreen')
@login_required
def group_fullscreen(group_id):
group = Group.query.get_or_404(group_id)
content = Content.query.filter_by(group_id=group.id).all()
return render_template('group_fullscreen.html', group=group, content=content)
@app.route('/player/<int:player_id>/delete', methods=['POST'])
@login_required
@admin_required
@@ -422,25 +293,12 @@ def add_player():
return redirect(url_for('dashboard'))
return render_template('add_player.html')
@app.route('/group/add', methods=['GET', 'POST'])
@login_required
@admin_required
def add_group():
if request.method == 'POST':
name = request.form['name']
new_group = Group(name=name)
db.session.add(new_group)
db.session.commit()
return redirect(url_for('dashboard'))
return render_template('add_group.html')
@app.route('/integrate_player')
@login_required
@admin_required
def integrate_player():
players = Player.query.all()
groups = Group.query.all()
return render_template('integrate_player.html', players=players, groups=groups)
return render_template('integrate_player.html', players=players)
@app.route('/edit_player/<int:player_id>', methods=['GET', 'POST'])
@login_required
@@ -549,13 +407,7 @@ def get_playlist():
if not player or not player.verify_quickconnect_code(quickconnect_code):
return jsonify({'error': 'Invalid hostname or quick connect code'}), 404
if player.groups:
# If the player is part of a group, get the group's content
group = player.groups[0] # Assuming a player can only be in one group
content = Content.query.filter_by(group_id=group.id).all()
else:
# If the player is not part of a group, get the player's content
content = Content.query.filter_by(player_id=player.id).all()
content = Content.query.filter_by(player_id=player.id).all()
playlist = [{'file_name': item.file_name, 'duration': item.duration, 'url': url_for('media', filename=item.file_name, _external=True)} for item in content]
return jsonify({'playlist': playlist})