@@ -135,8 +135,8 @@ |
||
135 | 135 | 'component' => 'select', |
136 | 136 | 'links' => [ |
137 | 137 | [ |
138 | - 'Guide', |
|
139 | - 'https://github.com/rosell-dk/webp-convert/blob/master/docs/v1.3/converting/converters.md' |
|
138 | + 'Guide', |
|
139 | + 'https://github.com/rosell-dk/webp-convert/blob/master/docs/v1.3/converting/converters.md' |
|
140 | 140 | ] |
141 | 141 | ], |
142 | 142 | ] |
@@ -143,7 +143,7 @@ |
||
143 | 143 | ])->getDefinition()); |
144 | 144 | |
145 | 145 | $supportedBy = []; |
146 | - $uniqueOptions = []; |
|
146 | + $uniqueOptions = []; |
|
147 | 147 | |
148 | 148 | foreach ($converterIds as $converterId) { |
149 | 149 | $c = ConverterFactory::makeConverter($converterId, '', ''); |
@@ -31,7 +31,7 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * Get the options unique for this converter |
|
34 | + * Get the options unique for this converter |
|
35 | 35 | * |
36 | 36 | * @return array Array of options |
37 | 37 | */ |
@@ -164,7 +164,7 @@ |
||
164 | 164 | } else { |
165 | 165 | $this->logLn( |
166 | 166 | 'Note: "sharp-yuv" option is not supported in your version of ImageMagick. ' . |
167 | - 'ImageMagic >= 7.0.8-26 is required', |
|
167 | + 'ImageMagic >= 7.0.8-26 is required', |
|
168 | 168 | 'italic' |
169 | 169 | ); |
170 | 170 | } |
@@ -37,62 +37,62 @@ |
||
37 | 37 | { |
38 | 38 | return OptionFactory::createOptions([ |
39 | 39 | ['api-key', 'string', [ |
40 | - 'title' => 'API key', |
|
41 | - 'description' => 'The API key is set up on the remote. Copy that.', |
|
42 | - 'default' => '', |
|
43 | - 'sensitive' => true, |
|
44 | - 'ui' => [ |
|
45 | - 'component' => 'password', |
|
46 | - 'advanced' => false, |
|
47 | - 'display' => "option('wpc-api-version') != 0" |
|
48 | - ] |
|
40 | + 'title' => 'API key', |
|
41 | + 'description' => 'The API key is set up on the remote. Copy that.', |
|
42 | + 'default' => '', |
|
43 | + 'sensitive' => true, |
|
44 | + 'ui' => [ |
|
45 | + 'component' => 'password', |
|
46 | + 'advanced' => false, |
|
47 | + 'display' => "option('wpc-api-version') != 0" |
|
48 | + ] |
|
49 | 49 | ]], |
50 | 50 | ['secret', 'string', [ |
51 | - 'title' => 'Secret', |
|
52 | - 'description' => '', |
|
53 | - 'default' => '', |
|
54 | - 'sensitive' => true, |
|
55 | - 'ui' => [ |
|
56 | - 'component' => 'password', |
|
57 | - 'advanced' => false, |
|
58 | - 'display' => "option('wpc-api-version') == 0" |
|
59 | - ] |
|
51 | + 'title' => 'Secret', |
|
52 | + 'description' => '', |
|
53 | + 'default' => '', |
|
54 | + 'sensitive' => true, |
|
55 | + 'ui' => [ |
|
56 | + 'component' => 'password', |
|
57 | + 'advanced' => false, |
|
58 | + 'display' => "option('wpc-api-version') == 0" |
|
59 | + ] |
|
60 | 60 | ]], |
61 | 61 | ['api-url', 'string', [ |
62 | - 'title' => 'API url', |
|
63 | - 'description' => 'The endpoint of the web service. Copy it from the remote setup', |
|
64 | - 'default' => '', |
|
65 | - 'sensitive' => true, |
|
66 | - 'ui' => [ |
|
67 | - 'component' => 'password', |
|
68 | - 'advanced' => false, |
|
69 | - ] |
|
62 | + 'title' => 'API url', |
|
63 | + 'description' => 'The endpoint of the web service. Copy it from the remote setup', |
|
64 | + 'default' => '', |
|
65 | + 'sensitive' => true, |
|
66 | + 'ui' => [ |
|
67 | + 'component' => 'password', |
|
68 | + 'advanced' => false, |
|
69 | + ] |
|
70 | 70 | ]], |
71 | 71 | ['api-version', 'int', [ |
72 | - 'title' => 'API version', |
|
73 | - 'description' => |
|
72 | + 'title' => 'API version', |
|
73 | + 'description' => |
|
74 | 74 | 'Refers to the major version of Wpc. ' . |
75 | 75 | 'It is probably 2, as it is a long time since 2.0 was released', |
76 | - 'default' => 2, |
|
77 | - 'minimum' => 0, |
|
78 | - 'maximum' => 2, |
|
79 | - 'ui' => [ |
|
80 | - 'component' => 'select', |
|
81 | - 'advanced' => false, |
|
82 | - 'options' => [0, 1, 2], |
|
83 | - ] |
|
76 | + 'default' => 2, |
|
77 | + 'minimum' => 0, |
|
78 | + 'maximum' => 2, |
|
79 | + 'ui' => [ |
|
80 | + 'component' => 'select', |
|
81 | + 'advanced' => false, |
|
82 | + 'options' => [0, 1, 2], |
|
83 | + ] |
|
84 | 84 | ]], |
85 | 85 | ['crypt-api-key-in-transfer', 'boolean', [ |
86 | - 'title' => 'Crypt API key in transfer', |
|
87 | - 'description' => |
|
88 | - 'If checked, the api key will be crypted in requests. ' . |
|
89 | - 'Crypting the api-key protects it from being stolen during transfer', |
|
90 | - 'default' => false, |
|
91 | - 'ui' => [ |
|
92 | - 'component' => 'checkbox', |
|
93 | - 'advanced' => true, |
|
94 | - 'display' => "option('wpc-api-version') >= 1" |
|
95 | - ] |
|
86 | + 'title' => 'Crypt API key in transfer', |
|
87 | + 'description' => |
|
88 | + 'If checked, the api key will be crypted in requests. ' . |
|
89 | + 'Crypting the api-key protects it from being stolen during transfer', |
|
90 | + 'default' => false, |
|
91 | + 'ui' => [ |
|
92 | + 'component' => 'checkbox', |
|
93 | + 'advanced' => true, |
|
94 | + 'display' => "option('wpc-api-version') >= 1" |
|
95 | + ] |
|
96 | 96 | ]], |
97 | 97 | ]); |
98 | 98 |
@@ -104,39 +104,39 @@ |
||
104 | 104 | ] |
105 | 105 | ]], |
106 | 106 | ['skip-these-precompiled-binaries', 'string', [ |
107 | - 'title' => 'Skip these precompiled binaries', |
|
108 | - 'description' => |
|
109 | - '', |
|
110 | - 'default' => '', |
|
111 | - 'ui' => [ |
|
112 | - 'component' => 'multi-select', |
|
113 | - 'advanced' => true, |
|
114 | - 'options' => $binariesForOS, |
|
115 | - 'display' => "option('cwebp-try-supplied-binary-for-os') == true" |
|
116 | - ] |
|
107 | + 'title' => 'Skip these precompiled binaries', |
|
108 | + 'description' => |
|
109 | + '', |
|
110 | + 'default' => '', |
|
111 | + 'ui' => [ |
|
112 | + 'component' => 'multi-select', |
|
113 | + 'advanced' => true, |
|
114 | + 'options' => $binariesForOS, |
|
115 | + 'display' => "option('cwebp-try-supplied-binary-for-os') == true" |
|
116 | + ] |
|
117 | 117 | |
118 | 118 | ]], |
119 | 119 | ['rel-path-to-precompiled-binaries', 'string', [ |
120 | - 'title' => 'Rel path to precompiled binaries', |
|
121 | - 'description' => |
|
122 | - '', |
|
123 | - 'default' => './Binaries', |
|
124 | - 'ui' => [ |
|
125 | - 'component' => '', |
|
126 | - 'advanced' => true, |
|
127 | - 'display' => "option('cwebp-try-supplied-binary-for-os') == true" |
|
128 | - ], |
|
129 | - 'sensitive' => true |
|
120 | + 'title' => 'Rel path to precompiled binaries', |
|
121 | + 'description' => |
|
122 | + '', |
|
123 | + 'default' => './Binaries', |
|
124 | + 'ui' => [ |
|
125 | + 'component' => '', |
|
126 | + 'advanced' => true, |
|
127 | + 'display' => "option('cwebp-try-supplied-binary-for-os') == true" |
|
128 | + ], |
|
129 | + 'sensitive' => true |
|
130 | 130 | ]], |
131 | 131 | ['command-line-options', 'string', [ |
132 | - 'title' => 'Command line options', |
|
133 | - 'description' => |
|
134 | - '', |
|
135 | - 'default' => '', |
|
136 | - 'ui' => [ |
|
137 | - 'component' => 'input', |
|
138 | - 'advanced' => true, |
|
139 | - ] |
|
132 | + 'title' => 'Command line options', |
|
133 | + 'description' => |
|
134 | + '', |
|
135 | + 'default' => '', |
|
136 | + 'ui' => [ |
|
137 | + 'component' => 'input', |
|
138 | + 'advanced' => true, |
|
139 | + ] |
|
140 | 140 | |
141 | 141 | ]], |
142 | 142 | ]); |
@@ -713,13 +713,13 @@ |
||
713 | 713 | |
714 | 714 | if (defined('WEBPCONVERT_CWEBP_PATH')) { |
715 | 715 | $this->logLn('WEBPCONVERT_CWEBP_PATH was defined, so using that path and ignoring any other'); |
716 | - return [[constant('WEBPCONVERT_CWEBP_PATH')],[[], []]]; |
|
716 | + return [[constant('WEBPCONVERT_CWEBP_PATH')], [[], []]]; |
|
717 | 717 | } |
718 | 718 | if (!empty(getenv('WEBPCONVERT_CWEBP_PATH'))) { |
719 | 719 | $this->logLn( |
720 | 720 | 'WEBPCONVERT_CWEBP_PATH environment variable was set, so using that path and ignoring any other' |
721 | 721 | ); |
722 | - return [[getenv('WEBPCONVERT_CWEBP_PATH')],[[], []]]; |
|
722 | + return [[getenv('WEBPCONVERT_CWEBP_PATH')], [[], []]]; |
|
723 | 723 | } |
724 | 724 | |
725 | 725 | if ($this->options['try-cwebp']) { |
@@ -178,8 +178,8 @@ discard block |
||
178 | 178 | 'minimum' => 0, |
179 | 179 | 'maximum' => 6, |
180 | 180 | 'ui' => [ |
181 | - 'component' => 'slider', |
|
182 | - 'advanced' => true, |
|
181 | + 'component' => 'slider', |
|
182 | + 'advanced' => true, |
|
183 | 183 | ] |
184 | 184 | ]], |
185 | 185 | ['sharp-yuv', 'boolean', [ |
@@ -483,17 +483,17 @@ discard block |
||
483 | 483 | } |
484 | 484 | |
485 | 485 | /** |
486 | - * Get unique option definitions. |
|
487 | - * |
|
488 | - * Gets definitions of the converters "unique" options (that is, those options that |
|
489 | - * are not general). It was added in order to give GUI's a way to automatically adjust |
|
490 | - * their setting screens. |
|
491 | - * |
|
492 | - * @param bool $filterOutOptionsWithoutUI If options without UI defined should be filtered out |
|
493 | - * @param string $imageType (png | jpeg) The image type - determines the defaults |
|
494 | - * |
|
495 | - * @return array Array of options definitions - ready to be json encoded, or whatever |
|
496 | - */ |
|
486 | + * Get unique option definitions. |
|
487 | + * |
|
488 | + * Gets definitions of the converters "unique" options (that is, those options that |
|
489 | + * are not general). It was added in order to give GUI's a way to automatically adjust |
|
490 | + * their setting screens. |
|
491 | + * |
|
492 | + * @param bool $filterOutOptionsWithoutUI If options without UI defined should be filtered out |
|
493 | + * @param string $imageType (png | jpeg) The image type - determines the defaults |
|
494 | + * |
|
495 | + * @return array Array of options definitions - ready to be json encoded, or whatever |
|
496 | + */ |
|
497 | 497 | public function getUniqueOptionDefinitions($filterOutOptionsWithoutUI = true, $imageType = 'jpeg') |
498 | 498 | { |
499 | 499 | $uniqueOptions = new Options(); |
@@ -552,16 +552,16 @@ discard block |
||
552 | 552 | return $generalOptionsArr; |
553 | 553 | } |
554 | 554 | |
555 | - /** |
|
556 | - * Get general option definitions. |
|
557 | - * |
|
558 | - * Gets definitions of the converters "general" options. (that is, those options that |
|
559 | - * It was added in order to give GUI's a way to automatically adjust their setting screens. |
|
560 | - * |
|
561 | - * @param string $imageType (png | jpeg) The image type - determines the defaults |
|
562 | - * |
|
563 | - * @return array Array of options definitions - ready to be json encoded, or whatever |
|
564 | - */ |
|
555 | + /** |
|
556 | + * Get general option definitions. |
|
557 | + * |
|
558 | + * Gets definitions of the converters "general" options. (that is, those options that |
|
559 | + * It was added in order to give GUI's a way to automatically adjust their setting screens. |
|
560 | + * |
|
561 | + * @param string $imageType (png | jpeg) The image type - determines the defaults |
|
562 | + * |
|
563 | + * @return array Array of options definitions - ready to be json encoded, or whatever |
|
564 | + */ |
|
565 | 565 | public function getSupportedGeneralOptionDefinitions($imageType = 'png') |
566 | 566 | { |
567 | 567 | $generalOptions = new Options(); |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | |
506 | 506 | $optionDefinitions = $uniqueOptions->getDefinitions(); |
507 | 507 | if ($filterOutOptionsWithoutUI) { |
508 | - $optionDefinitions = array_filter($optionDefinitions, function ($value) { |
|
508 | + $optionDefinitions = array_filter($optionDefinitions, function($value) { |
|
509 | 509 | return !is_null($value['ui']); |
510 | 510 | }); |
511 | 511 | $optionDefinitions = array_values($optionDefinitions); // re-index |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | //$generalOptions->setUI($this->getUIForGeneralOptions($imageType)); |
532 | 532 | $optionDefinitions = $generalOptions->getDefinitions(); |
533 | 533 | if ($filterOutOptionsWithoutUI) { |
534 | - $optionDefinitions = array_filter($optionDefinitions, function ($value) { |
|
534 | + $optionDefinitions = array_filter($optionDefinitions, function($value) { |
|
535 | 535 | return !is_null($value['ui']); |
536 | 536 | }); |
537 | 537 | $optionDefinitions = array_values($optionDefinitions); // re-index |