in md. + } + } + else + { + f << c; + } + } +} + +static void mdLink(std::ostream &f, const std::string &label, const std::string &url) +{ + f << "[" << mdSanitize(label, "]") << "](" << mdSanitize(url, ")") << ")"; +} + +static void mdImage(std::ostream &f, const std::string url) +{ + f << "![" << mdSanitize("Plugin Thumbname", "]") << "](" << mdSanitize(url, "]") << "#tone3000_thumbnail" << ")"; + f << "\n\n"; +} +static void writeReadme(const fs::path &path, const Tone3000Download &download) +{ + std::ofstream of{path}; + if (!of.is_open()) + { + throw std::runtime_error(SS("Unable to create file " << path)); + } + std::string imageLink; + if (download.images().size() > 0) + { + imageLink = download.images()[0]; + } + + // clang-format off + of << + + "
\n"
+ << " ![]("
+ << imageLink << ")
\n"
+ << "
\n";
+ // clang-format on
+ of << "\n\n";
+ mdEscapeString(of, download.description());
+
+ if (download.links().size() > 0)
+ {
+ of << std::endl;
+ of << "## Links" << std::endl
+ << std::endl;
+ for (auto &link : download.links())
+ {
+ of << "- " << "[" << link << "](" << link << ")" << std::endl;
+ }
+ }
+}
+
+void pipedal::tone3000::DownloadTone3000Bundle(
+ const std::filesystem::path &destinationFolder,
+ const std::string &downloadUrl)
+{
+ TemporaryFile downloadTemporaryFile{WEB_TEMP_DIR};
+ fs::path downloadPath = downloadTemporaryFile.Path();
+
+ downloadFile(downloadUrl, downloadPath);
+
+ std::ifstream f{downloadPath};
+ if (!f.is_open())
+ {
+ throw std::runtime_error(SS("Can't open file " << downloadPath));
+ }
+ json_reader reader(f);
+
+ Tone3000Download tone3000Download;
+ reader.read(&tone3000Download);
+
+ if (tone3000Download.platform() != "nam")
+ {
+ throw std::runtime_error(SS("Unexpected file format. (platform=\"" << tone3000Download.platform() << "\")"));
+ }
+ fs::path bundlePath = destinationFolder / stringToSafeFilename(tone3000Download.title());
+
+ fs::create_directories(bundlePath);
+
+ for (auto &model : tone3000Download.models())
+ {
+ fs::path modelPath = bundlePath / SS(stringToSafeFilename(model.name()) << ".nam");
+ downloadFile(model.model_url(), modelPath);
+ }
+ fs::path readmePath = bundlePath / "README.md";
+ writeReadme(readmePath, tone3000Download);
+}
+
+Tone3000DownloadResult::Tone3000DownloadResult()
+ : success_(true)
+{
+}
+Tone3000DownloadResult::Tone3000DownloadResult(const std::exception &e)
+ : success_(false), errorMessage_(e.what())
+{
+}
diff --git a/src/Tone3000Download.hpp b/src/Tone3000Download.hpp
new file mode 100644
index 0000000..822f529
--- /dev/null
+++ b/src/Tone3000Download.hpp
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2026 Robin E. R. Davies
+ * All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+#include \n"
+ << "
\n"
+ << "" << mdSanitize(download.title()) << "
\n" + << "\n"
+ << "
\n"
+ << " \n"
+ << mdDate(download.updated_at())
+ << " "
+ << mdUser(download.user())
+ << "
\n"
+ << " " << mdSizes(download.sizes()) << ", "
+ << mdSizes(download.sizes()) << ", "
+ << mdGear(download.gear()) << ", "
+ << mdPlatform(download.platform())
+ << "
\n"
+ << " License: xxx" << mdLicense(download.license()) << "\n"
+ << "
Test Tone3000 Select Page
+This is a test page for Tone3000 select functionality.
+ + + + \ No newline at end of file diff --git a/vite/src/pipedal/AudioFileMetadata.tsx b/vite/src/pipedal/AudioFileMetadata.tsx index d38d435..28ff765 100644 --- a/vite/src/pipedal/AudioFileMetadata.tsx +++ b/vite/src/pipedal/AudioFileMetadata.tsx @@ -38,13 +38,78 @@ function getVersionSuffix(filePath: string): string | null { return match ? match[1] : null; } +export function safeFilenameDecode(filename: string): string { + let originalFilename = filename; + let pos = filename.indexOf('%'); + if (pos < 0) { + return filename; + } + let result = ""; + while (true) { + if (pos < 0) { + result += filename; + return result; + } + result += filename.substring(0, pos); + if (pos+3 >= filename.length) { + // invalid encoding. just use the original + return originalFilename; + } + let hex = filename.charAt(pos+1) + filename.charAt(pos+2); + let byte = parseInt(hex, 16); + + // Handle UTF-8 to UTF-16 conversion + if (byte < 0x80) { + // Single-byte character (ASCII) + result += String.fromCharCode(byte); + filename = filename.substring(pos+3); + } else if ((byte & 0xE0) === 0xC0) { + // 2-byte sequence + if (pos+6 > filename.length || filename.charAt(pos+3) !== '%') { + return originalFilename; // invalid encoding + } + let byte2 = parseInt(filename.charAt(pos+4) + filename.charAt(pos+5), 16); + let codePoint = ((byte & 0x1F) << 6) | (byte2 & 0x3F); + result += String.fromCharCode(codePoint); + filename = filename.substring(pos+6); + } else if ((byte & 0xF0) === 0xE0) { + // 3-byte sequence + if (pos+9 > filename.length || filename.charAt(pos+3) !== '%' || filename.charAt(pos+6) !== '%') { + return originalFilename; // invalid encoding + } + let byte2 = parseInt(filename.charAt(pos+4) + filename.charAt(pos+5), 16); + let byte3 = parseInt(filename.charAt(pos+7) + filename.charAt(pos+8), 16); + let codePoint = ((byte & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | (byte3 & 0x3F); + result += String.fromCharCode(codePoint); + filename = filename.substring(pos+9); + } else if ((byte & 0xF8) === 0xF0) { + // 4-byte sequence (surrogate pair needed) + if (pos+12 > filename.length || filename.charAt(pos+3) !== '%' || filename.charAt(pos+6) !== '%' || filename.charAt(pos+9) !== '%') { + return originalFilename; // invalid encoding + } + let byte2 = parseInt(filename.charAt(pos+4) + filename.charAt(pos+5), 16); + let byte3 = parseInt(filename.charAt(pos+7) + filename.charAt(pos+8), 16); + let byte4 = parseInt(filename.charAt(pos+10) + filename.charAt(pos+11), 16); + let codePoint = ((byte & 0x07) << 18) | ((byte2 & 0x3F) << 12) | ((byte3 & 0x3F) << 6) | (byte4 & 0x3F); + // Convert to UTF-16 surrogate pair + codePoint -= 0x10000; + result += String.fromCharCode(0xD800 + (codePoint >> 10)); + result += String.fromCharCode(0xDC00 + (codePoint & 0x3FF)); + filename = filename.substring(pos+12); + } else { + // Invalid UTF-8 start byte + return originalFilename; + } + pos = filename.indexOf('%'); + } +} export function getTrackTitle(pathname: string, metadata: AudioFileMetadata | null | undefined): string { if (!metadata) { - return pathFileName(pathname); + return safeFilenameDecode(pathFileName(pathname)); } if (metadata.title === "") { - return pathFileName(pathname); + return safeFilenameDecode(pathFileName(pathname)); } let trackDisplay = ""; if (metadata.track > 0) { @@ -56,7 +121,7 @@ export function getTrackTitle(pathname: string, metadata: AudioFileMetadata | nu } let result = trackDisplay + metadata.title; if (result === "") { - result = pathFileName(pathname); + result = safeFilenameDecode(pathFileName(pathname)); } let versionSuffix = getVersionSuffix(pathname); if (versionSuffix) { diff --git a/vite/src/pipedal/FilePropertyControl.tsx b/vite/src/pipedal/FilePropertyControl.tsx index 5419933..df6be1a 100644 --- a/vite/src/pipedal/FilePropertyControl.tsx +++ b/vite/src/pipedal/FilePropertyControl.tsx @@ -25,6 +25,7 @@ import { Component, SyntheticEvent } from 'react'; import { Theme } from '@mui/material/styles'; import { css } from '@emotion/react'; +import ToolTipEx from './ToolTipEx'; import { UiFileProperty } from './Lv2Plugin'; import Typography from '@mui/material/Typography'; @@ -33,15 +34,16 @@ import ButtonBase from '@mui/material/ButtonBase' import MoreHorizIcon from '@mui/icons-material/MoreHoriz'; import { PedalboardItem } from './Pedalboard'; import { isDarkMode } from './DarkMode'; - - -export const StandardItemSize = { width: 80, height: 140 } +import {safeFilenameDecode} from './AudioFileMetadata'; import { withStyles } from "tss-react/mui"; import WithStyles from './WithStyles'; import { withTheme } from './WithStyles'; + +export const StandardItemSize = { width: 80, height: 140 } + const styles = (theme: Theme) => { return { frame: css({ @@ -209,11 +211,13 @@ const FilePropertyControl = let fileProperty = this.props.fileProperty; let value = "\u00A0"; + let toolTipText: string | null = null; if (this.state.hasValue) { if (this.state.value.length === 0) { value = "
-
+
{ this.onFileClick() }} >
+
{/* LABEL/EDIT SECTION*/}
diff --git a/vite/src/pipedal/FilePropertyDialog.tsx b/vite/src/pipedal/FilePropertyDialog.tsx
index da6b505..1b7b439 100644
--- a/vite/src/pipedal/FilePropertyDialog.tsx
+++ b/vite/src/pipedal/FilePropertyDialog.tsx
@@ -21,8 +21,6 @@
import React from 'react';
import { createStyles } from './WithStyles';
-import Tone3000Dialog from './Tone3000Dialog';
-
import TextInfoDialog from './TextInfoDialog';
import Tone3000HelpDialog from './Tone3000HelpDialog';
import GuitarMLHelpDialog from './GuitarMlHelpDialog';
@@ -69,6 +67,7 @@ import OkCancelDialog from './OkCancelDialog';
import HomeIcon from '@mui/icons-material/Home';
import FilePropertyDirectorySelectDialog from './FilePropertyDirectorySelectDialog';
import { getAlbumArtUri, getTrackTitle } from './AudioFileMetadata';
+import { Tone3000DownloadDialog } from './Tone3000Dialog';
const ToobNamModelFileUrl = "http://two-play.com/plugins/toob-nam#modelFile";
@@ -705,7 +704,7 @@ export default withStyles(
if (this.state.previousSelection == selectedItem) {
return;
}
- if (!this.isLicenseFile(selectedItem) && !this.isFolderArtwork(selectedItem)) {
+ if (!this.isTextFile(selectedItem) && !this.isFolderArtwork(selectedItem)) {
this.props.onApply(fileProperty, selectedItem);
}
this.setState({ previousSelection: selectedItem });
@@ -1071,9 +1070,7 @@ export default withStyles(
handleTone3000Dialog(e: React.MouseEvent
-
+ {
+ try {
+ // Dialog can close. We'll use the following await to manage
+ // lifecycle from here onward.
+ this.stopTone3000DialogMonitor();
-interface Tone3000AuthState {
- authToken: string;
- refreshToken: string;
- expiry: number;
-};
-
-// function getAuthToken(): Tone3000AuthState | null {
-
-// let authToken = window.localStorage.getItem("tone300_auth_token");
-// if (authToken === null) {
-// return null;
-// }
-// let refreshToken = window.localStorage.getItem("tone3000_refresh_token");
-// if (refreshToken === null) {
-// return null;
-// }
-// let expiry = window.localStorage.getTime("tone3000_auth_expiry");
-// return { authToken: authToken, refreshToken: refreshToken, expiry: expiry };
-// }
-
-// function setAuthToken(authToken: string, refreshToken: string, expirySeconds: number) {
-// window.localStorage.setItem("tone3000_auth_token", authToken);
-// window.localStorage.setItem("tone3000_refresh_token", refreshToken);
-// window.localStorage.setItem("tone3000_auth_expiry", String(Date.now() + (expirySeconds * 1000)));
-// }
-
-// enum AuthState {
-// OnBoarding,
-// TokenExpired,
-// Authenticated
-// }
-
-function Tone3000Dialog(props: Tone3000DialogProps) {
- const { onCancel,onDownload } = props;
-
- function RedirectUrl() {
- let baseUrl = new URL(window.location.href);
- let result = "http://" + baseUrl.hostname + ":" + baseUrl.port + "/public/handleTone3000download.html";
- return result;
- }
- const appId = 'pipedal_app';
- const redirectUrl = RedirectUrl();
-
- let selectUrl = `https://www.tone3000.com/api/v1/select?app_id=${appId}&redirect_url=${redirectUrl}`;
-
- const model: PiPedalModel = PiPedalModelFactory.getInstance();
- if (model) {
+ this.handleTone3000DownloadComplete();
+ await this.model.downloadModelsFromTone3000(tone3000DownloadUrl,this.downloadPath);
+ return;
+ } catch (e) {
+ this.handleTone3000DownloadError(getErrorMessage(e));
+ return;
+ }
}
- React.useEffect(()=> {
+ private messageEventListener: ((event: MessageEvent) => void) | null = null;
- let messagehandler = (event: MessageEvent) => {
- // Handle messages received from the iframe
- if (event.origin !== "https://www.tone3000.com") {
+ private model: PiPedalModel;
+
+ public constructor(model: PiPedalModel) {
+ this.model = model;
+ this.messageEventListener = (event: MessageEvent) => {
+ if (event.data.type !== "tone3000Download") {
return;
}
- const data = event.data;
- if (data.type === "tone3000_selection") {
- onDownload(data.toneUrl);
+ this.handleTone3000Download(event.data.toneUrl as string);
+ };
+
+ window.addEventListener("message", this.messageEventListener);
+ }
+
+ public dispose(): void {
+ if (this.messageEventListener) {
+ window.removeEventListener("message", this.messageEventListener);
+ this.messageEventListener = null;
+ }
+ }
+
+ private popupWindow: Window | null = null;
+
+ private appId: string = "pipedal_app";
+ private redirectUrl(): string {
+ let hostname = window.location.hostname;
+ let port = window.location.port;
+ let protocol = window.location.protocol;
+ let serverUrl: string;
+ if (protocol === "http:" && (port === "80" || port === "")) {
+ serverUrl = `${protocol}//${hostname}`;
+ } else if (protocol === "https:" && (port === "443" || port === "")) {
+ serverUrl = `${protocol}//${hostname}`;
+ } else {
+ serverUrl = `${protocol}//${hostname}:${port}`;
+ }
+ return `${serverUrl}/public/handleTone3000download.html`;
+ }
+
+ private tone3000SelectUrl(): string {
+ return `https://www.tone3000.com/api/v1/select?app_id=${this.appId}&redirect_url=${this.redirectUrl()}`;
+ }
+
+
+ private handleTone3000DialogClosed() {
+ let t = this.onClosedCallback;
+ this.onClosedCallback = undefined;
+ this.onErrorCallback = undefined;
+ this.onDownloadCompleteCallback = undefined;
+ if (t) {
+ t();
+ }
+ this.stopTone3000DialogMonitor();
+ }
+ private handleTone3000Downloadstarted() {
+ if (this.onDownloadStartedCallback) {
+ this.onDownloadStartedCallback();
+ }
+ }
+ private handleTone3000DownloadComplete() {
+ let t = this.onDownloadCompleteCallback;
+ this.onClosedCallback = undefined;
+ this.onErrorCallback = undefined;
+ this.onDownloadCompleteCallback = undefined;
+ if (t) {
+ t();
+ }
+ this.stopTone3000DialogMonitor();
+ }
+ private handleTone3000DownloadError(errorMessage: string) {
+ let t = this.onErrorCallback;
+ this.onClosedCallback = undefined;
+ this.onErrorCallback = undefined;
+ this.onDownloadCompleteCallback = undefined;
+ if (t) {
+ t(errorMessage);
+ }
+ this.stopTone3000DialogMonitor();
+ }
+
+ private tone3000DialogInterval: number | undefined = undefined;
+
+ private stopTone3000DialogMonitor() {
+ if (this.tone3000DialogInterval !== undefined) {
+ clearInterval(this.tone3000DialogInterval);
+ this.tone3000DialogInterval = undefined;
+ }
+ }
+ private startTone3000DialogMonitor() {
+ this.tone3000DialogInterval = setInterval(() => {
+ if (this.popupWindow == null || this.popupWindow.closed) {
+ this.stopTone3000DialogMonitor();
+ this.popupWindow = null;
+ this.handleTone3000DialogClosed();
+ }
+ }, 500);
+ }
+ private downloadPath: string = "";
+ private onClosedCallback: (() => void) | undefined = undefined;
+ private onErrorCallback: ((errorMessage: string) => void) | undefined = undefined;
+ private onDownloadStartedCallback: (() => void) | undefined = undefined;
+ private onDownloadCompleteCallback: (() => void) | undefined = undefined;
+
+ public launchTone3000Dialog(
+ downloadPath: string,
+ onClosed: () => void,
+ onError: (errorMessage: string) => void,
+ onDownloadStarted: () => void,
+ onDownloadComplete: () => void
+ ) {
+ this.closeTone3000Dialog();
+ this.downloadPath = downloadPath;
+ this.onClosedCallback = onClosed;
+ this.onDownloadCompleteCallback = onDownloadComplete;
+ this.onDownloadStartedCallback = onDownloadStarted;
+ this.onErrorCallback = onError;
+
+ fetch(TONE3000_PING_URL, { cache: "no-cache" })
+ .then((response) => {
+ if (!response.ok) {
+ this.handleTone3000DownloadError(`Unable to connect to Tone3000: ${response.status}${response.statusText}`);
+ return;
+ }
+
+ // online
+ let popupWidth = Math.floor(window.innerWidth * 0.8);
+ let popupHeight = Math.floor(window.innerHeight * 0.8);
+ if (window.innerWidth < 410) {
+ popupWidth = 400;
+ }
+
+ this.popupWindow =
+ window.open(
+ this.tone3000SelectUrl(),
+ "popup",
+ `innerWidth=${popupWidth},innerHeight=${popupHeight},scrollbars=yes`
+ );
+ this.startTone3000DialogMonitor();
+
+ if (!this.popupWindow) {
+ console.error("Failed to open Tone3000 dialog popup window.");
+ this.handleTone3000DownloadError("Cannot open popup window.");
+ return;
+ }
+ })
+ .catch((error) => {
+ // offline
+ this.handleTone3000DownloadError("Not online. Unable to connect to Tone3000 servers.");
+ return;
+ });
+
+ }
+ public closeTone3000Dialog(): void {
+ this.handleTone3000DialogClosed();
+ this.stopTone3000DialogMonitor();
+ if (this.popupWindow) {
+ try {
+
+ let t = this.popupWindow;
+ this.popupWindow = null;
+ t.close();
+ } catch (e) {
+ console.error("Error closing Tone3000 dialog popup:", e);
}
}
- window.addEventListener("message", messagehandler);
-
- return () => {
- window.removeEventListener("message", messagehandler);
- }
- });
-
-
- return (
- { onCancel()}} fullScreen={true} tag="tone3000Dlg" onEnterKey={()=>{}} >
-
-
-
- );
+ }
}
-export default Tone3000Dialog;
\ No newline at end of file
+export interface Tone3000DownloadDialogProps {
+
+ onClose: () => void,
+ onDownloadComplete: () => void,
+ downloadPath: string
+}
+export function Tone3000DownloadDialog(props: Tone3000DownloadDialogProps): JSX.Element {
+ const model = PiPedalModel.getInstance();
+ let { onClose, onDownloadComplete, downloadPath } = props;
+ let [downloading, setDownloading] = useState(false);
+
+ useEffect(() => {
+ model.showTone3000DownloadDialog(
+ downloadPath,
+ () => {
+ onClose();
+ },
+ () => {
+ setDownloading(true);
+ },
+ () => {
+ onDownloadComplete();
+ }
+ );
+ return () => {
+ model.closeTone3000DownloadDialog();
+ };
+ });
+ return (
+ {
+ onClose();
+ }}
+ onEnterKey={() => { }}
+ >
+
+ Downloading from Tone3000...
+ {downloading &&
+
+
+ {!downloading && (
+
+ )}
+
+
+ );
+}
+
{this.state.textFileContent}
diff --git a/vite/src/pipedal/Tone3000Dialog.tsx b/vite/src/pipedal/Tone3000Dialog.tsx
index d585447..7d094d4 100644
--- a/vite/src/pipedal/Tone3000Dialog.tsx
+++ b/vite/src/pipedal/Tone3000Dialog.tsx
@@ -1,125 +1,261 @@
+import { JSX } from "@emotion/react/jsx-dev-runtime";
+import { PiPedalModel, getErrorMessage } from "./PiPedalModel";
+import DialogEx from "./DialogEx";
+import DialogContent from "@mui/material/DialogContent";
+import DialogAction from "@mui/material/DialogActions";
+import { Button, Typography } from "@mui/material";
+import { useEffect, useState } from "react";
+import LinearProgress from "@mui/material/LinearProgress";
-import React from 'react';
-import AppBar from '@mui/material/AppBar';
-import Typography from '@mui/material/Typography';
-import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel';
-import DialogEx from './DialogEx';
-import Toolbar from '@mui/material/Toolbar';
-import IconButtonEx from './IconButtonEx';
-import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+export type OnTone3000DownloadHandler = (tone3000DownloadUrl: string) => void;
+// used to check for online status.
+let TONE3000_PING_URL = "https://www.tone3000.com/robots.txt";
+export class Tone3000DownloadHandler {
-export interface Tone3000DialogProps {
- open: boolean;
- onCancel: () => void;
- onDownload: (toneUrl: string) => void;
-}
+ private async handleTone3000Download(tone3000DownloadUrl: string): Promise
-
-
-
-
- onCancel()}
- aria-label="back"
- >
-
-
- Tone3000 Direct Download
-
-
-
-
-
-
-
+
+ }
+