8.0.0

CHANGELOG.txt

@@ -1,3 +1,10 @@
+8.0.0-RC1 - 2019-2-22
+
+	General
+		Database cleanup step removes files that are no longer shared
+		Cleanup of new config settings
+		All changes in 7.9.0
+
 7.9.0 - 2019-2-22
 
 	General:
@@ -21,6 +28,19 @@
 			Swedish translation updated
 			Turkish translation updated
 
+8.0.0-b1 - 2019-01-12
+
+	General:
+		Added option to disable FFmpeg GPU acceleration
+		Fixed too much transcoding due to not respecting language priority settings
+		Fixed failure to store audio stream information
+		Fixed failure to start
+		Fixed missing text when adding web content
+		Fixed missing text on the first time language chooser
+		Fixed text clash on the Subtitles settings subtab of the Transcoding settings tab
+		Fixed logspam
+		All changes in 7.8.0
+
 7.8.0 - 2019-01-12
 
 	General:

pom.xml

@@ -30,7 +30,7 @@
 	<artifactId>ums</artifactId>
 	<name>Universal Media Server</name>
 	<packaging>jar</packaging>
-	<version>7.9.1-SNAPSHOT</version>
+	<version>8.0.0-RC1</version>
 	<url>http://www.universalmediaserver.com/</url>
 	<inceptionYear>2012</inceptionYear>
 
@@ -63,7 +63,7 @@
 	</issueManagement>
 	<properties>
 		<!-- NSIS needs a version without "-SNAPSHOT" or "-b1" -->
-		<project.version.short>7.9.1</project.version.short>
+		<project.version.short>8.0.0</project.version.short>
 		<cuelib-version>1.2.1-2008-06-13</cuelib-version>
 
 		<!-- In versions after 1.6.0, they removed code that the MovieInfo plugin relies on -->
@@ -75,14 +75,14 @@
 		<!-- Skip 4.65-1.05-RC because it doesn't work, author is working on fixing it -->
 		<sevenzip-version>9.20-2.00beta</sevenzip-version>
 
-		<twelvemonkeys-imageio-version>3.3.2</twelvemonkeys-imageio-version>
+		<twelvemonkeys-imageio-version>3.4.1</twelvemonkeys-imageio-version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.external-resources>${project.basedir}/src/main/external-resources</project.external-resources>
 		<project.binaries>${project.basedir}/target/bin</project.binaries>
 
 		<project.binaries-base>http://universalmediaserver.com/svn/binaries</project.binaries-base>
-		<binary-revision>81</binary-revision>
+		<binary-revision>82</binary-revision>
 
 		<maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
 		<git-commit-id-plugin-version>2.2.3</git-commit-id-plugin-version>
@@ -245,9 +245,24 @@
 			<version>2.1</version>
 		</dependency>
 		<dependency>
-			<groupId>net.java.dev.rome</groupId>
+			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.0.0</version>
+			<!--
+				org.slf4j:slf4j-api is shared with
+					- ch.qos.logback:logback-classic
+					- su.litvak.chromecast
+					- fm.last:coverartarchive-api
+					- com.github.oshi:oshi-core
+
+				Check the org.slf4j:slf4j-api version of the other libraries before upgrading
+			-->
+			<version>1.9.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>net.coobird</groupId>

src/main/external-resources/UMS.conf

@@ -366,6 +366,18 @@ hide_extensions =
 # Default: true
 hide_enginenames =
 
+# Add subtitles information to video names
+# ----------------------------------------
+# Choose what level of subtitles information that should be added to video
+# names. The following options are available:
+#
+#    none = Don't show subtitles information
+#    basic = Show only basic subtitles information
+#    full = Show full subtitles information
+#
+# Default: basic
+subs_info_level =
+
 # Hide empty folders
 # ------------------
 # Choose whether or not to show folders which contain no viewable content.
@@ -850,6 +862,13 @@ use_embedded_subtitles_style =
 
 # ---< General settings >-----------------------------------------------------
 
+# Disable connection to external entities
+# ---------------------------------------
+# Whether to disable connection to external entities to prevent the XML External
+# Entity vulnerability.
+# Default: true
+disable_external_entities =
+
 # Enable multithreading
 # ---------------------
 # Whether FFmpeg should use multithreading
