Skip to content

Added configurable JDownloader URL / Konfigurierbare JDownloader-URL hinzugefügt #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robNice wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −1
Open

Added configurable JDownloader URL / Konfigurierbare JDownloader-URL hinzugefügt #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/mediathek/config/MVConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public enum Configs {
SYSTEM_URL_OEFFNEN("Programm-Url-oeffnen"),
SYSTEM_LINUX_SHUTDOWN("Programm-Linux-Shutdown"),
SYSTEM_PLAYER_ABSPIELEN("Player-zum-Abspielen"),
SYSTEM_JDOWNLOADER_URL("system-jdownloader-url", "http://127.0.0.1:9666/flash/add"),
// Fenstereinstellungen

SYSTEM_EIGENSCHAFTEN_TABELLE_FILME("Eigenschaften-Tabellen-Filme"),
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/mediathek/gui/dialogEinstellungen/PanelEinstellungenErweitert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ public PanelEinstellungenErweitert() {
handler = new TextCopyPasteHandler<>(jTextFieldProgrammShutdown);
jTextFieldProgrammShutdown.setComponentPopupMenu(handler.getPopupMenu());

jTextFieldJDownloaderUrl.setText(MVConfig.get(MVConfig.Configs.SYSTEM_JDOWNLOADER_URL));
jTextFieldJDownloaderUrl.getDocument().addDocumentListener(new BeobDoc(MVConfig.Configs.SYSTEM_JDOWNLOADER_URL, jTextFieldJDownloaderUrl));
handler = new TextCopyPasteHandler<>(jTextFieldJDownloaderUrl);
jTextFieldJDownloaderUrl.setComponentPopupMenu(handler.getPopupMenu());


if (!SystemUtils.IS_OS_LINUX) {
jTextFieldProgrammShutdown.setEnabled(false);
jButtonProgrammShutdown.setEnabled(false);
Expand Down Expand Up @@ -212,6 +218,7 @@ private void initComponents() {
jCheckBoxDownloadSofortStarten = new JCheckBox();
var jPanel2 = new JPanel();
jTextFieldProgrammDateimanager = new JTextField();
jTextFieldJDownloaderUrl = new JTextField();
jButtonProgrammDateimanager = new JButton();
var jLabel1 = new JLabel();
var jLabel2 = new JLabel();
Expand Down Expand Up @@ -320,6 +327,25 @@ private void initComponents() {
}
add(jPanel4);


//======== jPanelJDownloader ========
var jPanelJDownloader = new JPanel();
jPanelJDownloader.setBorder(new TitledBorder("JDownloader"));
jPanelJDownloader.setLayout(new MigLayout(
new LC().insets("5").hideMode(3).gridGap("5", "5"),
new AC().grow().fill(),
new AC().fill()
));

jTextFieldJDownloaderUrl.setToolTipText(
"<html>Wenn jDownloader nicht auf dem lokalen Host installiert ist oder unter einem anderen Port reagieren soll, hier bitte angeben.<br>" +
"Default: http://127.0.0.1:9666/flash/add</html>"
);

jPanelJDownloader.add(jTextFieldJDownloaderUrl, new CC().cell(0, 0));
add(jPanelJDownloader);


//======== jPanel3 ========
{
jPanel3.setBorder(new TitledBorder("Linux: Aufruf zum Shutdown"));
Expand Down Expand Up @@ -374,5 +400,6 @@ private void initComponents() {
private JButton jButtonProgrammShutdown;
private JTextField jTextFieldProgrammShutdown;
private ShutdownActionComboBox cbDefaultShutdownHelperCommand;
private JTextField jTextFieldJDownloaderUrl;
// End of variables declaration//GEN-END:variables
}
18 changes: 18 additions & 0 deletions src/main/java/mediathek/gui/dialogEinstellungen/PanelEinstellungenErweitert.jfd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,24 @@ new FormModel {
"value": "cell 1 3"
} )
} )
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "insets 5,hidemode 3,gap 5 5"
"$columnConstraints": "[grow,fill]"
"$rowConstraints": "[fill]"
} ) {
name: "jPanelJDownloader"
"border": new javax.swing.border.TitledBorder( "JDownloader" )
auxiliary() {
"JavaCodeGenerator.variableLocal": true
}
add( new FormComponent( "javax.swing.JTextField" ) {
name: "jTextFieldJDownloaderUrl"
"toolTipText": "<html>Wenn jDownloader nicht auf dem lokalen Host installiert ist oder unter einem anderen Port reagieren soll, hier bitte angeben.<br>Default: http://127.0.0.1:9666/flash/add</html>"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 0"
} )
} )

add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "insets 5,hidemode 3,gap 5 5"
"$columnConstraints": "[grow,fill][fill]"
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/mediathek/gui/tabs/tab_film/JDownloadHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mediathek.gui.tabs.tab_film

import mediathek.config.Konstanten
import mediathek.config.MVConfig
import mediathek.controller.history.SeenHistoryController
import mediathek.daten.DatenFilm
import mediathek.daten.FilmResolution
Expand All @@ -25,11 +26,25 @@ class JDownloadHelper {
private val historyController = SeenHistoryController()

private fun downloadUrl(url: HttpUrl, film: DatenFilm) {
val jdUrlString = MVConfig.get(MVConfig.Configs.SYSTEM_JDOWNLOADER_URL)
val jdUrl = try {
jdUrlString.toHttpUrl()
} catch (e: IllegalArgumentException) {
logger.error("Invalid JDownloader URL in config: {}", jdUrlString)
SwingErrorDialog.showExceptionMessage(
MediathekGui.ui(),
"<html>Die konfigurierte JDownloader-URL ist ungültig:<br><br><b>$jdUrlString</b></html>",
e
)
return
}
val formBody: RequestBody = FormBody.Builder()
.add("urls", url.toString())
.build()
val request = Request.Builder()
.url("http://127.0.0.1:9666/flash/add")
.url(jdUrl)
.header("Referer", "https://mediathekview")
.header("Origin", "https://mediathekview")
.post(formBody)
.build()
try {
Expand Down