Update to 3.18.28.0

Author: otomad

.eslintrc.json

@@ -46,6 +46,7 @@
 		"@typescript-eslint/ban-ts-comment": "off",
 		"eqeqeq": "error",
 		"@typescript-eslint/ban-types": "off",
-		"@typescript-eslint/no-namespace": "off"
+		"@typescript-eslint/no-namespace": "off",
+		"prefer-const": ["error", { "destructuring": "all" }]
 	}
 }

README.md

@@ -6,7 +6,7 @@
 	<p><b><i>Ranne</i></b></p>
 	<p>
 		<img src="https://img.shields.io/badge/STATE-STABLE-green?style=flat-square" alt="Badge" />
-		<img src="https://img.shields.io/badge/VERSION-3.15.30.0-orange?style=flat-square" alt="Badge" />
+		<img src="https://img.shields.io/badge/VERSION-3.18.28.0-orange?style=flat-square" alt="Badge" />
 		<!-- <img src="https://img.shields.io/github/downloads/otomad/om_midi/total.svg?style=flat-square&label=DOWNLOADS" alt="Downloads"> -->
 	</p>
 	<p><a href="https://github.com/otomad/om_midi/releases/latest"><img src="https://img.shields.io/badge/-Get%20the%20download%20link%20now!-brightgreen?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMTEuMiAwYS44LjggMCAwIDAtLjguOHYxMS40TDcuMjYgOS40NGEuODAzLjgwMyAwIDAgMC0xLjEzLjA3NGwtMS4wNSAxLjJhLjguOCAwIDAgMCAuMDczIDEuMTNsNi4zMyA1LjU0YS43OTUuNzk1IDAgMCAwIDEuMDUgMGw2LjMyLTUuNTRhLjguOCAwIDAgMCAuMDc0LTEuMTNsLTEuMDUtMS4yYS44MDQuODA0IDAgMCAwLTEuMTMtLjA3NGwtMy4xNCAyLjc2Vi44YS44LjggMCAwIDAtLjgtLjh6bS04IDIwLjhhLjguOCAwIDAgMC0uOC44djEuNmEuOC44IDAgMCAwIC44LjhoMTcuNmEuOC44IDAgMCAwIC44LS44di0xLjZhLjguOCAwIDAgMC0uOC0uOHoiIGZpbGw9IndoaXRlIi8+PC9zdmc+" alt="Download" /></a></p>

custom_modules/README.md

@@ -1,3 +1,3 @@
 ## Place my custom Node.js Rollup plugins here
 
