this put console output into its own function

This commit is contained in:
Marcel Nowicki
2022-02-10 21:18:44 +01:00
parent 3b2e3aa2ff
commit bf6f224a23
3 changed files with 22 additions and 6 deletions

View File

@@ -15,7 +15,7 @@ int main(int argc, char** argv) {
// GENERAL VARIABLES
//count the types of all items
std::map<std::string, uint> typecount{
std::map<std::string, uintmax_t> typecount{
{tarconstant::typeFile, 0}, {tarconstant::typeDir, 0}, {tarconstant::typeSym, 0},
{tarconstant::typeHard, 0}, {tarconstant::typeOther, 0}
};
@@ -30,6 +30,10 @@ int main(int argc, char** argv) {
// Getting name from argument lists on startup. Trivial and errorprone. Placeholder for now.
std::string archiveFilename(argv[1]);
for (int i = 0; i < argc; i++){
std::cout << argv[i] << '\n';
}
//Open tar File.
std::ifstream file(archiveFilename, std::ios::binary);
if(!file) {
@@ -70,11 +74,9 @@ int main(int argc, char** argv) {
delete[] headbuffer;
}
file.close();
std::cout << "Archive size: " << std::filesystem::file_size(archiveFilename) << " Bytes"<< '\n';
std::cout << "Size of all items: " << sizeof_allfiles << " Bytes" << '\n' << '\n';
for (auto &i : typecount) {
std::cout << i.first <<": " << i.second << '\n';
}
tar::consolestats(typecount, std::filesystem::file_size(archiveFilename), sizeof_allfiles);
return 0;
}

View File

@@ -7,6 +7,8 @@
#include "tarconst.h"
#include <string>
#include <cmath>
#include <iostream>
#include <map>
// checks if a valid modern tar file - ustar
bool tar::validTar(std::istream &file) {
@@ -58,3 +60,11 @@ std::string tar::getitemtype(char &n) {
return tarconstant::typeOther;
}
}
void tar::consolestats (std::map<std::string, uintmax_t> &typecount, uintmax_t tarfilesize, uintmax_t sizeofall) {
std::cout << "Archive size: " << tarfilesize << " Bytes"<< '\n';
std::cout << "Size of all items: " << sizeofall << " Bytes" << '\n' << '\n';
for (auto &i : typecount) {
std::cout << i.first <<": " << i.second << '\n';
}
}

View File

@@ -4,6 +4,8 @@
*/
#include <fstream>
#include <map>
#include <string>
#ifndef TARSTATS___TARFUNC_H
@@ -20,6 +22,8 @@ namespace tar {
// gets type of an item
std::string getitemtype(char &n);
//
void consolestats (std::map<std::string, uintmax_t> &typecount, uintmax_t tarfilesize, uintmax_t sizeofall);
}