deal with the issue of the content suffix

bioimage-io · Dec 17, 2023 · 438d028 · 438d028
1 parent 703bee3
commit 438d028
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/io/bioimage/modelrunner/model/Model.java b/src/main/java/io/bioimage/modelrunner/model/Model.java
@@ -286,7 +286,7 @@ public static Model createBioimageioModel(String bmzModelFolder, String enginesF
 		List<WeightFormat> modelWeights = descriptor.getWeights().gettAllSupportedWeightObjects();
 		EngineInfo info = null;
 		for (WeightFormat ww : modelWeights) {
-			String source = ww.getSource();
+			String source = ww.getSourceFileName();
 			if (!(new File(bmzModelFolder, source.substring(source.lastIndexOf("/")) )).isFile())
 					continue;
 			info = EngineInfo.defineCompatibleDLEngineWithRdfYamlWeights(ww, enginesFolder);
@@ -349,7 +349,7 @@ public static Model createBioimageioModelWithExactWeigths(String bmzModelFolder,
 		List<WeightFormat> modelWeights = descriptor.getWeights().gettAllSupportedWeightObjects();
 		EngineInfo info = null;
 		for (WeightFormat ww : modelWeights) {
-			String source = ww.getSource();
+			String source = ww.getSourceFileName();
 			if (!(new File(bmzModelFolder, source.substring(source.lastIndexOf("/")) )).isFile())
 					continue;
 			info = EngineInfo.defineExactDLEngineWithRdfYamlWeights(ww, enginesFolder);

diff --git a/src/main/java/io/bioimage/modelrunner/utils/CommonUtils.java b/src/main/java/io/bioimage/modelrunner/utils/CommonUtils.java
@@ -59,7 +59,7 @@ public class CommonUtils {
 	 * @throws MalformedURLException if the String does not correspond to an URL
 	 */
 	public static String getFileNameFromURLString(String str) throws MalformedURLException {
-		if (str.startsWith(Constants.ZENODO_DOMAIN))
+		if (str.startsWith(Constants.ZENODO_DOMAIN) && str.endsWith(Constants.ZENODO_ANNOYING_SUFFIX))
 			str = str.substring(0, str.length() - Constants.ZENODO_ANNOYING_SUFFIX.length());
 		URL url = new URL(str);
 		return new File(url.getPath()).getName();