Bläddra i källkod

use npx, fix lint etc.

Mike L 3 år sedan
förälder
incheckning
d5250d993e
6 ändrade filer med 11 tillägg och 12 borttagningar
  1. 2 2
      dist/gifski.js
  2. 1 1
      dist/webshot.js
  3. 2 2
      package.json
  4. 5 5
      src/gifski.ts
  5. 1 1
      src/webshot.ts
  6. 0 1
      tslint.json

+ 2 - 2
dist/gifski.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 const temp = require("temp");
 const loggers_1 = require("./loggers");
-const fs_1 = require("fs");
 const logger = loggers_1.getLogger('gifski');
 function default_1(data) {
     const outputFilePath = temp.path({ suffix: '.gif' });
@@ -21,7 +21,7 @@ function default_1(data) {
             '80',
             '-o',
             outputFilePath,
-            inputFile.path
+            inputFile.path,
         ];
         logger.info(` gifski ${args.join(' ')}`);
         const gifskiInvocation = child_process_1.spawnSync('gifski', args, { encoding: 'utf8', timeout: 90000 });

+ 1 - 1
dist/webshot.js

@@ -44,7 +44,7 @@ class Webshot extends CallableInstance {
         this.renderWebshot = (url, height, webshotDelay) => {
             const jpeg = (data) => data.pipe(sharp()).jpeg({ quality: 90, trellisQuantisation: true });
             const sharpToBase64 = (pic) => new Promise(resolve => {
-                pic.toBuffer().then(buffer => resolve(`data:image/jpg;base64,${buffer.toString('base64')}`));
+                pic.toBuffer().then(buffer => resolve(`data:image/jpeg;base64,${buffer.toString('base64')}`));
             });
             const promise = new Promise((resolve, reject) => {
                 const width = 720;

+ 2 - 2
package.json

@@ -26,8 +26,8 @@
   },
   "homepage": "https://github.com/CL-Jeremy/mirai-twitter-bot",
   "scripts": {
-    "build": "rm -rf dist && tsc --outDir dist",
-    "lint": "tslint --fix -c tslint.json --project ./"
+    "build": "rm -rf dist && npx tsc --outDir dist",
+    "lint": "npx tslint --fix -c tslint.json --project ./"
   },
   "dependencies": {
     "callable-instance": "^2.0.0",

+ 5 - 5
src/gifski.ts

@@ -1,8 +1,8 @@
 import { spawnSync } from 'child_process';
+import { closeSync, readFileSync, writeSync } from 'fs';
 import * as temp from 'temp';
 
 import { getLogger } from './loggers';
-import { readFileSync, writeSync, closeSync } from 'fs';
 
 const logger = getLogger('gifski');
 
@@ -13,7 +13,7 @@ export default function (data: ArrayBuffer) {
       const inputFile = temp.openSync();
       writeSync(inputFile.fd, Buffer.from(data));
       closeSync(inputFile.fd);
-      logger.info(`saved video file to ${inputFile.path}, starting gif conversion...`)
+      logger.info(`saved video file to ${inputFile.path}, starting gif conversion...`);
       const args = [
         '--fps',
         '12.5',
@@ -22,15 +22,15 @@ export default function (data: ArrayBuffer) {
         '80',
         '-o',
         outputFilePath,
-        inputFile.path
+        inputFile.path,
       ];
       logger.info(` gifski ${args.join(' ')}`);
       const gifskiInvocation = spawnSync('gifski', args, {encoding: 'utf8', timeout: 90000});
       if (gifskiInvocation.stderr) throw Error(gifskiInvocation.stderr);
-      logger.info(`gif conversion succeeded, file path: ${outputFilePath}`)
+      logger.info(`gif conversion succeeded, file path: ${outputFilePath}`);
       return readFileSync(outputFilePath).buffer;
     } catch (error) {
       logger.error('error converting video to gif' + error ? `message: ${error}` : '');
       throw Error('error converting video to gif');
     }
-}
+}

+ 1 - 1
src/webshot.ts

@@ -65,7 +65,7 @@ extends CallableInstance<
   private renderWebshot = (url: string, height: number, webshotDelay: number): Promise<string> => {
     const jpeg = (data: Readable) => data.pipe(sharp()).jpeg({quality: 90, trellisQuantisation: true});
     const sharpToBase64 = (pic: sharp.Sharp) => new Promise<string>(resolve => {
-      pic.toBuffer().then(buffer => resolve(`data:image/jpg;base64,${buffer.toString('base64')}`));
+      pic.toBuffer().then(buffer => resolve(`data:image/jpeg;base64,${buffer.toString('base64')}`));
     });
     const promise = new Promise<{ base64: string, boundary: null | number }>((resolve, reject) => {
       const width = 720;

+ 0 - 1
tslint.json

@@ -24,7 +24,6 @@
     "comment-format": [true, "check-lowercase", {"ignore-words": ["TODO", "HACK", "BUG"]}],
     "no-require-imports": true,
     "no-var-requires": false,
-    "no-unused-variable": true,
     "no-bitwise": false,
     "prefer-const": true,
     "prefer-method-signature": true,