ft: added centering flag

Cargo.toml

@@ -11,5 +11,5 @@ dotenvy = "0.15.*"
 log = "0.4.*"
 clap = { version = "4.1.*", features = ["derive"] }
 image = { version = "0.24.*", features = ["webp-encoder"] }
-#termion = "2.0.*"
 crossterm = "0.26.*"
+

LICENSE

@@ -1,21 +1,339 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Copyright (c) 2023 Djairo
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

src/ascii_manipulation.rs

@@ -1,8 +1,9 @@
 //! This module contains all functions related to converting images to ASCII.
-use std::process::exit;
+use crate::image_manipulation::get_terminal_size;
+use crate::model_rgb_ascii::Ascii;
 use image::{DynamicImage, GenericImageView, Rgba};
 use log::error;
-use crate::model_rgb_ascii::Ascii;
+use std::process::exit;
 
 /// This constant is used to calculate braille values.
 const BRAILLE_TABLE: [[u8; 2]; 4] = [[1u8, 8u8], [2u8, 16u8], [4u8, 32u8], [64u8, 128u8]];
@@ -22,6 +23,25 @@ fn get_color(pixel: Rgba<u8>) -> u8 {
     (pixel[0] as f32 * 0.3 + pixel[1] as f32 * 0.59 + pixel[2] as f32 * 0.11) as u8
 }
 
+/// This function returns the empty space on either side of the ascii, relative to the terminal
+/// width.
+///
+/// arguments:
+/// ascii: &Vec<Vec<Ascii>> - ascii image to calculate margins for
+///
+/// returns:
+/// u32 representing the size of one margin (i.e. the empty space that should be prefixed to center
+/// the ascii)
+pub fn calc_margin(ascii: &Vec<Vec<Ascii>>) -> u32 {
+    let (max_w, _) = get_terminal_size();
+    let w = ascii[0].len() as u32; // Assume all lines have same length.
+    if w < max_w {
+        return (max_w - w) / 2 as u32;
+    } else {
+        return 0;
+    }
+}
+
 /// This function converts a given image into ASCII.
 ///
 /// arguments:
@@ -37,11 +57,11 @@ fn to_ascii(char_map: String, image: DynamicImage) -> Vec<Vec<Ascii>> {
 
     for pixel in image.pixels() {
         let mut ascii = Ascii::new(0, pixel.2[0], pixel.2[1], pixel.2[2]);
-        let ch = char_map.as_bytes()[((ascii.col_depth as f32-1.0)/255f32 * l) as usize];
+        let ch = char_map.as_bytes()[((ascii.col_depth as f32 - 1.0) / 255f32 * l) as usize];
         ascii.char = char::from(ch);
         str.push(ascii);
 
-        if pixel.0 == image.width()-1 {
+        if pixel.0 == image.width() - 1 {
             out.push(str);
             str = Vec::new();
         }
@@ -72,7 +92,10 @@ pub fn to_simple_ascii(image: DynamicImage) -> Vec<Vec<Ascii>> {
 /// returns:
 /// Vec<Vec<Ascii>> containing the converted image
 pub fn to_complex_ascii(image: DynamicImage) -> Vec<Vec<Ascii>> {
-    to_ascii(" .'`^\",:;Il!i><~+_-?][}{1)(|\\/tfjrxnuvczXYUJCLQ0OZmwqpdbkhao*#MW&8%B@$".to_owned(), image)
+    to_ascii(
+        " .'`^\",:;Il!i><~+_-?][}{1)(|\\/tfjrxnuvczXYUJCLQ0OZmwqpdbkhao*#MW&8%B@$".to_owned(),
+        image,
+    )
 }
 
 /// This wrapper function converts an image to custom ASCII.
@@ -109,17 +132,22 @@ pub fn to_braille_ascii(image: DynamicImage, threshold: u8) -> Vec<Vec<Ascii>> {
             let mut braille_value: u32 = 10240;
             for nx in 0..2 {
                 for ny in 0..4 {
-                    let pixel = image.get_pixel(x+nx, y+ny);
-                    r = r+pixel[0] as u16;
-                    g = g+pixel[1] as u16;
-                    b = b+pixel[2] as u16;
+                    let pixel = image.get_pixel(x + nx, y + ny);
+                    r = r + pixel[0] as u16;
+                    g = g + pixel[1] as u16;
+                    b = b + pixel[2] as u16;
                     if get_color(pixel) >= threshold {
                         braille_value += BRAILLE_TABLE[ny as usize][nx as usize] as u32;
                     }
                 }
             }
-            str.push(Ascii::new_with_char(char::from_u32(braille_value).unwrap(), (r/8) as u8, (g/8) as u8,  (b/8) as u8));
-            }
+            str.push(Ascii::new_with_char(
+                char::from_u32(braille_value).unwrap(),
+                (r / 8) as u8,
+                (g / 8) as u8,
+                (b / 8) as u8,
+            ));
+        }
         out.push(str);
         str = Vec::new();
     }

src/cli.rs

@@ -1,17 +1,22 @@
 //! This module contains all functions related to the CLI part of the program.
 //!
 //! It manages and validates flags, mostly.
+use clap::Parser;
+use log::{debug, error};
 use std::ffi::OsString;
 use std::path::PathBuf;
 use std::process::exit;
-use clap::Parser;
-use log::{debug, error};
 
 /// Convert an image to ASCII art and print it to the terminal.
 ///
 /// Configuration is done using flags.
 #[derive(Parser)]
 pub struct Cli {
+    /// Center the output in terminal.
+    ///
+    /// Incompatible with '--output'
+    #[arg(short = 'm', long)]
+    pub center: bool,
     /// Use a larger range of characters
     ///
     /// Takes priority over '--map'
@@ -30,7 +35,7 @@ pub struct Cli {
     /// Display ASCII art in grayscale
     ///
     /// incompatible with '--color'
-    #[arg(short= 'g', long)]
+    #[arg(short = 'g', long)]
     pub grayscale: bool,
     /// Use braille characters instead of ASCII
     ///
@@ -66,12 +71,12 @@ pub struct Cli {
     pub output: Option<PathBuf>,
 }
 
-
 impl Cli {
     /// This function prints all parts of Cli.
     ///
     /// used for debugging.
     pub fn debug_print(&self) {
+        debug!("center: {}", self.center);
         debug!("complex: {}", self.complex);
         debug!("colour: {}", self.colour);
         debug!("background: {}", self.background);
@@ -128,7 +133,9 @@ impl Cli {
 
     /// This function initializes logging (dependent on cli.debug flag)
     pub fn init(&self) {
-        if self.debug {std::env::set_var("RUST_LOG", "trace")}
+        if self.debug {
+            std::env::set_var("RUST_LOG", "trace")
+        }
         env_logger::init();
         self.debug_print();
     }
@@ -144,14 +151,14 @@ impl Cli {
 fn is_image(path: &PathBuf) -> bool {
     let ext = path.extension();
     match ext {
-        Some(ext) => {
-            vec![OsString::from("png"),
-                 OsString::from("jpg"),
-                 OsString::from("jpeg"),
-                 OsString::from("webp")]
-                .contains(&ext.to_ascii_lowercase())
-        }
-        None => false
+        Some(ext) => vec![
+            OsString::from("png"),
+            OsString::from("jpg"),
+            OsString::from("jpeg"),
+            OsString::from("webp"),
+        ]
+        .contains(&ext.to_ascii_lowercase()),
+        None => false,
     }
 }
 

src/image_manipulation.rs

@@ -1,21 +1,19 @@
 //! This module contains all functions related to image manipulation.
 use crossterm::terminal;
-use log::{debug, error};
-use std::process::exit;
-use std::path::PathBuf;
-use image::DynamicImage;
 use image::imageops::FilterType;
+use image::DynamicImage;
+use log::{debug, error};
+use std::path::PathBuf;
+use std::process::exit;
 
 /// This function returns the (width, length) of stdout
 ///
 /// returns:
 /// (u32, u32) representing the (width, length) of stdout
-fn get_terminal_size() -> (u32, u32) {
+pub(crate) fn get_terminal_size() -> (u32, u32) {
     let size = terminal::size();
     match size {
-        Ok(size) => {
-            (size.0 as u32, size.1 as u32)
-        }
+        Ok(size) => (size.0 as u32, size.1 as u32),
         Err(e) => {
             error!("Failed to get terminal size: {}", e.to_string());
             exit(1);
@@ -35,22 +33,27 @@ fn get_terminal_size() -> (u32, u32) {
 ///
 /// returns:
 /// DynamicImage, resized
-pub fn resize_image(img: DynamicImage, full: bool, braille: bool, opt_w: Option<u32>) -> DynamicImage {
+pub fn resize_image(
+    img: DynamicImage,
+    full: bool,
+    braille: bool,
+    opt_w: Option<u32>,
+) -> DynamicImage {
     //compiler complains that these v values are never read; this is true, however they are necessary because otherwise the program simply will not compile.
-    let (mut w, mut h) = (1,1);
+    let (mut w, mut h) = (1, 1);
     let (max_w, max_h) = get_terminal_size();
     if full {
-        w = max_w-1;
+        w = max_w - 1;
         h = (img.height() as f32 * w as f32 / img.width() as f32 * 0.5) as u32;
     } else if let Some(act_w) = opt_w {
         w = act_w;
         h = (img.height() as f32 * w as f32 / img.width() as f32 * 0.5) as u32;
     } else {
-        h = max_h-1;
+        h = max_h - 1;
         w = (img.width() as f32 * h as f32 / img.height() as f32 * 2.0) as u32;
 
         if w >= max_w {
-            w = max_w-1;
+            w = max_w - 1;
             h = (img.height() as f32 * w as f32 / img.width() as f32 * 0.5) as u32;
         }
     }

src/main.rs

@@ -1,18 +1,17 @@
 //! Driver module.
-#![feature(file_create_new)]
 
-use clap::Parser;
 use crate::ascii_manipulation::*;
 use crate::cli::Cli;
-use crate::output::*;
 use crate::image_manipulation::*;
 use crate::model_rgb_ascii::Ascii;
+use crate::output::*;
+use clap::Parser;
 
+mod ascii_manipulation;
 mod cli;
 mod image_manipulation;
-mod ascii_manipulation;
-mod output;
 mod model_rgb_ascii;
+mod output;
 
 /// This is the main function.
 ///
@@ -45,10 +44,16 @@ fn main() {
     if let Some(output) = cli.output {
         print_file(out, output);
     } else {
-        if cli.background && (cli.colour || cli.grayscale) {
-            print_terminal_background(out, cli.colour, cli.grayscale);
+        let prefix;
+        if cli.center {
+            prefix = calc_margin(&out);
         } else {
-            print_terminal(out, cli.colour, cli.grayscale);
+            prefix = 0;
+        }
+        if cli.background && (cli.colour || cli.grayscale) {
+            print_terminal_background(out, cli.colour, cli.grayscale, prefix);
+        } else {
+            print_terminal(out, cli.colour, cli.grayscale, prefix);
         }
     }
 }

src/output.rs

@@ -1,12 +1,12 @@
 //! This module contains functions related to output.
+use crate::model_rgb_ascii::Ascii;
+use crossterm::execute;
+use crossterm::style::{Color, Print, ResetColor, SetBackgroundColor, SetForegroundColor};
+use log::error;
 use std::fs::File;
 use std::io::{stdout, Write};
 use std::path::PathBuf;
 use std::process::exit;
-use crossterm::execute;
-use crossterm::style::{Color, SetForegroundColor, SetBackgroundColor, Print, ResetColor};
-use log::error;
-use crate::model_rgb_ascii::Ascii;
 
 /// This function prints ASCII art to stdout.
 ///
@@ -14,19 +14,34 @@ use crate::model_rgb_ascii::Ascii;
 /// art: Vec<Vec<Ascii>> - vector of vectors representing the art
 /// in_colour: bool - whether to print in colour or as hard white
 /// grayscale: bool - whether to print grayscale
-pub fn print_terminal(art: Vec<Vec<Ascii>>, in_colour: bool, grayscale: bool) {
+/// prefix: u32 - number of empty spaces to prepend to each line
+pub fn print_terminal(art: Vec<Vec<Ascii>>, in_colour: bool, grayscale: bool, prefix: u32) {
+    let prefix_str = " ".repeat(prefix as usize);
     for line in art {
+        let _ = execute!(stdout(), Print(prefix_str.clone()));
         for ascii in line {
             if in_colour {
-                let _ = execute!(stdout(),
-                    SetForegroundColor(Color::Rgb {r: ascii.rgb[0], g: ascii.rgb[1], b: ascii.rgb[2]}),
+                let _ = execute!(
+                    stdout(),
+                    SetForegroundColor(Color::Rgb {
+                        r: ascii.rgb[0],
+                        g: ascii.rgb[1],
+                        b: ascii.rgb[2]
+                    }),
                     Print(ascii.char),
-                    ResetColor);
+                    ResetColor
+                );
             } else if grayscale {
-                let _ = execute!(stdout(),
-                    SetForegroundColor(Color::Rgb {r: ascii.col_depth, g: ascii.col_depth, b: ascii.col_depth}),
+                let _ = execute!(
+                    stdout(),
+                    SetForegroundColor(Color::Rgb {
+                        r: ascii.col_depth,
+                        g: ascii.col_depth,
+                        b: ascii.col_depth
+                    }),
                     Print(ascii.char),
-                    ResetColor);
+                    ResetColor
+                );
             } else {
                 print!("{}", ascii.char);
             }
@@ -41,21 +56,49 @@ pub fn print_terminal(art: Vec<Vec<Ascii>>, in_colour: bool, grayscale: bool) {
 /// art: Vec<Vec<Ascii>> - vector of vectors representing the art
 /// in_colour: bool - whether to print in colour
 /// grayscale: bool - whether to print grayscale
-pub fn print_terminal_background(art: Vec<Vec<Ascii>>, in_colour: bool, grayscale: bool) {
+/// prefix: u32 - number of empty spaces to prepend to each line
+pub fn print_terminal_background(
+    art: Vec<Vec<Ascii>>,
+    in_colour: bool,
+    grayscale: bool,
+    prefix: u32,
+) {
+    let prefix_str = " ".repeat(prefix as usize);
     for line in art {
+        let _ = execute!(stdout(), Print(prefix_str.clone()));
         for ascii in line {
             if in_colour {
-                let _ = execute!(stdout(),
-                    SetBackgroundColor(Color::Rgb {r: ascii.rgb[0], g: ascii.rgb[1], b: ascii.rgb[2]}),
-                    SetForegroundColor(Color::Rgb {r: 255-ascii.rgb[0], g: 255-ascii.rgb[1], b: 255-ascii.rgb[2]}),
+                let _ = execute!(
+                    stdout(),
+                    SetBackgroundColor(Color::Rgb {
+                        r: ascii.rgb[0],
+                        g: ascii.rgb[1],
+                        b: ascii.rgb[2]
+                    }),
+                    SetForegroundColor(Color::Rgb {
+                        r: 255 - ascii.rgb[0],
+                        g: 255 - ascii.rgb[1],
+                        b: 255 - ascii.rgb[2]
+                    }),
                     Print(ascii.char),
-                    ResetColor);
+                    ResetColor
+                );
             } else if grayscale {
-                let _ = execute!(stdout(),
-                    SetBackgroundColor(Color::Rgb {r: ascii.col_depth, g: ascii.col_depth, b: ascii.col_depth}),
-                    SetForegroundColor(Color::Rgb {r: 255-ascii.col_depth, g: 255-ascii.col_depth, b: 255-ascii.col_depth}),
+                let _ = execute!(
+                    stdout(),
+                    SetBackgroundColor(Color::Rgb {
+                        r: ascii.col_depth,
+                        g: ascii.col_depth,
+                        b: ascii.col_depth
+                    }),
+                    SetForegroundColor(Color::Rgb {
+                        r: 255 - ascii.col_depth,
+                        g: 255 - ascii.col_depth,
+                        b: 255 - ascii.col_depth
+                    }),
                     Print(ascii.char),
-                    ResetColor);
+                    ResetColor
+                );
             } else {
                 error!("This should be unreachable!");
                 exit(1);