Skip to content

Commit 8aa8f48

Browse files
alex1702alex1702
committed
ard: deep search for Nordstory
integrate mlib
2 parents fdeaf02 + 04c65d5 commit 8aa8f48

32 files changed

+4102
-21
lines changed

‎build.gradle‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,27 @@ sourceCompatibility = JavaVersion.VERSION_17
2727
targetCompatibility = JavaVersion.VERSION_17
2828
group = 'de.mediathekview'
2929
archivesBaseName = "MServer"
30-
version = '3.1.265'
30+
version = '3.1.266'
3131

3232
def jarName = 'MServer.jar'
3333
def mainClass = 'mServer.Main'
3434

3535
dependencies {
36-
implementation 'de.mediathekview:MLib:3.0.18'
37-
implementation 'commons-net:commons-net:3.9.0'
38-
implementation 'org.apache.commons:commons-compress:1.22'
39-
implementation 'org.apache.commons:commons-text:1.10.0'
40-
implementation 'org.tukaani:xz:1.9'
41-
implementation 'com.google.code.gson:gson:2.10.1'
42-
implementation 'org.glassfish.jersey.core:jersey-client:3.0.8'
43-
implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.8'
44-
implementation 'org.jsoup:jsoup:1.15.4'
45-
implementation 'javax.activation:activation:1.1.1'
46-
implementation 'com.google.guava:guava:31.1-jre'
47-
implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
36+
implementation 'commons-net:commons-net:3.12.0'
37+
implementation 'org.apache.commons:commons-compress:1.28.0'
38+
implementation 'org.apache.commons:commons-text:1.14.0'
39+
implementation 'org.tukaani:xz:1.10'
40+
implementation 'com.google.code.gson:gson:2.13.1'
41+
implementation 'org.glassfish.jersey.core:jersey-client:3.1.11'
42+
implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.11'
43+
implementation 'org.jsoup:jsoup:1.21.1'
44+
implementation 'jakarta.activation:jakarta.activation-api:2.1.3'
45+
implementation 'com.google.guava:guava:33.4.8-jre'
46+
implementation 'org.apache.logging.log4j:log4j-core:2.25.1'
4847
implementation 'fm.void.jetm:jetm:1.2.3'
48+
implementation 'com.jidesoft:jide-oss:3.6.18'
49+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
50+
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.0'
4951

5052

5153
testImplementation 'junit:junit:4.13.2'

‎src/main/java/de/mediathekview/mlib/Config.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* MediathekView
3+
* Copyright (C) 2008 W. Xaver
4+
* W.Xaver[at]googlemail.com
5+
* http://zdfmediathk.sourceforge.net/
6+
*
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*/
20+
package de.mediathekview.mlib;
21+
22+
import de.mediathekview.mlib.Const;
23+
24+
import java.util.concurrent.atomic.AtomicBoolean;
25+
26+
public class Config {
27+
28+
public static int bandbreite = 0; // maxBandbreite in Byte
29+
private static String userAgent = null;
30+
public static boolean debug = false; // Debugmodus
31+
private static final AtomicBoolean stop = new AtomicBoolean(false); // damit kannn das Laden gestoppt werden
32+
33+
public static void setUserAgent(String ua) {
34+
// Useragent den der Benutzer vorgegeben hat
35+
userAgent = ua;
36+
}
37+
38+
public static String getUserAgent() {
39+
if (userAgent == null) {
40+
return Const.USER_AGENT_DEFAULT;
41+
} else {
42+
return userAgent;
43+
}
44+
}
45+
46+
/**
47+
* Damit kann "stop" gesetzt/rückgesetzt werden.
48+
*
49+
* @param set Bei true wird die Suche abgebrochen.
50+
*/
51+
public static void setStop(boolean set) {
52+
stop.set(set);
53+
}
54+
55+
/**
56+
* Abfrage, ob ein Abbruch erfogte
57+
*
58+
* @return true/false
59+
*/
60+
public static boolean getStop() {
61+
return stop.get();
62+
}
63+
}

‎src/main/java/de/mediathekview/mlib/Const.java‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* MediathekView
3+
* Copyright (C) 2008 W. Xaver
4+
* W.Xaver[at]googlemail.com
5+
* http://zdfmediathk.sourceforge.net/
6+
*
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*/
20+
package de.mediathekview.mlib;
21+
22+
import de.mediathekview.mlib.tool.Functions;
23+
24+
public class Const {
25+
26+
@Deprecated public static final String VERSION = "13";
27+
public static final String VERSION_FILMLISTE = "3";
28+
public static final String PROGRAMMNAME = "MSearch";
29+
public static final String USER_AGENT_DEFAULT = Const.PROGRAMMNAME + Functions.getProgVersionString();
30+
// MediathekView URLs
31+
public static final String ADRESSE_FILMLISTEN_SERVER_DIFF = "http://res.mediathekview.de/diff.xml";
32+
public static final String ADRESSE_FILMLISTEN_SERVER_AKT = "http://res.mediathekview.de/akt.xml";
33+
// Dateien/Verzeichnisse
34+
public static final int STRING_BUFFER_START_BUFFER = 8 * 1024 * 8; // 8 KiB
35+
public static final String FORMAT_ZIP = ".zip";
36+
public static final String FORMAT_XZ = ".xz";
37+
public static final String RTMP_PRTOKOLL = "rtmp";
38+
public static final String RTMP_FLVSTREAMER = "-r ";
39+
public static final int ALTER_FILMLISTE_SEKUNDEN_FUER_AUTOUPDATE = 3 * 60 * 60; // beim Start des Programms wir die Liste geladen wenn sie älter ist als ..
40+
public static final String TIME_MAX_AGE_FOR_DIFF = "09"; // Uhrzeit ab der die Diffliste alle Änderungen abdeckt, die Filmliste darf also nicht vor xx erstellt worden sein
41+
public static final int MAX_BESCHREIBUNG = 400; // max länge der Beschreibung in Zeichen -> mehr gibts aber jetzt nicht mehr!
42+
43+
public static final String DREISAT = "3Sat";
44+
public static final String ARD = "ARD";
45+
public static final String ARD_ALPHA = "ARD-alpha";
46+
public static final String ARTE_DE = "ARTE.DE";
47+
public static final String ARTE_FR = "ARTE.FR";
48+
public static final String BR = "BR";
49+
public static final String DW = "DW";
50+
public static final String HR = "HR";
51+
public static final String KIKA = "KiKA";
52+
public static final String MDR = "MDR";
53+
public static final String NDR = "NDR";
54+
public static final String ORF = "ORF";
55+
public static final String ONE = "ONE";
56+
public static final String PHOENIX = "PHOENIX";
57+
public static final String RBB = "RBB";
58+
public static final String RBTV = "rbtv";
59+
public static final String SR = "SR";
60+
public static final String SRF = "SRF";
61+
public static final String SRF_PODCAST = "SRF.Podcast";
62+
public static final String SWR = "SWR";
63+
public static final String TAGESSCHAU24 = "tagesschau24";
64+
public static final String WDR = "WDR";
65+
public static final String ZDF = "ZDF";
66+
public static final String ZDF_INFO = "ZDFinfo";
67+
public static final String ZDF_NEO = "ZDFneo";
68+
public static final String ZDF_TIVI = "ZDF-tivi";
69+
70+
public static final String[] SENDER = {DREISAT, ARD, ARTE_DE, ARTE_FR, BR, DW, HR, KIKA, MDR, NDR, ORF, PHOENIX, RBB, SR, SRF, SRF_PODCAST, SWR, WDR, ZDF, ZDF_TIVI};
71+
72+
}

0 commit comments

Comments
 (0)