@@ -164,3 +164,9 @@ from app import routes
|
||||
from app import jellyfin_routes, tasks
|
||||
if "worker" in sys.argv:
|
||||
tasks.release_lock("download_missing_tracks_lock")
|
||||
|
||||
from app import filters # Import the filters dictionary
|
||||
|
||||
# Register all filters
|
||||
for name, func in filters.filters.items():
|
||||
app.jinja_env.filters[name] = func
|
||||
79
app/classes.py
Normal file
79
app/classes.py
Normal file
@@ -0,0 +1,79 @@
|
||||
import subprocess
|
||||
import json
|
||||
from flask import current_app as app # Adjust this based on your app's structure
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class AudioProfile:
|
||||
def __init__(self, path: str, bitrate: int = 0, sample_rate: int = 0, channels: int = 0) -> None:
|
||||
"""
|
||||
Initialize an AudioProfile instance.
|
||||
|
||||
Args:
|
||||
path (str): The file path of the audio file.
|
||||
bitrate (int): The audio bitrate in kbps. Default is 0.
|
||||
sample_rate (int): The sample rate in Hz. Default is 0.
|
||||
channels (int): The number of audio channels. Default is 0.
|
||||
"""
|
||||
self.path: str = path
|
||||
self.bitrate: int = bitrate # in kbps
|
||||
self.sample_rate: int = sample_rate # in Hz
|
||||
self.channels: int = channels
|
||||
|
||||
@staticmethod
|
||||
def analyze_audio_quality_with_ffprobe(filepath: str) -> Optional['AudioProfile']:
|
||||
"""
|
||||
Static method to analyze audio quality using ffprobe and return an AudioProfile instance.
|
||||
|
||||
Args:
|
||||
filepath (str): Path to the audio file to analyze.
|
||||
|
||||
Returns:
|
||||
Optional[AudioProfile]: An instance of AudioProfile if analysis is successful, None otherwise.
|
||||
"""
|
||||
try:
|
||||
# ffprobe command to extract bitrate, sample rate, and channel count
|
||||
cmd = [
|
||||
'ffprobe', '-v', 'error', '-select_streams', 'a:0',
|
||||
'-show_entries', 'stream=bit_rate,sample_rate,channels',
|
||||
'-show_format',
|
||||
'-of', 'json', filepath
|
||||
]
|
||||
result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
||||
if result.returncode != 0:
|
||||
app.logger.error(f"ffprobe error for file {filepath}: {result.stderr}")
|
||||
return None
|
||||
|
||||
# Parse ffprobe output
|
||||
data = json.loads(result.stdout)
|
||||
stream = data.get('streams', [{}])[0]
|
||||
bitrate: int = int(stream.get('bit_rate', 0)) // 1000 # Convert to kbps
|
||||
if bitrate == 0: # Fallback if no bit_rate in stream
|
||||
bitrate = int(data.get('format').get('bit_rate', 0)) // 1000
|
||||
sample_rate: int = int(stream.get('sample_rate', 0)) # Hz
|
||||
channels: int = int(stream.get('channels', 0))
|
||||
|
||||
# Create an AudioProfile instance
|
||||
return AudioProfile(filepath, bitrate, sample_rate, channels)
|
||||
except Exception as e:
|
||||
app.logger.error(f"Error analyzing audio quality with ffprobe: {str(e)}")
|
||||
return None
|
||||
|
||||
def compute_quality_score(self) -> int:
|
||||
"""
|
||||
Compute a quality score based on bitrate, sample rate, and channels.
|
||||
|
||||
Returns:
|
||||
int: The computed quality score.
|
||||
"""
|
||||
return self.bitrate + (self.sample_rate // 1000) + (self.channels * 10)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
"""
|
||||
Representation of the AudioProfile instance.
|
||||
|
||||
Returns:
|
||||
str: A string representation of the AudioProfile instance.
|
||||
"""
|
||||
return (f"AudioProfile(path='{self.path}', bitrate={self.bitrate} kbps, "
|
||||
f"sample_rate={self.sample_rate} Hz, channels={self.channels})")
|
||||
48
app/filters.py
Normal file
48
app/filters.py
Normal file
@@ -0,0 +1,48 @@
|
||||
import os
|
||||
import re
|
||||
from markupsafe import Markup
|
||||
|
||||
from app.classes import AudioProfile
|
||||
|
||||
filters = {}
|
||||
|
||||
def template_filter(name):
|
||||
"""Decorator to register a Jinja2 filter."""
|
||||
def decorator(func):
|
||||
filters[name] = func
|
||||
return func
|
||||
return decorator
|
||||
|
||||
@template_filter('highlight')
|
||||
def highlight_search(text, search_query):
|
||||
if not search_query:
|
||||
return text
|
||||
search_query_escaped = re.escape(search_query)
|
||||
highlighted_text = re.sub(
|
||||
f"({search_query_escaped})",
|
||||
r'<mark>\1</mark>',
|
||||
text,
|
||||
flags=re.IGNORECASE
|
||||
)
|
||||
return Markup(highlighted_text)
|
||||
|
||||
|
||||
@template_filter('audioprofile')
|
||||
def audioprofile(text: str, path: str) -> Markup:
|
||||
if not path or not os.path.exists(path):
|
||||
return Markup() # Return the original text if the file does not exist
|
||||
|
||||
# Create the AudioProfile instance using the static method
|
||||
audio_profile = AudioProfile.analyze_audio_quality_with_ffprobe(path)
|
||||
if not audio_profile:
|
||||
return Markup(f"<span style='color: red;'>ERROR</span>")
|
||||
|
||||
# Create a nicely formatted HTML representation
|
||||
audio_profile_html = (
|
||||
f"<strong>Bitrate:</strong> {audio_profile.bitrate} kbps<br>"
|
||||
f"<strong>Sample Rate:</strong> {audio_profile.sample_rate} Hz<br>"
|
||||
f"<strong>Channels:</strong> {audio_profile.channels}<br>"
|
||||
f"<strong>Quality Score:</strong> {audio_profile.compute_quality_score()}"
|
||||
f"</div>"
|
||||
)
|
||||
return Markup(audio_profile_html)
|
||||
@@ -208,5 +208,5 @@ def search_jellyfin():
|
||||
if search_query:
|
||||
results = jellyfin.search_music_tracks(functions._get_token_from_sessioncookie(), search_query)
|
||||
# Render only the search results section as response
|
||||
return render_template('partials/_jf_search_results.html', results=results,spotify_id= spotify_id)
|
||||
return render_template('partials/_jf_search_results.html', results=results,spotify_id= spotify_id,search_query = search_query)
|
||||
return jsonify({'error': 'No search query provided'}), 400
|
||||
@@ -17,6 +17,7 @@ class Config:
|
||||
JELLYPLIST_DB_PASSWORD = os.getenv('JELLYPLIST_DB_PASSWORD')
|
||||
START_DOWNLOAD_AFTER_PLAYLIST_ADD = os.getenv('START_DOWNLOAD_AFTER_PLAYLIST_ADD',"false").lower() == 'true' # If a new Playlist is added, the Download Task will be scheduled immediately
|
||||
REFRESH_LIBRARIES_AFTER_DOWNLOAD_TASK = os.getenv('REFRESH_LIBRARIES_AFTER_DOWNLOAD_TASK',"false").lower() == 'true'
|
||||
DISPLAY_EXTENDED_AUDIO_DATA = os.getenv('DISPLAY_EXTENDED_AUDIO_DATA',"false").lower() == 'true'
|
||||
CACHE_TYPE = 'redis'
|
||||
CACHE_REDIS_PORT = 6379
|
||||
CACHE_REDIS_HOST = 'redis'
|
||||
|
||||
@@ -53,3 +53,8 @@ body {
|
||||
.logo img{
|
||||
width: 100%;
|
||||
}
|
||||
@media screen and (min-width: 1600px) {
|
||||
.modal-dialog {
|
||||
max-width: 90%; /* New width for default modal */
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,10 @@
|
||||
<th>Name</th>
|
||||
<th>Artist(s)</th>
|
||||
<th>Path</th>
|
||||
<th>Container</th>
|
||||
{% if config['DISPLAY_EXTENDED_AUDIO_DATA'] %}
|
||||
<th></th>
|
||||
{% endif %}
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
@@ -14,17 +18,21 @@
|
||||
<tbody>
|
||||
{% for track in results %}
|
||||
<tr>
|
||||
<td>{{ track.Name }}</td>
|
||||
<td>{{ track.Name | highlight(search_query) }}</td>
|
||||
<td>{{ ', '.join(track.Artists) }}</td>
|
||||
<td>{{ track.Path}}</td>
|
||||
<td>{{ track.Container }}</td>
|
||||
{% if config['DISPLAY_EXTENDED_AUDIO_DATA'] %}
|
||||
<td> {{track.Path | audioprofile(track.Path) }}</td>
|
||||
{% endif %}
|
||||
<td>
|
||||
<button class="btn btn-sm btn-primary" onclick="playJellyfinTrack(this, '{{ track.Id }}')">
|
||||
<i class="fas fa-play"></i>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<button hx-swap="beforebegin" class="btn btn-sm btn-success" hx-post="/associate_track" hx-vals='{"jellyfin_id": "{{ track.Id }}","spotify_id": "{{ spotify_id}}"}'>
|
||||
Associate Track
|
||||
<button hx-swap="beforebegin" class="btn btn-sm btn-success" hx-post="/associate_track" hx-vals='{"jellyfin_id": "{{ track.Id }}","spotify_id": "{{ spotify_id}}"}' data-bs-toggle="tooltip" title="Link this Track [{{track.Id}}] with Spotify-Track-ID {{ spotify_id }}">
|
||||
Link Track
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
</table>
|
||||
</div>
|
||||
<div class="modal fade" id="searchModal" tabindex="-1" aria-labelledby="searchModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-xl modal-dialog-centered">
|
||||
<div class="modal-dialog modal-xl modal-dialog-centered modal-dialog-scrollable">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="searchModalLabel">Search Jellyfin for Track</h5>
|
||||
|
||||
Reference in New Issue
Block a user