Ponysay

Dodano funkcję do wyświetlania kucyków używając ponysay

Oryginalny ponysay wyświetlał błąd opisany w
erkin/ponysay#314
Więc ponysay brany jest z
https://github.com/Tonyl314/ponysay

flake.nix

@@ -1,15 +1,20 @@
 {
 	inputs = {
 		nixpkgs.url = "github:nixos/nixpkgs";
+		customPonysay = {
+			url = "github:Tonyl314/ponysay";
+			flake = false;
+		};
 	};
 
 	outputs =
-	{ nixpkgs, self }:
+	{ nixpkgs, customPonysay, self }:
 	let
 		pkgs = nixpkgs.legacyPackages.x86_64-linux;
+		libs = import ./nix/libs.nix { inherit pkgs customPonysay; };
 	in
 	{
-		devShells.x86_64-linux.default = (import ./nix/shell.nix) { inherit pkgs; };
-		apps.x86_64-linux.default = (import ./nix/app.nix) { inherit pkgs; };
+		devShells.x86_64-linux.default = (import ./nix/shell.nix) { inherit pkgs libs;  };
+		apps.x86_64-linux.default = (import ./nix/app.nix) { inherit pkgs libs; };
 	};
 }

nix/app.nix

@@ -1,7 +1,5 @@
-{ pkgs }:
+{ pkgs, libs }:
 let
-	libs = import ./libs.nix { inherit pkgs; };
-
 	package =
 	pkgs.stdenv.mkDerivation {
 		name = "pony";

nix/libs.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, customPonysay }:
 {
 	nativeBuildInputs =
 	with pkgs; [
@@ -11,6 +11,10 @@
 
 	buildInputs =
 	with pkgs; [
-		sqlite
+		#ponysay # BROKEN
+		# Fix for this issue: https://github.com/erkin/ponysay/issues/314
+		(ponysay.overrideAttrs {
+			src = customPonysay;
+		})
 	];
 }

nix/shell.nix

@@ -1,7 +1,4 @@
-{ pkgs }:
-let
-	libs = import ./libs.nix { inherit pkgs; };
-in
+{ pkgs, libs }:
 pkgs.mkShell {
-	nativeBuildInputs = libs.nativeBuildInputs;
+	nativeBuildInputs = libs.nativeBuildInputs ++ libs.buildInputs;
 }

src/app.cpp

@@ -7,6 +7,7 @@
 #include "db/db-connection.h"
 #include "db/pony-loader.h"
 #include "db/pony-saver.h"
+#include "tui/ponysay.h"
 
 std::string load_scheme() {
 	std::ifstream ifs("sql/make_scheme.sql");
@@ -16,6 +17,8 @@ std::string load_scheme() {
 }
 
 int main() {
+	ponysay("pinkiepie");
+
 	DbConnection db = open_db("file:pony.db");
 
 	sqlite3_exec(*db, load_scheme().c_str(), nullptr, nullptr, nullptr);

src/tui/ponysay.cpp

@@ -0,0 +1,10 @@
+#include "ponysay.h"
+
+#include <iostream>
+
+#include "../util.h"
+
+void ponysay(const std::string& pony_name) {
+	std::string cmd = "ponysay -o -f " + pony_name;
+	std::cout << exec(cmd);
+}

src/tui/ponysay.h

@@ -0,0 +1,4 @@
+#pragma once
+#include <string>
+
+void ponysay(const std::string& pony_name);

src/util.cpp

@@ -0,0 +1,21 @@
+#include "util.h"
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <array>
+
+std::string exec(const std::string& cmd) {
+    std::array<char, 128> buffer;
+    std::string result;
+    std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+    if (!pipe) {
+        throw std::runtime_error("popen() failed!");
+    }
+    while (fgets(buffer.data(), static_cast<int>(buffer.size()), pipe.get()) != nullptr) {
+        result += buffer.data();
+    }
+    return result;
+}

src/util.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <string>
+
+// Run linux command and return the stdout
+std::string exec(const std::string& cmd);