Merge branch 'release/3.0.0'

MSearch in MLib umbenannt.

README.md

@@ -1,9 +1,9 @@
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
-[![Build Status](https://travis-ci.org/mediathekview/MSearch.svg?branch=master)](https://travis-ci.org/mediathekview/MSearch)
-[![Quality Gate](https://sonarqube.com/api/badges/gate?key=mediathekview%3AMSearch)](https://sonarqube.com/dashboard/index/mediathekview%3AMSearch)
-# MSearch
-Lib für das Programm **MediathekView**.
+[![Build Status](https://travis-ci.org/mediathekview/MLib.svg?branch=master)](https://travis-ci.org/mediathekview/MLib)
+[![Quality Gate](https://sonarqube.com/api/badges/gate?key=mediathekview%3AMLib)](https://sonarqube.com/dashboard/index/mediathekview%3AMLib)
+# MLib
+Bibliothek für das Programm **MediathekView** und den Crawler.
 
 # MediathekView
 
@@ -14,18 +14,18 @@ Lib für das Programm **MediathekView**.
 
 ## Code auschecken
 ```bash
-git clone https://github.com/mediathekview/MSearch.git
+git clone https://github.com/mediathekview/MLib.git
 ```
 
 ## Bauen an der Kommandozeile
 ```bash
-cd MSearch
+cd MLib
 ./gradlew build
 ```
 
 ## Entwicklung mit Netbeans
-* Verzeichniss `MSearch` mit Netbeans öffnen
+* Verzeichniss `MLib` mit Netbeans öffnen
 
 ## Entwicklung mit Eclipse
 * Falls noch nicht vorhanden: [Plugin buildship](https://projects.eclipse.org/projects/tools.buildship) installieren
-* Projekt `MSearch` als Gradle-Projekt importieren.
+* Projekt `MLib` als Gradle-Projekt importieren.

build.gradle

@@ -6,8 +6,9 @@ import java.nio.file.Files
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+
 group = 'de.mediathekview'
-version = '2.4.0'
+version = '3.0.0'
 
 ext {
     propsFile = file('src/main/resources/version.properties').absoluteFile
@@ -80,10 +81,10 @@ task updateVersion {
         def oldVersion = props.getProperty('VERSION')
         String buildDate = new Date().format('dd.MM.yyyy HH:mm:ss')
         if (!oldVersion.equals(project.version)) {
-            logger.lifecycle "==msearch======================"
+            logger.lifecycle "==mlib======================"
             logger.lifecycle "Version: $project.version"
             logger.lifecycle "Baudatum: $buildDate"
-            logger.lifecycle "==msearch======================"
+            logger.lifecycle "==mlib======================"
             props.setProperty('VERSION', project.version)
             props.setProperty('DATE', buildDate)
             props.store(propsFile.newWriter(), null)

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'MSearch'
+rootProject.name = 'MLib'

src/main/java/mSearch/Config.java → src/main/java/de/mediathekview/mlib/Config.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch;
+package de.mediathekview.mlib;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

src/main/java/mSearch/Const.java → src/main/java/de/mediathekview/mlib/Const.java

@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch;
+package de.mediathekview.mlib;
 
-import mSearch.tool.Functions;
+import de.mediathekview.mlib.tool.Functions;
 
 public class Const {
 

src/main/java/mSearch/daten/DatenFilm.java → src/main/java/de/mediathekview/mlib/daten/DatenFilm.java

@@ -17,13 +17,20 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.daten;
+package de.mediathekview.mlib.daten;
+
+import java.util.Date;
 
-import mSearch.Const;
-import mSearch.tool.*;
 import org.apache.commons.lang3.time.FastDateFormat;
 
-import java.util.Date;
+import de.mediathekview.mlib.Const;
+import de.mediathekview.mlib.tool.DatumFilm;
+import de.mediathekview.mlib.tool.FileSize;
+import de.mediathekview.mlib.tool.Functions;
+import de.mediathekview.mlib.tool.GermanStringSorter;
+import de.mediathekview.mlib.tool.Hash;
+import de.mediathekview.mlib.tool.Log;
+import de.mediathekview.mlib.tool.MSLong;
 
 public class DatenFilm implements Comparable<DatenFilm> {
 

src/main/java/mSearch/daten/ListeFilme.java → src/main/java/de/mediathekview/mlib/daten/ListeFilme.java

@@ -17,21 +17,32 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.daten;
-
-import mSearch.Const;
-import mSearch.tool.Duration;
-import mSearch.tool.FileSize;
-import mSearch.tool.Functions;
-import mSearch.tool.Log;
-import org.apache.commons.lang3.time.FastDateFormat;
+package de.mediathekview.mlib.daten;
 
 import java.security.MessageDigest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Optional;
+import java.util.SimpleTimeZone;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 
+import org.apache.commons.lang3.time.FastDateFormat;
+
+import de.mediathekview.mlib.Const;
+import de.mediathekview.mlib.tool.Duration;
+import de.mediathekview.mlib.tool.FileSize;
+import de.mediathekview.mlib.tool.Functions;
+import de.mediathekview.mlib.tool.Log;
+
 @SuppressWarnings("serial")
 public class ListeFilme extends ArrayList<DatenFilm> {
     public static final String THEMA_LIVE = "Livestream";
@@ -487,7 +498,7 @@ public synchronized void themenLaden() {
         TreeSet<String>[] tree = (TreeSet<String>[]) new TreeSet<?>[senderLength];
         HashSet<String>[] hashSet = (HashSet<String>[]) new HashSet<?>[senderLength];
         for (int i = 0; i < tree.length; ++i) {
-            tree[i] = new TreeSet<>(mSearch.tool.GermanStringSorter.getInstance());
+            tree[i] = new TreeSet<>(de.mediathekview.mlib.tool.GermanStringSorter.getInstance());
             tree[i].add("");
             hashSet[i] = new HashSet<>();
         }

src/main/java/mSearch/filmeSuchen/ListenerFilmeLaden.java → src/main/java/de/mediathekview/mlib/filmesuchen/ListenerFilmeLaden.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmeSuchen;
+package de.mediathekview.mlib.filmesuchen;
 
 import java.util.EventListener;
 

src/main/java/mSearch/filmeSuchen/ListenerFilmeLadenEvent.java → src/main/java/de/mediathekview/mlib/filmesuchen/ListenerFilmeLadenEvent.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmeSuchen;
+package de.mediathekview.mlib.filmesuchen;
 
 public class ListenerFilmeLadenEvent {
 

src/main/java/mSearch/filmlisten/DatenFilmlisteUrl.java → src/main/java/de/mediathekview/mlib/filmlisten/DatenFilmlisteUrl.java

@@ -17,14 +17,15 @@
  *    You should have received a copy of the GNU General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmlisten;
+package de.mediathekview.mlib.filmlisten;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.SimpleTimeZone;
-import mSearch.tool.Log;
+
+import de.mediathekview.mlib.tool.Log;
 
 public class DatenFilmlisteUrl implements Comparable<DatenFilmlisteUrl> {
 

src/main/java/mSearch/filmlisten/FilmlisteLesen.java → src/main/java/de/mediathekview/mlib/filmlisten/FilmlisteLesen.java

@@ -17,28 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmlisten;
+package de.mediathekview.mlib.filmlisten;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import mSearch.Config;
-import mSearch.Const;
-import mSearch.daten.DatenFilm;
-import mSearch.daten.ListeFilme;
-import mSearch.filmeSuchen.ListenerFilmeLaden;
-import mSearch.filmeSuchen.ListenerFilmeLadenEvent;
-import mSearch.tool.InputStreamProgressMonitor;
-import mSearch.tool.Log;
-import mSearch.tool.MVHttpClient;
-import mSearch.tool.ProgressMonitorInputStream;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.apache.commons.lang3.time.FastDateFormat;
-import org.tukaani.xz.XZInputStream;
-
-import javax.swing.event.EventListenerList;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -49,6 +29,29 @@
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipInputStream;
 
+import javax.swing.event.EventListenerList;
+
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.tukaani.xz.XZInputStream;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
+import de.mediathekview.mlib.Config;
+import de.mediathekview.mlib.Const;
+import de.mediathekview.mlib.daten.DatenFilm;
+import de.mediathekview.mlib.daten.ListeFilme;
+import de.mediathekview.mlib.filmesuchen.ListenerFilmeLaden;
+import de.mediathekview.mlib.filmesuchen.ListenerFilmeLadenEvent;
+import de.mediathekview.mlib.tool.InputStreamProgressMonitor;
+import de.mediathekview.mlib.tool.Log;
+import de.mediathekview.mlib.tool.MVHttpClient;
+import de.mediathekview.mlib.tool.ProgressMonitorInputStream;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
 public class FilmlisteLesen {
     private static final int PROGRESS_MAX = 100;
     private static WorkMode workMode = WorkMode.NORMAL; // die Klasse wird an verschiedenen Stellen benutzt, klappt sonst nicht immer, zB. FilmListe zu alt und neu laden

src/main/java/mSearch/filmlisten/FilmlistenSuchen.java → src/main/java/de/mediathekview/mlib/filmlisten/FilmlistenSuchen.java

@@ -17,17 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmlisten;
+package de.mediathekview.mlib.filmlisten;
 
-import mSearch.Config;
-import mSearch.Const;
-import mSearch.tool.Functions;
-import mSearch.tool.Log;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
@@ -37,6 +28,16 @@
 import java.util.ArrayList;
 import java.util.Random;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import de.mediathekview.mlib.Config;
+import de.mediathekview.mlib.Const;
+import de.mediathekview.mlib.tool.Functions;
+import de.mediathekview.mlib.tool.Log;
+
 public class FilmlistenSuchen {
 
     // damit werden die DownloadURLs zum Laden einer Filmliste gesucht

src/main/java/mSearch/filmlisten/ListeFilmlistenUrls.java → src/main/java/de/mediathekview/mlib/filmlisten/ListeFilmlistenUrls.java

@@ -17,9 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmlisten;
+package de.mediathekview.mlib.filmlisten;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Random;
 
 @SuppressWarnings("serial")
 public class ListeFilmlistenUrls extends LinkedList<DatenFilmlisteUrl> {

src/main/java/mSearch/filmlisten/WriteFilmlistJson.java → src/main/java/de/mediathekview/mlib/filmlisten/WriteFilmlistJson.java

@@ -17,19 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.filmlisten;
+package de.mediathekview.mlib.filmlisten;
 
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import mSearch.Const;
-import mSearch.daten.DatenFilm;
-import mSearch.daten.ListeFilme;
-import mSearch.tool.Log;
-import org.tukaani.xz.LZMA2Options;
-import org.tukaani.xz.XZOutputStream;
-
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
@@ -39,6 +33,18 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.XZOutputStream;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+
+import de.mediathekview.mlib.Const;
+import de.mediathekview.mlib.daten.DatenFilm;
+import de.mediathekview.mlib.daten.ListeFilme;
+import de.mediathekview.mlib.tool.Log;
+
 public class WriteFilmlistJson {
 
     private void fastChannelCopy(final ReadableByteChannel src, final WritableByteChannel dest) throws IOException {

src/main/java/mSearch/tool/AbsoluteFromRelativeURI.java → src/main/java/de/mediathekview/mlib/tool/AbsoluteFromRelativeURI.java

@@ -1,4 +1,4 @@
-package mSearch.tool;
+package de.mediathekview.mlib.tool;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/mSearch/tool/Datum.java → src/main/java/de/mediathekview/mlib/tool/Datum.java

@@ -17,7 +17,7 @@
  *    You should have received a copy of the GNU General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.tool;
+package de.mediathekview.mlib.tool;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/mSearch/tool/DatumFilm.java → src/main/java/de/mediathekview/mlib/tool/DatumFilm.java

@@ -17,7 +17,7 @@
  *    You should have received a copy of the GNU General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.tool;
+package de.mediathekview.mlib.tool;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/mSearch/tool/DbgMsg.java → src/main/java/de/mediathekview/mlib/tool/DbgMsg.java

@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package mSearch.tool;
+package de.mediathekview.mlib.tool;
 
-import mSearch.Config;
+import de.mediathekview.mlib.Config;
 
 public class DbgMsg {