Skip to content
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.

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

Feature/#521 #522

Merged
merged 2 commits into from Sep 11, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Next

Resolves #521

  • Loading branch information...
Nicklas2751 committed Sep 10, 2019
commit 32a1185141c3051a023a9b77c4ed2d8cbc891afb
@@ -16,11 +16,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
group = 'de.mediathekview'
archivesBaseName = "MServer"
<<<<<<< Updated upstream
version = '3.1.102'
=======
version = '3.1.103'
>>>>>>> Stashed changes
version = '3.1.104'

def jarName = 'MServer.jar'
def mainClass = 'mServer.Main'
@@ -19,31 +19,13 @@
*/
package mServer.crawler;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;

import javax.swing.event.EventListenerList;

import org.apache.commons.lang3.time.FastDateFormat;

import de.mediathekview.mlib.Config;
import de.mediathekview.mlib.Const;
import de.mediathekview.mlib.daten.ListeFilme;
import de.mediathekview.mlib.filmesuchen.ListenerFilmeLaden;
import de.mediathekview.mlib.filmesuchen.ListenerFilmeLadenEvent;
import de.mediathekview.mlib.tool.Log;
import mServer.crawler.sender.Mediathek3Sat;
import mServer.crawler.sender.MediathekDw;
import mServer.crawler.sender.MediathekHr;
import mServer.crawler.sender.MediathekKika;
import mServer.crawler.sender.MediathekMdr;
import mServer.crawler.sender.MediathekNdr;
import mServer.crawler.sender.MediathekReader;
import mServer.crawler.sender.MediathekSrfPod;
import mServer.crawler.sender.MediathekWdr;
import mServer.crawler.sender.MediathekZdf;
import mServer.crawler.sender.*;
import mServer.crawler.sender.ard.ArdCrawler;
import mServer.crawler.sender.arte.MediathekArte_de;
import mServer.crawler.sender.arte.MediathekArte_fr;
@@ -52,6 +34,13 @@
import mServer.crawler.sender.phoenix.PhoenixCrawler;
import mServer.crawler.sender.sr.SrCrawler;
import mServer.crawler.sender.srf.SrfCrawler;
import org.apache.commons.lang3.time.FastDateFormat;

import javax.swing.event.EventListenerList;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;

/**
* ###########################################################################################################
@@ -87,7 +76,6 @@ public FilmeSuchen() {
mediathekListe.add(new MediathekKika(this, 0));
mediathekListe.add(new MediathekDw(this, 0));
// Spalte 2
mediathekListe.add(new MediathekMdr(this, 0));
mediathekListe.add(new MediathekWdr(this, 1));
mediathekListe.add(new MediathekHr(this, 0));
mediathekListe.add(new SrCrawler(this, 1));
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.