@@ -1324,6 +1343,15 @@ web_port =
 # Default: true
 web_enable =
 
+# Use HTTPS (SSL) for web connection
+# ----------------------------------
+# Whether the web interface should use HTTPS.
+# To enable HTTPS, a self-signed keystore file called \"UMS.jks\" with password
+# \"umsums\" must be generated using the Java 'keytool' commandline utility.
+# The file must be placed in the profile folder (where this file resides).
+# Default: false
+web_https =
+
 # Web path
 # --------
 # Path to where the UMS web files (like javascripts etc) are to be found.

src/main/external-resources/WEB.conf

@@ -26,19 +26,32 @@
 ##########################################################################################################
 
 # image feeds
-imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=29142919@N07&lang=en-en&format=rss_200
+imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?format=rss2
+imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=39453068@N05&format=rss2
+imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=14362684@N08&format=rss2
 imagefeed.Web,Pictures=http://picasaweb.google.fr/data/feed/base/user/nefuisalbum/albumid/5218433104757705489?alt=rss&kind=photo&hl=en_US
-imagefeed.Web,Pictures=http://picasaweb.google.fr/data/feed/base/user/cookiejarconfessionals/albumid/5229065014037788129?alt=rss&kind=photo&hl=en
-imagefeed.Web,Pictures,Albums=http://picasaweb.google.com/data/feed/base/user/FenderStratRocker?alt=rss&kind=album&hl=en_US&access=public
+imagefeed.Web,Pictures=http://picasaweb.google.com/data/feed/base/user/FenderStratRocker?alt=rss&kind=album&hl=en_US&access=public
 
 # audio feeds
-audiofeed.Web,Podcasts=http://podcasts.engadget.com/rss.xml
+audiofeed.Web,Podcasts=https://rss.art19.com/caliphate
+audiofeed.Web,Podcasts=https://www.nasa.gov/rss/dyn/Gravity-Assist.rss
+audiofeed.Web,Podcasts=http://podcasts.joerogan.net/feed
+audiofeed.Web,Podcasts=http://wakingup.libsyn.com/rss
+audiofeed.Web,Podcasts=https://rss.art19.com/wolverine-the-long-night
 
 # video feeds
-videofeed.Web,TED=http://feeds.feedburner.com/tedtalks_video
-videofeed.Web,The Onion=http://feeds.theonion.com/onionnewsnetwork
+videofeed.Web,Vodcasts=http://feeds.feedburner.com/tedtalks_video
+videofeed.Web,Vodcasts=https://www.nasa.gov/rss/dyn/nasax_vodcast.rss
+videofeed.Web,Vodcasts=https://www.unicef.org/rss/unicef_television_vodcast.xml
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC0PEAMcRK7Mnn2G1bCBXOWQ
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCccjdJEay2hpb5scz61zY6Q
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCOiUKJ6lMU3yHbVNtNXJyfw
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCqFzWxSCi39LnW1JKFR3efg
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCfAOh2t5DpxVrgS9NQKjC7A
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC8-Th83bH_thdKZDJCrn88g
+videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCzRBkt4a2hy6HObM3cl-x7g
 
 # video streams
-videostream.Web,TV=France 24,mms://stream1.france24.yacast.net/f24_liveen,http://www.france24.com/en/sites/france24.com.en/themes/france24/logo-fr.png
-videostream.Web,TV=BFM TV (French TV),mms://vipmms9.yacast.net/bfm_bfmtv,http://upload.wikimedia.org/wikipedia/en/6/62/BFMTV.png
-videostream.Web,Webcams=View of Shanghai Harbour,mmst://www.onedir.com/cam3,http://media-cdn.tripadvisor.com/media/photo-s/00/1d/4b/d8/pudong-from-the-bund.jpg
+# videostream.Web,TV=France 24,mms://stream1.france24.yacast.net/f24_liveen,http://www.france24.com/en/sites/france24.com.en/themes/france24/logo-fr.png
+# videostream.Web,TV=BFM TV (French TV),mms://vipmms9.yacast.net/bfm_bfmtv,http://upload.wikimedia.org/wikipedia/en/6/62/BFMTV.png
+# videostream.Web,Webcams=View of Shanghai Harbour,mmst://www.onedir.com/cam3,http://media-cdn.tripadvisor.com/media/photo-s/00/1d/4b/d8/pudong-from-the-bund.jpg

