Command line config file download util

Makedefs

@@ -6,17 +6,17 @@
 
 LD = $(CXX)
 
-CFLAGS += -Wall -Wextra -O3
-CXXFLAGS += -Wall -Wextra -O3
-
+#CFLAGS += -Wall -Wextra -O3
+#CXXFLAGS += -Wall -Wextra -O3
 #Comment the above two lines and uncomment the below three lines to compile with debug symbols.
 
 #CFLAGS += -Wall -Wextra -O0 -g -fsanitize=address -fno-omit-frame-pointer
 #CXXFLAGS += -Wall -Wextra -O0 -g -fsanitize=address -fno-omit-frame-pointer
 
-#If you don't care for library address sanitiser, uncomment below for debugging
-#CFLAGS += -Wall -Wextra -O0 -g
-#CXXFLAGS += -Wall -Wextra -O0 -g
+#Library address sanitiser is not available for mingw64. This applies to msys2.
+#Uncomment below lines, and comment above lines, for plain debug symbols.
+CFLAGS += -Wall -Wextra -O0 -g
+CXXFLAGS += -Wall -Wextra -O0 -g
 
 CPPFLAGS += -I../shared
 

fetchconfig/Makefile

@@ -14,7 +14,6 @@ ifneq ($(OS),Windows_NT)
 LDLIBS += -lstdc++ -lm `pkg-config --libs ncursesw`
 else
 LDLIBS += -lws2_32 -lstdc++ -lpdcursesw -lintl
-#LDLIBS:=$(filter-out -mwindows,$(LDLIBS))
 endif
 
 CPPFLAGS += -Iinclude -std=c++11

fetchconfig/configDownload.cpp

@@ -142,15 +142,6 @@ ManualConfigDownload::ManualConfigDownload() : ConfigDownload(stdscr, newWinData
     screen       = newwin(winData->height, winData->width, winData->startY, winData->startX);
     winData->win = screen;
 
-//     //Progress dialog
-//     dlWinData->height = 7;
-//     dlWinData->width  = 30;
-//     dlWinData->startX = (winData->width /2) - (dlWinData->width /2);
-//     dlWinData->startY = (winData->height /2) - (dlWinData->height /2);
-//     dlScreen = newwin(dlWinData->height, dlWinData->width, dlWinData->startY, dlWinData->startX);
-//     dlWinData->win = dlScreen;
-//     progressDialog.reset(new ttyProgressDialog(dlWinData.get(), "Downloading"));
-
     //Help dialog
     helpText = "Press:\n\nESC to exit\nENTER to select\nArrow keys to change selection\n"\
       "Page up and down keys to change page";
@@ -161,7 +152,7 @@ bool ManualConfigDownload::help()
 {
     BasicMenu helpMenu(helpText, winData.get(), "Help menu");
     /*Stylise the menu borders*/
-    //				borders => (bool, we, ns)
+    //         borders => (bool, we, ns)
     helpMenu.setDrawBorder(true, 0, 0);
     flushinp();
 

fetchconfig/easyCurses.cpp

@@ -302,15 +302,14 @@ namespace EasyCurses
         TF::overflow(lines, _maxChars(), lineFormat);
         numLines    = lineFormat.size();
 
-//         keyBindings = {
-//             { KEY_NPAGE, NavContent::pageUp }, { KEY_PPAGE, NavContent::pageDown },
-//             { 27, NavContent::finish }
-//         }; //27 => ESC
-
         keypad(winData->win, true);
+
+        this->cusAct = [](void) -> bool {
+            return false;
+        };
     }
 
-    std::map<int, int> BasicMenu::keyBindings = {
+    std::map<int, NavContent> BasicMenu::keyBindings = {
         { KEY_NPAGE, NavContent::pageUp }, { KEY_PPAGE, NavContent::pageDown },
         { 27, NavContent::finish }
     }; //27 => ESC
@@ -320,24 +319,14 @@ namespace EasyCurses
         return wgetch(winData->win);
     }
 
-    int BasicMenu::mapInput(int input)
+    NavContent BasicMenu::mapInput(int rawInput)
     {
-        auto res = keyBindings.find(input);
+        auto res = keyBindings.find(rawInput);
         if(res != keyBindings.end())
             return res->second;
         return NavContent::null;
     }
 
-//     void BasicMenu::setKeyBindings(std::map<int, int> newKBs)
-//     {
-//         keyBindings = newKBs;
-//     }
-//
-//     std::map<int, int>& BasicMenu::getKeyBindings()
-//     {
-//         return keyBindings;
-//     }
-
     void BasicMenu::setCustomAction(F cusAct)
     {
         this->cusAct = cusAct;
@@ -348,7 +337,7 @@ namespace EasyCurses
         return cusAct;
     }
 
-    void BasicMenu::calculatePage(int seek)
+    void BasicMenu::calculatePage(NavContent seek)
     {
         int startPage = page;
 
@@ -373,15 +362,15 @@ namespace EasyCurses
                 else //4th
                     ++page;
                 break;
-
-            break;
+            default:
+                break;
         }
 
         if(startPage != page)
             setUpdate();
     }
 
