Merge pull request #70 from TanmayPatil105/getopt

Added getopt

Author: TanmayPatil105

src/fetch.cpp

@@ -408,15 +408,22 @@ string getPackages()
 /**
  * @param art
  */
-void print_process(string art)
+void print_process(string art,string color_name)
 {
     string color;
     string path = "/usr/share/procfetch/ascii/" + art;
     fstream fptr;
     fptr.open(path, ios::in);
     string txt;
     getline(fptr, txt);
-    color = getColor(txt);
+    if (color_name == "def")
+    {
+        color = getColor(txt);
+    }
+    else{
+        transform(color_name.begin(),color_name.end(),color_name.begin(),::toupper);
+        color=getColor(color_name);
+    }
     cout << color << endl;
     while (fptr)
     {
@@ -429,9 +436,14 @@ void print_process(string art)
 /**
  * Utility to print ascii art of Distro
  */
-void print()
+void print(string color_name,string distro_name)
 {
-    string os = getOS("/etc/os-release");
+    string os = distro_name;
+
+    if (distro_name == "def")
+    {
+        os = getOS("/etc/os-release");
+    }
 
     map<string, string> ascii_arts = {{"Ubuntu", "ubuntu.ascii"},
                                       {"Debian", "debian.ascii"},
@@ -470,8 +482,12 @@ void print()
     {
         if (os.find(key) != string::npos)
         {
-            print_process(value);
+            print_process(value,color_name);
             return;
         }
     }
+
+    print_process("linux.ascii",color_name);
+    
+    return;
 }

src/fetch.h

@@ -13,6 +13,7 @@
 #include <string>
 #include <unistd.h>
 #include <vector>
+#include <cctype>
 
 using namespace std;
 
@@ -54,7 +55,7 @@ vector<string> getGPU();
 
 string getPackages();
 
-void print();
+void print(string color,string distro_name);
 
 // util.cpp
 

src/main.cpp

@@ -4,23 +4,62 @@
 #include "color.h"
 #include "fetch.h"
 
+void DisplayInfo();
+
 /**
  * @returns
  * @param argc
  * @param argv
  */
 int main(int argc, char *argv[])
 {
-    if (argc == 2 && !"-t"s.compare(argv[1]))
-    {
+    bool test_mode = false;
+    string color_name = "def"s;
+    string distro_name = "def"s;
+
+    int opt;
+    while((opt = getopt(argc, argv, "ta:d:")) != -1) 
+    { 
+        switch(opt) 
+        { 
+            case 't':
+                test_mode = true;
+                break;
+            case 'a':
+                color_name = string(optarg);
+                break;
+            case 'd':
+                distro_name = string(optarg);
+                break;
+            default:
+                return 1;
+        }
+    }
+
+    if (test_mode) {
         test_util();
         cout << "========================"s << endl
              << " All unit tests passed. "s << endl
              << "========================"s << endl;
         return 0;
     }
 
-    print();
+    if (optind != argc) {
+        cout << "Error: "s << argv[0] << ": unknown argument: "s << argv[optind] << endl;
+        return 1;
+    }
+
+    print(color_name,distro_name);
+    DisplayInfo();
+
+    return 0;
+}
+
+/**
+ * @returns Displays Info
+ */
+void DisplayInfo()
+{
     string user = getuser();
     string hostname = gethostname("/etc/hostname");
     string username = YELLOW + user + RESET + "@" + YELLOW + hostname;
@@ -63,5 +102,4 @@ int main(int argc, char *argv[])
     string pkg = getPackages();
     cout << BRIGHT << GREEN << "Packages : " << RESET << pkg << endl;
     cout << endl;
-    return 0;
 }