Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70ea164e31 | ||
|
|
6861111db4 | ||
|
|
aad5f2dfd3 | ||
|
|
a77d288eb9 | ||
|
|
f544736c66 |
@@ -1,4 +1,4 @@
|
||||
"""Playtube - ein eigenstaendiger YouTube- & YouTube-Music-Player mit Discord Rich Presence."""
|
||||
|
||||
__app_name__ = "Playtube"
|
||||
__version__ = "1.0.2"
|
||||
__version__ = "2.0.1"
|
||||
|
||||
+17
-2
@@ -15,14 +15,29 @@ MEDIA_PROBE_JS = r"""
|
||||
var raw = el ? el.getAttribute('src') : null;
|
||||
return (raw && /^https?:\/\//i.test(raw)) ? raw : null;
|
||||
}
|
||||
// Video-ID aus der URL (?v=... Parameter) - damit laesst sich die Thumbnail-URL
|
||||
// ueber YouTubes CDN immer zuverlaessig selbst bauen, unabhaengig davon, ob
|
||||
// gerade ein passendes <img>/<link> im DOM zu finden ist (das <link
|
||||
// rel="image_src">, auf das sich der Code frueher verlassen hat, fehlt auf
|
||||
// vielen aktuellen YouTube-Seiten schlicht).
|
||||
function videoIdFromUrl(url) {
|
||||
try {
|
||||
return new URL(url).searchParams.get('v');
|
||||
} catch (e) { return null; }
|
||||
}
|
||||
function ytThumbnailUrl(videoId) {
|
||||
return videoId ? ('https://i.ytimg.com/vi/' + videoId + '/hqdefault.jpg') : null;
|
||||
}
|
||||
|
||||
var video = document.querySelector('video');
|
||||
var isMusic = location.hostname.indexOf('music.youtube.com') !== -1;
|
||||
var videoId = videoIdFromUrl(location.href);
|
||||
var title = null, subtitle = null, thumbnail = null;
|
||||
|
||||
if (isMusic) {
|
||||
title = txt('.title.ytmusic-player-bar') || txt('ytmusic-player-bar .title');
|
||||
subtitle = txt('.byline.ytmusic-player-bar') || txt('ytmusic-player-bar .byline');
|
||||
thumbnail = imgSrc('ytmusic-player-bar img, .image.ytmusic-player-bar img');
|
||||
thumbnail = imgSrc('ytmusic-player-bar img, .image.ytmusic-player-bar img') || ytThumbnailUrl(videoId);
|
||||
} else {
|
||||
var t = document.title.replace(/ - YouTube$/, '');
|
||||
title = t || null;
|
||||
@@ -31,7 +46,7 @@ MEDIA_PROBE_JS = r"""
|
||||
|| txt('#channel-name a')
|
||||
|| txt('ytd-channel-name#channel-name a');
|
||||
var imgY = document.querySelector('link[rel="image_src"]');
|
||||
thumbnail = imgY ? imgY.href : null;
|
||||
thumbnail = (imgY ? imgY.href : null) || ytThumbnailUrl(videoId);
|
||||
}
|
||||
|
||||
// WICHTIG: QtWebEngine's runJavaScript()-Bruecke liefert bei einem direkt
|
||||
|
||||
@@ -39,9 +39,15 @@ class SettingsTab(QWidget):
|
||||
outer.setContentsMargins(32, 28, 32, 28)
|
||||
outer.setSpacing(18)
|
||||
|
||||
header = QVBoxLayout()
|
||||
header.setSpacing(2)
|
||||
title = QLabel(f"{APP_NAME}-Einstellungen")
|
||||
title.setStyleSheet("font-size: 20px; font-weight: 600;")
|
||||
outer.addWidget(title)
|
||||
header.addWidget(title)
|
||||
version_label = QLabel(f"Version {APP_VERSION}")
|
||||
version_label.setStyleSheet("color: palette(mid);")
|
||||
header.addWidget(version_label)
|
||||
outer.addLayout(header)
|
||||
|
||||
discord_cfg = config.get("discord", {})
|
||||
discord_box = QGroupBox("Discord Rich Presence")
|
||||
@@ -92,7 +98,7 @@ class SettingsTab(QWidget):
|
||||
button_row.addStretch(1)
|
||||
outer.addLayout(button_row)
|
||||
|
||||
info = QLabel(f"{APP_NAME} v{APP_VERSION} · github.com/{GITHUB_REPO}")
|
||||
info = QLabel(f"github.com/{GITHUB_REPO}")
|
||||
info.setStyleSheet("color: palette(mid);")
|
||||
outer.addWidget(info)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user