src/main/external-resources/renderers/Kodi.conf

@@ -69,5 +69,5 @@ Supported = f:wavpack                   m:audio/x-wavpack
 Supported = f:wma                       m:audio/x-ms-wma
 
 # Supported subtitles formats:
-SupportedExternalSubtitlesFormats = ASS,MICRODVD,PGS,SAMI,SUBRIP,TEXT,UFS,VOBSUB,WEBVTT
+SupportedExternalSubtitlesFormats = ASS,PGS,SAMI,SUBRIP,TEXT,UFS,WEBVTT
 SupportedInternalSubtitlesFormats = ASS,MICRODVD,PGS,SAMI,SUBRIP,TEXT,UFS,VOBSUB,WEBVTT

src/main/java/net/pms/PMS.java

@@ -28,9 +28,7 @@
 import java.io.*;
 import java.net.BindException;
 import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Paths;
 import java.security.AccessControlException;
 import java.sql.SQLException;
@@ -374,9 +372,6 @@ private void displayBanner() throws IOException {
 		dbgPack = new DbgPacker();
 		tfm = new TempFileMgr();
 
-		// This should be removed soon
-		OpenSubtitle.convert();
-
 		// Start this here to let the converison work
 		tfm.schedule();
 
@@ -909,7 +904,7 @@ private synchronized static void createInstance() {
 			}
 		} catch (Exception e) {
 			LOGGER.error("A serious error occurred during {} initialization: {}", PMS.NAME, e.getMessage());
-			LOGGER.trace("", e);
+			LOGGER.debug("", e);
 		}
 	}
 
@@ -1142,7 +1137,7 @@ public String getSimilarTVSeriesName(String title) {
 			return title;
 		}
 
-		title = getSimplifiedShowName(title);
+		title = FileUtil.getSimplifiedShowName(title);
 		title = StringEscapeUtils.escapeSql(title);
 
 		if (getConfiguration().getUseCache()) {
@@ -1155,22 +1150,6 @@ public String getSimilarTVSeriesName(String title) {
 		return "";
 	}
 
-	/**
-	 * This reduces the incoming title to a lowercase, alphanumeric string
-	 * for searching in order to prevent titles like "Word of the Word" and
-	 * "Word Of The Word!" from being seen as different shows.
-	 *
-	 * @param title
-	 * @return
-	 */
-	public String getSimplifiedShowName(String title) {
-		if (title == null) {
-			return null;
-		}
-
-		return title.toLowerCase().replaceAll("[^a-z0-9]", "");
-	}
-
 	/**
 	 * Retrieves the {@link net.pms.configuration.PmsConfiguration PmsConfiguration} object
 	 * that contains all configured settings for DMS. The object provides getters for all
@@ -1352,20 +1331,10 @@ private static boolean verifyPidName(String pid) throws IOException, IllegalAcce
 		Process p = pb.start();
 		String line;
 
-		Charset charset = null;
-		int codepage = WinUtils.getOEMCP();
-		String[] aliases = {"cp" + codepage, "MS" + codepage};
-		for (String alias : aliases) {
-			try {
-				charset = Charset.forName(alias);
-				break;
-			} catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
-				charset = null;
-			}
-		}
+		Charset charset = WinUtils.getOEMCharset();
 		if (charset == null) {
 			charset = Charset.defaultCharset();
-			LOGGER.warn("Couldn't find a supported charset for {}, using default ({})", aliases, charset);
+			LOGGER.warn("Couldn't find a supported charset for {}, using default ({})", WinUtils.getOEMCP(), charset);
 		}
 		try (BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream(), charset))) {
 			try {
@@ -1769,6 +1738,9 @@ public static boolean getLogDB() {
 	private CredMgr credMgr;
 
 	public static CredMgr.Credential getCred(String owner) {
+		if (instance == null || instance.credMgr == null) {
+			return null;
+		}
 		return instance.credMgr.getCred(owner);
 	}