Merge branch 'cli-invoc' of github.com:GoogleChromeLabs/squoosh into cli-invoc-2

This commit is contained in:
Jason Miller
2020-12-09 11:28:24 -05:00
3 changed files with 76 additions and 2 deletions

View File

@@ -5,6 +5,7 @@ import 'add-css:./style.css';
import { cleanSet, cleanMerge } from '../../util/clean-modify';
import type { SourceImage, OutputType } from '..';
import type SnackBarElement from 'shared/initial-app/custom-els/snack-bar';
import {
EncoderOptions,
EncoderState,
@@ -19,8 +20,11 @@ import Select from './Select';
import { Options as QuantOptionsComponent } from 'features/processors/quantize/client';
import { Options as ResizeOptionsComponent } from 'features/processors/resize/client';
import { generateCliInvocation } from '../../util/cli-invocation-generator';
interface Props {
index: 0 | 1;
showSnack: SnackBarElement['showSnackbar'];
mobileView: boolean;
source?: SourceImage;
encoderState?: EncoderState;
@@ -106,6 +110,22 @@ export default class Options extends Component<Props, State> {
this.props.onEncoderOptionsChange(this.props.index, newOptions);
};
private onCreateCLIInvocation = () => {
if (!this.props.encoderState) {
return;
}
try {
const cliInvocation = generateCliInvocation(
this.props.encoderState,
this.props.processorState,
);
navigator.clipboard.writeText(cliInvocation);
} catch (e) {
this.props.showSnack(e);
}
};
render(
{ source, encoderState, processorState }: Props,
{ supportedEncoderMap }: State,
@@ -125,7 +145,9 @@ export default class Options extends Component<Props, State> {
<Expander>
{!encoderState ? null : (
<div>
<h3 class={style.optionsTitle}>Edit</h3>
<h3 class={style.optionsTitle}>
<button onClick={this.onCreateCLIInvocation}>CLI</button>Edit
</h3>
<label class={style.sectionEnabler}>
Resize
<Toggle

View File

@@ -820,7 +820,7 @@ export default class Compress extends Component<Props, State> {
}
render(
{ onBack }: Props,
{ onBack, showSnack }: Props,
{
loading,
sides,
@@ -839,6 +839,7 @@ export default class Compress extends Component<Props, State> {
const options = sides.map((side, index) => (
<Options
index={index as 0 | 1}
showSnack={showSnack}
source={source}
mobileView={mobileView}
processorState={side.latestSettings.processorState}

View File

@@ -0,0 +1,51 @@
/**
* Copyright 2020 Google Inc. All Rights Reserved.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { EncoderState, ProcessorState } from '../feature-meta';
// Maps our encoder.type values to CLI parameter names
const typeMap = new Map<string, string>([
['avif', '--avif'],
['jxl', '--jxl'],
['mozJPEG', '--mozjpeg'],
['oxiPNG', '--oxipng'],
['webP', '--webp'],
['wp2', '--wp2'],
]);
// Same as JSON.stringify, but with single quotes around the entire value
// so that shells dont do weird stuff.
function cliJson<T>(v: T): string {
return "'" + JSON.stringify(v) + "'";
}
export function generateCliInvocation(
encoder: EncoderState,
processor: ProcessorState,
): string {
if (!typeMap.has(encoder.type)) {
throw Error(`Encoder ${encoder.type} is unsupported in the CLI`);
}
return [
'npx',
'@squoosh/cli',
...(processor.resize.enabled
? ['--resize', cliJson(processor.resize)]
: []),
...(processor.quantize.enabled
? ['--quant', cliJson(processor.quantize)]
: []),
typeMap.get(encoder.type)!,
cliJson(encoder.options),
].join(' ');
}