-    void BasicMenu::inputHandling(int& input)
+    void BasicMenu::inputHandling(NavContent& input)
     {
         input = mapInput(getInput());
 
@@ -452,7 +441,7 @@ namespace EasyCurses
         update();
         wrefresh(winData->win);
 
-        int input = NavContent::null;
+        NavContent input = NavContent::null;
         do
         {
             inputHandling(input);
@@ -488,7 +477,7 @@ namespace EasyCurses
         keyBindings[KEY_LEFT]  = NavContent::left;
         keyBindings[KEY_UP]    = NavContent::lineUp;
         keyBindings[KEY_DOWN]  = NavContent::lineDown;
-        keyBindings[10]        = 10;
+        keyBindings[10]        = NavContent::select; //Enter key
 
         keypad(winData->win, true);
     }
@@ -518,7 +507,7 @@ namespace EasyCurses
         }
     }
 
-    void SelectionMenu::calculatePage(int seek)
+    void SelectionMenu::calculatePage(NavContent seek)
     {
         //Deals with page up and down keys
         BasicMenu::calculatePage(seek);
@@ -552,7 +541,6 @@ namespace EasyCurses
                     updateLineTrackers(pageTop());
                     break;
                 }
-
                 break;
 
             case NavContent::lineUp:
@@ -563,28 +551,27 @@ namespace EasyCurses
                 {
                     page = lastPage() -1;
                     updateLineTrackers(numLines -1);
-                    break;
                 }
                 else if(highlight < pageTop()) //4th
                 {
                     --page;
                     updateLineTrackers(pageBottom());
-                    break;
                 }
+                break;
 
+            default:
                 break;
         }
 
         if(startPage != page)
             setUpdate();
     }
 
-    void SelectionMenu::navTrunc(int input)
+    void SelectionMenu::navTrunc(NavContent input)
     {
         if(overflowLine == overflowLayout.end())
             return;
 
-
         bool changed = false;
 
         TF::TextLayout::iterator first, last;
@@ -612,6 +599,9 @@ namespace EasyCurses
                 ++overflowLine;
             }
             break;
+
+        default:
+            break;
         }
 
         if(changed)
@@ -654,7 +644,7 @@ namespace EasyCurses
         wrefresh(winData->win);
     }
 
-    void SelectionMenu::inputHandling(int& input)
+    void SelectionMenu::inputHandling(NavContent& input)
     {
         BasicMenu::inputHandling(input);
 
@@ -669,7 +659,7 @@ namespace EasyCurses
                 navTrunc(input);
                 break;
 
-            case 10:
+            case NavContent::select:
                 if(selected[highlight] == true)
                     selected[highlight] = false;
                 else
@@ -680,6 +670,9 @@ namespace EasyCurses
             case NavContent::finish:
                 //User done selecting
                 return;
+
+            default:
+                break;
         }
     }
 

