Unverified Commit 62db8799 authored by Hong Minhee's avatar Hong Minhee
Browse files

Merge pull request #282 from dodok8/dodok8-fix-issue168

parents 0fe7009b ed118dc2

CHANGES.md

+6 −0
Original line number Diff line number Diff line
@@ -56,10 +56,16 @@ To be released. 
     -  The `--allow-private-address` or `-p` option allows looking up

        WebFinger information for private addresses (e.g., `localhost`).



  -  Fixed a bug where the `fedify node` command had failed to correctly

     render the favicon in terminal emulators that do not support 24-bit

     colors.  [[#168], [#282] by Hyeonseo Kim]



[#168]: https://github.com/fedify-dev/fedify/issues/168

[#248]: https://github.com/fedify-dev/fedify/issues/248

[#260]: https://github.com/fedify-dev/fedify/issues/260

[#278]: https://github.com/fedify-dev/fedify/pull/278

[#281]: https://github.com/fedify-dev/fedify/pull/281

[#282]: https://github.com/fedify-dev/fedify/pull/282





Version 1.7.3

cli/node.ts

+47 −3
Original line number Diff line number Diff line
@@ -98,7 +98,9 @@ export const command = new Command() 
            buffer = images[0].buffer;

          }

          const image = await Jimp.read(buffer);

          layout = getAsciiArt(image).split("\n").map((line) => ` ${line}  `);

          const trueColorSupport = checkTerminalTrueColorSupport();

          layout = getAsciiArt(image, DEFAULT_IMAGE_WIDTH, trueColorSupport)

            .split("\n").map((line) => ` ${line}  `);

          defaultWidth = 41;

        } else {

          logger.error(
@@ -256,14 +258,50 @@ const Jimp = createJimp({ 
  plugins: defaultPlugins,

});



function checkTerminalTrueColorSupport() {

  const colorTerm = Deno.env.get("COLORTERM");



  if (

    colorTerm == null ||

    !(colorTerm.includes("24bit") || colorTerm.includes("truecolor"))

  ) {

    return false;

  }

  return true;

}



const DEFAULT_IMAGE_WIDTH = 38;



const ASCII_CHARS =

  // cSpell: disable

  "█▓▒░@#B8&WM%*oahkbdpqwmZO0QLCJUYXzcvunxrjft/\\|()1{}[]?-_+~<>i!lI;:,\"^`'. ";

// cSpell: enable



function rgbTo256Color(r: number, g: number, b: number): number {

  // Handle grayscale colors (colors 232-255)

  const gray = Math.round((r + g + b) / 3);

  if (

    Math.abs(r - gray) < 10 && Math.abs(g - gray) < 10 &&

    Math.abs(b - gray) < 10

  ) {

    if (gray < 8) return 16; // Black

    if (gray > 248) return 231; // White

    return Math.round(((gray - 8) / 240) * 23) + 232;

  }



  // Handle RGB colors (colors 16-231)

  // Convert to 6x6x6 cube

  const r6 = Math.round((r / 255) * 5);

  const g6 = Math.round((g / 255) * 5);

  const b6 = Math.round((b / 255) * 5);



  return 16 + (36 * r6) + (6 * g6) + b6;

}



function getAsciiArt(

  image: Awaited<ReturnType<typeof Jimp.read>>,

  width = 38,

  width = DEFAULT_IMAGE_WIDTH,

  trueColorSupport: boolean,

): string {

  const ratio = image.width / image.height;

  const height = Math.round(
@@ -284,7 +322,13 @@ function getAsciiArt( 
        (brightness / 255) * (ASCII_CHARS.length - 1),

      );

      const char = ASCII_CHARS[charIndex];



      if (trueColorSupport) {

        art += colors.rgb24(char, color);

      } else {

        const colorIndex = rgbTo256Color(color.r, color.g, color.b);

        art += colors.rgb8(char, colorIndex);

      }

    }

    if (y < height - 1) art += "\n";

  }

logo.svg

+171 −141

File changed.

Preview size limit exceeded, changes collapsed.