-I wanted to find some similar plugins on [npm](https://www.npmjs.com/) and found that I couldn't find them, so I wrote some of them myself.
+I wanted to find some similar plugins on [npm](https://www.npmjs.com/) and found that I couldn't find them, so I wrote some of them by self.

dist/om midi.jsx

@@ -1,6 +1,6 @@
 import ConfigJsonNS from "../core/ConfigJsonNS";
 import MappingVelocityDialog from "../dialogs/MappingVelocityDialog";
-import { ZString } from "../languages/ui-str";
+import { DIALOG_SIGN, ZString } from "../languages/ui-str";
 import addControl from "../modules/addControl";
 import clamp from "../modules/clamp";
 import map from "../modules/map";
@@ -23,7 +23,7 @@ export default class MappingVelocityCheckbox {
 		this.mapping = new ConfigJsonNS.MappingVelocity({ targetLess: defaultRange[0], targetMore: defaultRange[1] });
 		this.group = addControl(parent, "group", { orientation: "row" });
 		this.checkbox = addControl(this.group, "checkbox", { text });
-		this.advanceBtn = addControl(this.group, "button", { text: "...", size: [MIDI_BUTTON_WIDTH, 18] });
+		this.advanceBtn = addControl(this.group, "button", { text: DIALOG_SIGN, size: [MIDI_BUTTON_WIDTH, 18] });
 		this.checkbox.onClick = () => this.value = this.checkbox.value;
 		this.advanceBtn.onClick = () => {
 			const result = new MappingVelocityDialog(targetText, targetRange, this.mapping).showDialog();

dist/om midi.jsxbin

@@ -1,4 +1,4 @@
-import { CannotFindCompositionError, CannotSetTimeRemapError, CannotTuningError, HasNoVideoError, MyError, NoLayerSelectedError, NoMidiError, NoOptionsCheckedError, NotOneTrackForApplyEffectsOnlyError } from "../errors";
+import { CannotFindCompositionError, CannotSetTimeRemapError, CannotTuningError, EmptySubtitlesError, HasNoVideoError, InvalidDurationError, MyError, NoLayerSelectedError, NoMidiError, NoOptionsCheckedError, NotOneTrackForApplyEffectsOnlyError } from "../errors";
 import Portal from "../ui/Portal";
 import getComp from "../modules/getComp";
 import Setting from "../settings/Setting";
@@ -46,6 +46,8 @@ export default class Core {
 					this.applyMarkerConductor(comp);
 				else if (tool === this.portal.toolsTab.ease)
 					this.applyEase100Percent(comp);
+				else if (tool === this.portal.toolsTab.subtitle)
+					this.applyGenerateSubtitles(comp);
 			}
 		} catch (error) {
 			throw new MyError(error as Error);
@@ -544,7 +546,8 @@ export default class Core {
 		const layers = comp.selectedLayers;
 		for (const layer of layers) {
 			if (layer === undefined) continue;
-			for (const property of layer.selectedProperties as Property[]) {
+			const selectedProperties = Core.getSelectedProperties(layer);
+			for (const property of selectedProperties) {
 				if (property === undefined) continue;
 				for (const keyIndex of property.selectedKeys) {
 					if (keyIndex === undefined) continue;
@@ -554,6 +557,23 @@ export default class Core {
 		}
 	}
 
+	applyGenerateSubtitles(comp: CompItem) {
+		const { subtitle } = this.portal.toolsTab;
+		const duration = parseFloat(subtitle.durationTxt.text);
+		const subtitlesText = subtitle.subtitlesText.text;
+		if (!isFinite(duration) || duration <= 0) throw new InvalidDurationError();
+		if (!subtitlesText.trim().length) throw new EmptySubtitlesError();
+		const subtitles = subtitlesText.replace(/\r\n|\n\r|\r|\n/g, "\n").split("\n");
+		
+		app.beginUndoGroup("om midi - Apply Batch Subtitle Generation");
+		const layer = comp.layers.addText();
+		const startTime = layer.startTime = this.getStartTime(comp);
+		subtitles.forEach((line, index) => {
+			if (!line.trim().length) return;
+			layer.sourceText.setValueAtTime(startTime + index * duration, new TextDocument(line));
+		});
+	}
+	
 	//#region 辅助方法
 	/**
 	 * 创建一个空对象图层。
@@ -604,6 +624,28 @@ export default class Core {
 		return layer("Effects") as PropertyGroup;
 	}
 
+	/**
+	 * 获取选中的参数，用以获取选中的关键帧，但是要避免选中参数组，如果是参数组则通过递归来获取真正的参数。
+	 * @param layer - 图层或参数类。
+	 * @returns 选中的参数。
+	 */
+	private static getSelectedProperties(layer: Layer | _PropertyClasses[]): Property[] {
+		const properties: Property[] = [];
+		const propertyClasses = layer instanceof Array ? layer : layer.selectedProperties;
+		for (const property of propertyClasses) {
+			if (property === undefined) continue;
+			else if (property instanceof Property)
+				properties.push(property);
+			else {
+				const subProperties: _PropertyClasses[] = [];
+				for (let i = 1; i <= property.numProperties; i++)
+					subProperties.push(property.property(i));
+				properties.push(...this.getSelectedProperties(subProperties));
+			}
+		}
+		return properties;
+	}
+	
 	/**
 	 * 为指定图层添加一个表达式控制 - 滑块控制的效果。
 	 * @param layer - 图层。
@@ -719,10 +761,20 @@ export default class Core {
 		if (ease.length !== 0)
 			property.setTemporalEaseAtKey(keyIndex, ease as [KeyframeEase]);
 		const anotherSide = isHold ? KeyframeInterpolationType.HOLD : KeyframeInterpolationType.LINEAR;
+		const original: [KeyframeInterpolationType, KeyframeInterpolationType] =
+			[property.keyInInterpolationType(keyIndex), property.keyOutInterpolationType(keyIndex)];
 		if (easeType === EaseType.EASE_IN)
 			property.setInterpolationTypeAtKey(keyIndex, KeyframeInterpolationType.BEZIER, anotherSide);
 		else if (easeType === EaseType.EASE_OUT)
 			property.setInterpolationTypeAtKey(keyIndex, anotherSide, KeyframeInterpolationType.BEZIER);
+		else if (easeType === EaseType.LINEAR)
+			property.setInterpolationTypeAtKey(keyIndex, KeyframeInterpolationType.LINEAR);
+		else if (easeType === EaseType.HOLD)
+			property.setInterpolationTypeAtKey(keyIndex, KeyframeInterpolationType.HOLD);
+		else if (easeType === EaseType.HOLD_IN)
+			property.setInterpolationTypeAtKey(keyIndex, KeyframeInterpolationType.HOLD, original[1]);
+		else if (easeType === EaseType.HOLD_OUT)
+			property.setInterpolationTypeAtKey(keyIndex, original[0], KeyframeInterpolationType.HOLD);
 	}
 	//#endregion
 

src/components/MappingVelocityCheckbox.ts

@@ -71,7 +71,7 @@ export default class SettingsDialog {
 			group: this.languageGroup,
 			label: this.languageLbl,
 			control: this.languageCombo,
-		} = addGroup(this.generalPanel, localize(uiStr.language), "dropdownlist"));
+		} = addGroup(this.generalPanel, localize(uiStr.language), "dropdownlist", undefined, undefined, true));
 		addItems(this.languageCombo, localize(uiStr.app_default) + ` (${this.getDefaultLocale()})`, "简体中文", "English", "日本語", "Tiếng Việt", "한국어");
 		const selectedLanguageIndex = Setting.getLanguage();
 		if (selectedLanguageIndex > 0 && selectedLanguageIndex < this.languageCombo.items.length)

src/core/Core.ts

@@ -139,3 +139,15 @@ export class InvalidMappingVelocityValuesError extends MyError {
 		super(localize(uiStr.invalid_mapping_velocity_values_error));
 	}
 }
+
+export class InvalidDurationError extends MyError {
+	constructor() {
+		super(localize(uiStr.invalid_duration_error));
+	}
+}
+
+export class EmptySubtitlesError extends MyError {
+	constructor() {
+		super(localize(uiStr.empty_subtitles_error));
+	}
+}

src/dialogs/SettingsDialog.ts

@@ -88,7 +88,7 @@ const English: typeof SChinese = {
 	paren_truncated: " (Truncated)",
 	cannot_find_window_error: "Error: Unable to find or create window.",
 	unsupported_setting_type_error: "Error: Unsupported setting data type.",
-	file_unreadable_error: "Error: Could not read the MIDI file. The file may already be occupied or not exist.",
+	file_unreadable_error: "Error: Could not read the file. The file may already be occupied or not exist.",
 	midi_header_validation_error: "Error: MIDI file header chunks validation failed (not a standard MIDI file or this file is corrupt).",
 	midi_track_header_validation_error: "Error: MIDI track header chunks validation failed.",
 	midi_custom_events_error: "Error: Custom MIDI events could not be read.",
@@ -103,7 +103,7 @@ const English: typeof SChinese = {
 	end_of_track_position_error: "Error: Track ends in wrong position. Expected %1, actually %2.",
 	cannot_set_time_remap_error: "Error: Time remapping cannot be set for the selected layer.",
 	cannot_tuning_error: "Error: The selected layer does not contain audio so that cannot be tuned.",
-	about: "It reads a Standard MIDI sequence file and creates layers and keyframes corresponding to the notes and controllers in that MIDI sequence file.\n\nVersion: %4\nApp: %2\nSpecifier: %3\n\nOriginal Authors: David Van Brink (omino), Dora (NGDXW), Z4HD\nAuthor: Ranne\nRepository Link: %1",
+	about: "It reads a Standard MIDI sequence file and creates layers and keyframes corresponding to the notes and controllers in that MIDI sequence file.\n\nVersion: %4\nApp: %2\nSpecifier: %3\n\nAuthor: Ranne\nOriginal Authors: David Van Brink (omino), Dora (NGDXW), Z4HD\nRepository Link: %1",
 	horizontal_mirror: "Horizontal Mirror",
 	advanced_scale: "Advanced Scale",
 	loading_midi: "Loading %1 ...",
@@ -125,6 +125,19 @@ const English: typeof SChinese = {
 	motion_float_up: "Float Up",
 	motion_float_down: "Float Down",
 	script_translator: "Translator: ",
+	invalid_duration_error: "Error: The value of the \"Duration of each subtitles\" parameter is invalid.",
+	empty_subtitles_error: "Error: Please enter the subtitle content.",
+	batch_subtitle_generation: "Batch Subtitle Generation",
+	linear: "Linear",
+	hold_both: "Hold both",
+	hold_in: "Hold in",
+	hold_out: "Hold out",
+	second_unit: "Seconds",
+	open: "Open",
+	text_document: "Text Document",
+	browse: "Browse",
+	file_too_large_info: "The file is too large. Do you want to open it anyway?",
+	will_clear_existing_text_info: "Existing text content will be cleared and your changes may not be retained.",
 };
 
 export default English;