fetchconfig/gimx-fetchconfig.cpp

@@ -46,15 +46,18 @@ class FileDownloader
     {
         configDl = std::unique_ptr<AutoConfigDownload>(new AutoConfigDownload);
         static_cast<AutoConfigDownload*>(configDl.get());
-        
+
         configDl->chooseConfigs();
     }
 
     int callOptions(struct option* longOptions, int optionCharacter, int optionIndex)
     {
-        int result = 0;
+        int result = -1;
         switch(optionCharacter)
         {
+            case -1:
+                //End of list
+                break;
             case 0:
                 //If this option set a flag, do nothing else now.
                 if(longOptions[optionIndex].flag != 0)
@@ -71,10 +74,10 @@ class FileDownloader
             case 'h':
             case '?':
             default:
-                result = -1;
+                result = -2;
                 break;
         }
-        
+
         return result;
     }
 
@@ -106,13 +109,12 @@ int main(int argc, char* argv[])
     auto callback = [&fDownloader](struct option* opts, int optChar, int optI) -> int {
             return fDownloader.callOptions(opts, optChar, optI);
     };
-
-
+
     int res = parseArgs(argc, argv, longOpts, callback);
-    
+
     /*End curses*/
     endwin();
-    if(res == -1)
+    if(res == -2 || optind < argc)
         help();
     return 0;
 }

fetchconfig/include/configDownload.h

@@ -62,46 +62,31 @@ class ConfigDownload
     virtual ~ConfigDownload() { };
 
     virtual bool setUpDirectories(WINDOW* win);
-    
+
     virtual int chooseConfigs()  = 0;
     virtual int getConfig(std::string& configName);
     virtual int grabConfigs(std::list<std::string>& configs, WINDOW* screen);
 
     virtual void initDownload();
     virtual void cleanDownload();
-    virtual int  updateProgress\
-      (configupdater::ConfigUpdaterStatus status, double progress,
-       double total);
+    virtual int  updateProgress(configupdater::ConfigUpdaterStatus status,
+      double progress, double total);
 };
 
 class ManualConfigDownload : public ConfigDownload
 {
 public:
     ManualConfigDownload();
     ~ManualConfigDownload() { delwin(screen); delwin(dlScreen); }
-    
+
     bool help();
-
-    virtual int chooseConfigs() override;
 
-//     virtual void initDownload() override;
-//     virtual void cleanDownload() override;
+    virtual int chooseConfigs() override;
 
 private:
-    /*
-     * From ConfigDownload:
-     *   std::string userDir;
-     *   std::string gimxDir;
-     *   std::string gimxConfigDir;
-     *   std::unique_ptr<ttyProgressDialog> progressDialog;
-     *   std::unique_ptr<WinData> dlWinData;
-     *   WINDOW* dlScreen;
-     *   void* clientp;
-     */
-
     WINDOW* screen;
     std::unique_ptr<WinData> winData;
-    
+
     std::string helpText;
 
     //Information needed to allow user to choose config(s)
@@ -113,25 +98,8 @@ class AutoConfigDownload : public ConfigDownload
 {
 public:
     AutoConfigDownload();
-
-    int chooseConfigs();
-
-//     virtual void initDownload() override;
-//     virtual void cleanDownload() override;
 
-private:
-    /*
-     * From ConfigDownload:
-     *   std::string userDir;
-     *   std::string gimxDir;
-     *   std::string gimxConfigDir;
-     *   std::unique_ptr<ttyProgressDialog> progressDialog;
-     *   std::unique_ptr<WinData> winData;
-     *   std::unique_ptr<WinData> dlWinData;
-     *   WINDOW* screen;
-     *   WINDOW* dlScreen;
-     *   void* clientp;
-     */
+    int chooseConfigs();
 };