fix using same filename item will end in the same id even if changed.

SurfaceS · Oct 25, 2023 · f2ae475 · f2ae475
1 parent 349f8e5
commit f2ae475
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 20 deletions.
diff --git a/src/main/java/net/pms/dlna/DidlHelper.java b/src/main/java/net/pms/dlna/DidlHelper.java
@@ -403,10 +403,10 @@ public static final String getDidlString(StoreResource resource) {
 							if (defaultAudioTrack != null && mediaInfo.getDurationInSeconds() > 0.0 && transcodeFrequency > 0 &&
 								transcodeNumberOfChannels > 0) {
 								int finalSize = (int) (mediaInfo.getDurationInSeconds() * transcodeFrequency * 2 * transcodeNumberOfChannels);
-								LOGGER.trace("Calculated transcoded size for {}: {}", resource.getSystemName(), finalSize);
+								LOGGER.trace("Calculated transcoded size for {}: {}", resource.getFileName(), finalSize);
 								addAttribute(sb, "size", finalSize);
 							} else if (mediaInfo.getSize() > 0) {
-								LOGGER.trace("Could not calculate transcoded size for {}, using file size: {}", resource.getSystemName(),
+								LOGGER.trace("Could not calculate transcoded size for {}, using file size: {}", resource.getFileName(),
 									mediaInfo.getSize());
 								addAttribute(sb, "size", mediaInfo.getSize());
 							}

diff --git a/src/main/java/net/pms/encoders/AviSynthFFmpeg.java b/src/main/java/net/pms/encoders/AviSynthFFmpeg.java
@@ -147,9 +147,9 @@ public boolean isCompatible(StoreItem resource) {
 				return false;
 			}
 		} catch (NullPointerException e) {
-			LOGGER.trace("AviSynth/FFmpeg cannot determine compatibility based on audio track for " + resource.getSystemName());
+			LOGGER.trace("AviSynth/FFmpeg cannot determine compatibility based on audio track for " + resource.getFileName());
 		} catch (IndexOutOfBoundsException e) {
-			LOGGER.trace("AviSynth/FFmpeg cannot determine compatibility based on default audio track for " + resource.getSystemName());
+			LOGGER.trace("AviSynth/FFmpeg cannot determine compatibility based on default audio track for " + resource.getFileName());
 		}
 
 		return PlayerUtil.isVideo(resource, Format.Identifier.MKV) ||

diff --git a/src/main/java/net/pms/encoders/AviSynthMEncoder.java b/src/main/java/net/pms/encoders/AviSynthMEncoder.java
@@ -241,9 +241,9 @@ public boolean isCompatible(StoreItem resource) {
 				return false;
 			}
 		} catch (NullPointerException e) {
-			LOGGER.trace("AviSynth/MEncoder cannot determine compatibility based on audio track for " + resource.getSystemName());
+			LOGGER.trace("AviSynth/MEncoder cannot determine compatibility based on audio track for " + resource.getFileName());
 		} catch (IndexOutOfBoundsException e) {
-			LOGGER.trace("AviSynth/MEncoder cannot determine compatibility based on default audio track for " + resource.getSystemName());
+			LOGGER.trace("AviSynth/MEncoder cannot determine compatibility based on default audio track for " + resource.getFileName());
 		}
 
 		return (

diff --git a/src/main/java/net/pms/encoders/TsMuxeRVideo.java b/src/main/java/net/pms/encoders/TsMuxeRVideo.java
@@ -724,9 +724,9 @@ public boolean isCompatible(StoreItem resource) {
 				return false;
 			}
 		} catch (NullPointerException e) {
-			LOGGER.trace("tsMuxeR cannot determine compatibility based on audio track for " + resource.getSystemName());
+			LOGGER.trace("tsMuxeR cannot determine compatibility based on audio track for " + resource.getFileName());
 		} catch (IndexOutOfBoundsException e) {
-			LOGGER.trace("tsMuxeR cannot determine compatibility based on default audio track for " + resource.getSystemName());
+			LOGGER.trace("tsMuxeR cannot determine compatibility based on default audio track for " + resource.getFileName());
 		}
 
 		return (

diff --git a/src/main/java/net/pms/external/opensubtitles/OpenSubtitle.java b/src/main/java/net/pms/external/opensubtitles/OpenSubtitle.java
@@ -1156,7 +1156,7 @@ protected static List<SubtitleItem> findSubtitlesByName(
 			}
 		}
 		if (fileName == null) {
-			fileName = resource.getSystemName();
+			fileName = resource.getFileName();
 		}
 
 		Array queryArray = new Array();
