Полный переход на корректную функцию склеивания строк

Author: CAPCHIK

src/Models/BackgroundAudio/AudioContainer.ts

@@ -1,9 +1,8 @@
 import { Sound } from "@babylonjs/core/Audio/sound";
 import type { Scene } from "@babylonjs/core/scene";
-import { concatUrlPath } from "../../Stuff/UrlHelpers";
 import { PlayAudioHelper } from "../..//WorkWithAudio/PlayAudioHelper";
 import type { BackgroundAudioInfo } from "../ExcursionModels/BackgroundAudioInfo";
-import { concatUrlFromPathes } from "../../concatUrlFromPathes";
+import { concatUrlFromPathes } from "../../Stuff/concatUrlFromPathes";
 
 export class AudioContainer {
 	private sounds: Sound[];

src/Stuff/UrlHelpers.ts

@@ -25,6 +25,10 @@ test("Конечный / не обрабатывается", () => {
   expect(concatUrlFromPathes("foo", "bar/")).toBe("foo/bar/")
 })
 
+test("Множественные / тоже убираются", () => {
+  expect(concatUrlFromPathes("foo///", "////bar")).toBe("foo/bar")
+})
+
 test("Много путей на всякий случай", () => {
   expect(concatUrlFromPathes("foo", "bar/" , "one", "more")).toBe("foo/bar/one/more")
 })

src/concatUrlFromPathes.test.ts src/Stuff/concatUrlFromPathes.test.tssrc/concatUrlFromPathes.test.ts renamed to src/Stuff/concatUrlFromPathes.test.ts

@@ -13,7 +13,7 @@ import type {
 } from "./Models/ExcursionModels/BackgroundAudioInfo";
 import { ImageContentItem } from "./Models/ImageContentItem";
 import type { PrefetchResourcesManager } from "./Models/PrefetchResourcesManager";
-import { concatUrlFromPathes } from "./concatUrlFromPathes";
+import { concatUrlFromPathes } from "./Stuff/concatUrlFromPathes";
 
 /**
  * Временная обработка логики показа фотографии только на определенный момент времени воспроизводимого аудио-сопровождения

src/concatUrlFromPathes.ts src/Stuff/concatUrlFromPathes.tssrc/concatUrlFromPathes.ts renamed to src/Stuff/concatUrlFromPathes.ts

@@ -38,9 +38,8 @@ import "@babylonjs/core/Culling/ray"; // нужно для работы клик
 import { KeyboardEventTypes, PointerEventTypes } from "@babylonjs/core";
 import type { WebXRInterface } from "./AsyncModules/AsyncModuleInterfaces";
 import { PrefetchResourcesManager } from "./Models/PrefetchResourcesManager";
-import { concatUrlPath } from "./Stuff/UrlHelpers";
 import { PlayAudioHelper } from "./WorkWithAudio/PlayAudioHelper";
-import { concatUrlFromPathes } from "./concatUrlFromPathes";
+import { concatUrlFromPathes } from "./Stuff/concatUrlFromPathes";
 
 export class Viewer {
 	private currentImage: DynamicPhotoDome | null = null;
@@ -467,7 +466,7 @@ export class Viewer {
 			)?.audios || [];
 		audios.forEach((a) => {
 			this.prefetchResourcesManager.addResource(
-				concatUrlPath(this.configuration.sceneUrl, a),
+				concatUrlFromPathes(this.configuration.sceneUrl, a),
 			);
 		});
 		state.fieldItems.forEach((fi) => {

src/TempTimerLogic.ts

@@ -1,4 +1,4 @@
-import { concatUrlFromPathes } from "./concatUrlFromPathes";
+import { concatUrlFromPathes } from "./Stuff/concatUrlFromPathes";
 import { BuildConfiguration } from "./Configuration/BuildConfiguration";
 import type { Configuration } from "./Configuration/Configuration";
 import type { Excursion } from "./Models/ExcursionModels/Excursion";