@@ -1280,7 +1280,7 @@ protected static String guessImdbIdByFileName(StoreResource resource, String fil
 				}
 				fileName = file.getName();
 			} else {
-				fileName = resource.getSystemName();
+				fileName = resource.getFileName();
 			}
 			if (isBlank(fileName)) {
 				return null;

diff --git a/...et/pms/network/mediaserver/jupnp/support/contentdirectory/result/StoreResourceHelper.java b/...et/pms/network/mediaserver/jupnp/support/contentdirectory/result/StoreResourceHelper.java
@@ -482,10 +482,10 @@ public static final Item getItem(StoreItem item) {
 							if (defaultAudioTrack != null && mediaInfo.getDurationInSeconds() > 0.0 && transcodeFrequency > 0 &&
 								transcodeNumberOfChannels > 0) {
 								int finalSize = (int) (mediaInfo.getDurationInSeconds() * transcodeFrequency * 2 * transcodeNumberOfChannels);
-								LOGGER.trace("Calculated transcoded size for {}: {}", item.getSystemName(), finalSize);
+								LOGGER.trace("Calculated transcoded size for {}: {}", item.getFileName(), finalSize);
 								res.setSize(finalSize);
 							} else if (mediaInfo.getSize() > 0) {
-								LOGGER.trace("Could not calculate transcoded size for {}, using file size: {}", item.getSystemName(),
+								LOGGER.trace("Could not calculate transcoded size for {}, using file size: {}", item.getFileName(),
 									mediaInfo.getSize());
 								res.setSize(mediaInfo.getSize());
 							}

diff --git a/src/main/java/net/pms/network/webguiserver/servlets/PlayerApiServlet.java b/src/main/java/net/pms/network/webguiserver/servlets/PlayerApiServlet.java
@@ -1137,8 +1137,8 @@ private static boolean sendMedia(HttpServletRequest req, HttpServletResponse res
 		}
 		if (item.getFormat().isVideo()) {
 			mimeType = renderer.getVideoMimeType();
-			if (FileUtil.isUrl(item.getSystemName())) {
-				if (FFmpegWebVideo.isYouTubeURL(item.getSystemName())) {
+			if (FileUtil.isUrl(item.getFileName())) {
+				if (FFmpegWebVideo.isYouTubeURL(item.getFileName())) {
 					item.setEngine(EngineFactory.getEngine(StandardEngineId.YOUTUBE_DL, false, false));
 				} else {
 					item.setEngine(EngineFactory.getEngine(StandardEngineId.FFMPEG_WEB_VIDEO, false, false));

diff --git a/src/main/java/net/pms/store/StoreItem.java b/src/main/java/net/pms/store/StoreItem.java
@@ -181,7 +181,7 @@ public void setFormat(Format format) {
 	 */
 	protected void resolveFormat() {
 		if (format == null) {
-			format = FormatFactory.getAssociatedFormat(getSystemName());
+			format = FormatFactory.getAssociatedFormat(getFileName());
 		}
 
 		if (format != null && format.isUnknown()) {
@@ -631,7 +631,7 @@ public void startPlaying(final String rendererId) {
 					if (isLogPlayEvents()) {
 						LOGGER.info("Started playing {} ({}) on your {}", getName(), getEngineName(), rendererName);
 						LOGGER.debug(
-								"The full filename of which is: " + getSystemName() + " and the address of the renderer is: " + rendererId);
+								"The full filename of which is: " + getFileName() + " and the address of the renderer is: " + rendererId);
 					}
 					startTime = System.currentTimeMillis();
 				};
@@ -683,7 +683,7 @@ public void stopPlaying(final String rendererId) {
 
 						if (isLogPlayEvents()) {
 							LOGGER.info("Stopped playing {} on {}", getName(), rendererName);
-							LOGGER.debug("The full filename of which is \"{}\" and the address of the renderer is {}", getSystemName(),
+							LOGGER.debug("The full filename of which is \"{}\" and the address of the renderer is {}", getFileName(),
 									rendererId);
 						}
 						internalStop();

diff --git a/src/main/java/net/pms/store/item/RealFile.java b/src/main/java/net/pms/store/item/RealFile.java
@@ -173,11 +173,26 @@ public void resolveFormat() {
 		super.resolveFormat();
 	}
 
+	/**
+	 * @return The path to the mediaInfo source.
+	 */
 	@Override
-	public String getSystemName() {
+	public String getFileName() {
 		return ProcessUtil.getShortFileNameIfWideChars(getFile().getAbsolutePath());
 	}
 
+	@Override
+	public String getSystemName() {
+		String filename = getFileName();
+		if (getMediaAudio() != null && getMediaAudio().getId() != 0) {
+			filename = filename.concat("_a").concat(String.valueOf(getMediaAudio().getId()));
+		}
+		if (getMediaSubtitle() != null && getMediaSubtitle().getId() != 0) {
+			filename = filename.concat("_s").concat(String.valueOf(getMediaSubtitle().getId()));
+		}
+		return filename;
+	}
+
 	@Override
 	public synchronized void resolve() {
 		if (file == null) {

diff --git a/src/main/java/net/pms/util/FileNamePrettifier.java b/src/main/java/net/pms/util/FileNamePrettifier.java
@@ -117,7 +117,7 @@ public FileNamePrettifier(StoreResource resource) {
 			tmpName = realFile.getFile().getName();
 		}
 		if (isBlank(tmpName)) {
-			tmpName = resource.getSystemName();
+			tmpName = resource.getFileName();
 		}
 		if (isBlank(tmpName)) {
 			tmpName = resource.getName();

diff --git a/src/main/java/net/pms/util/SubtitleUtils.java b/src/main/java/net/pms/util/SubtitleUtils.java
@@ -270,7 +270,7 @@ public static File getSubtitles(
 			return convertedFile;
 		}
 
-		String filename = isEmbeddedSource ? resource.getSystemName() : params.getSid().getExternalFile().getAbsolutePath();
+		String filename = isEmbeddedSource ? resource.getFileName() : params.getSid().getExternalFile().getAbsolutePath();
 
 		String basename;