Add natural sort; Up version to 0.1.2

Author: DemonTPx

CMakeLists.txt

@@ -6,5 +6,5 @@ set(CMAKE_CXX_STANDARD 11)
 find_package(wxWidgets COMPONENTS core base REQUIRED)
 include(${wxWidgets_USE_FILE})
 
-add_executable(launch_ssh src/App.cpp src/MainFrame.cpp src/HistoryFile.cpp)
+add_executable(launch_ssh src/App.cpp src/MainFrame.cpp src/HistoryFile.cpp src/strnatcmp.c)
 target_link_libraries(launch_ssh ${wxWidgets_LIBRARIES})

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.1.1
+VERSION=0.1.2
 CODENAME=`lsb_release -c | cut -f2`
 
 .PHONY: all clean build-deb
@@ -9,7 +9,7 @@ clean: rm -rf build/*
 
 build-deb:
 	mkdir -p build/deb/DEBIAN build/deb/usr/bin build/deb/usr/share/applications
-	cp debian/control build/deb/DEBIAN/
+	sed -e 's/\$$VERSION\$$/${VERSION}/g' debian/control > build/deb/DEBIAN/control
 	cp debian/launch-ssh.desktop build/deb/usr/share/applications/
 	cp cmake-build-release/launch_ssh build/deb/usr/bin/
 	dpkg-deb --build build/deb build/launch-ssh_${VERSION}-${CODENAME}_amd64.deb

README.md

@@ -24,8 +24,8 @@ Delete records from your history you don't want using the `DELETE` key.
 
 Download and install:
 
-* [launch-ssh_0.1-xenial_amd64.deb](https://github.com/DemonTPx/launch-ssh/releases/download/0.1/launch-ssh_0.1-xenial_amd64.deb)
-* [launch-ssh_0.1-artful_amd64.deb](https://github.com/DemonTPx/launch-ssh/releases/download/0.1/launch-ssh_0.1-artful_amd64.deb)
+* [launch-ssh_0.1.2-bionic_amd64.deb](https://github.com/DemonTPx/launch-ssh/releases/download/0.1/launch-ssh_0.1.2-bionic_amd64.deb)
+* [launch-ssh_0.1.2-xenial_amd64.deb](https://github.com/DemonTPx/launch-ssh/releases/download/0.1/launch-ssh_0.1.2-xenial_amd64.deb)
 
 It is recommended that you add a global keyboard shortcut (eg. to `SUPER+Q`) which runs `launch_ssh` to easily launch SSH sessions using this application.
 
@@ -45,10 +45,14 @@ Then run the following commands from the working copy:
 
 ## Credits
 
+The `strnatcmp` code was written by Martin Pool and was taken from [Github](https://github.com/sourcefrog/natsort). 
+
 The icon was taken from [moka-icon-theme](https://github.com/snwh/moka-icon-theme) by [Sam Hewitt](https://github.com/snwh) which is under a [Creative Commons Attribution ShareAlike 4.0](https://creativecommons.org/licenses/by-sa/4.0) license.
 
 ## License
 
 The code is under MIT ([LICENSE](LICENSE)).
 
+The `strnatcmp` code's license can be found in the [source](src/strnatcmp.c) and [header](src/strnatcmp.h) files itself.
+
 The icon is under [Creative Commons Attribution ShareAlike 4.0](https://creativecommons.org/licenses/by-sa/4.0)

debian/control

@@ -1,5 +1,5 @@
 Package: launch-ssh
-Version: 0.1.1
+Version: $VERSION$
 Maintainer: Bert Hekman <demontpx@gmail.com>
 Homepage: https://github.com/DemonTPx/launch-ssh
 Architecture: amd64

src/MainFrame.cpp

@@ -1,5 +1,9 @@
 #include "MainFrame.hpp"
 
+extern "C" {
+#include "strnatcmp.h"
+}
+
 #include <algorithm>
 
 MainFrame::MainFrame(const wxString &title, const wxPoint &pos, const wxSize &size):
@@ -162,7 +166,7 @@ void MainFrame::Launch(const wxString &target) {
 
     if (history.Index(target) == wxNOT_FOUND) {
         history.push_back(target);
-        history.Sort();
+        history.Sort(NaturalCompare);
         historyFile.Save(history);
     }
 }
@@ -220,4 +224,8 @@ void MainFrame::DeleteSelection() {
     }
 
     RefreshList();
-}
+}
+
+int MainFrame::NaturalCompare(const wxString &a, const wxString &b) {
+    return strnatcmp(a.c_str(), b.c_str());
+}

src/MainFrame.hpp

@@ -33,6 +33,8 @@ class MainFrame : public wxFrame {
 
     void DeleteSelection();
 
+    static int NaturalCompare(const wxString &a, const wxString &b);
+
     HistoryFile historyFile;
 
     wxArrayString history;

src/strnatcmp.c

@@ -0,0 +1,173 @@
+/* -*- mode: c; c-file-style: "k&r" -*-
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+/* partial change history:
+ *
+ * 2004-10-10 mbp: Lift out character type dependencies into macros.
+ *
+ * Eric Sosman pointed out that ctype functions take a parameter whose
+ * value must be that of an unsigned int, even on platforms that have
+ * negative chars in their default char type.
+ */
+
+#include <stddef.h>	/* size_t */
+#include <ctype.h>
+
+#include "strnatcmp.h"
+
+
+/* These are defined as macros to make it easier to adapt this code to
+ * different characters types or comparison functions. */
+static inline int
+nat_isdigit(nat_char a)
+{
+    return isdigit((unsigned char) a);
+}
+
+
+static inline int
+nat_isspace(nat_char a)
+{
+    return isspace((unsigned char) a);
+}
+
+
+static inline nat_char
+nat_toupper(nat_char a)
+{
+    return toupper((unsigned char) a);
+}
+
+
+static int
+compare_right(nat_char const *a, nat_char const *b)
+{
+    int bias = 0;
+
+    /* The longest run of digits wins.  That aside, the greatest
+   value wins, but we can't know that it will until we've scanned
+   both numbers to know that they have the same magnitude, so we
+   remember it in BIAS. */
+    for (;; a++, b++) {
+        if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+            return bias;
+        if (!nat_isdigit(*a))
+            return -1;
+        if (!nat_isdigit(*b))
+            return +1;
+        if (*a < *b) {
+            if (!bias)
+                bias = -1;
+        } else if (*a > *b) {
+            if (!bias)
+                bias = +1;
+        } else if (!*a  &&  !*b)
+            return bias;
+    }
+
+    return 0;
+}
+
+
+static int
+compare_left(nat_char const *a, nat_char const *b)
+{
+    /* Compare two left-aligned numbers: the first to have a
+       different value wins. */
+    for (;; a++, b++) {
+        if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+            return 0;
+        if (!nat_isdigit(*a))
+            return -1;
+        if (!nat_isdigit(*b))
+            return +1;
+        if (*a < *b)
+            return -1;
+        if (*a > *b)
+            return +1;
+    }
+
+    return 0;
+}
+
+
+static int
+strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
+{
+    int ai, bi;
+    nat_char ca, cb;
+    int fractional, result;
+
+    ai = bi = 0;
+    while (1) {
+        ca = a[ai]; cb = b[bi];
+
+        /* skip over leading spaces or zeros */
+        while (nat_isspace(ca))
+            ca = a[++ai];
+
+        while (nat_isspace(cb))
+            cb = b[++bi];
+
+        /* process run of digits */
+        if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
+            fractional = (ca == '0' || cb == '0');
+
+            if (fractional) {
+                if ((result = compare_left(a+ai, b+bi)) != 0)
+                    return result;
+            } else {
+                if ((result = compare_right(a+ai, b+bi)) != 0)
+                    return result;
+            }
+        }
+
+        if (!ca && !cb) {
+            /* The strings compare the same.  Perhaps the caller
+                   will want to call strcmp to break the tie. */
+            return 0;
+        }
+
+        if (fold_case) {
+            ca = nat_toupper(ca);
+            cb = nat_toupper(cb);
+        }
+
+        if (ca < cb)
+            return -1;
+
+        if (ca > cb)
+            return +1;
+
+        ++ai; ++bi;
+    }
+}
+
+
+int
+strnatcmp(nat_char const *a, nat_char const *b) {
+    return strnatcmp0(a, b, 0);
+}
+
+
+/* Compare, recognizing numeric string and ignoring case. */
+int
+strnatcasecmp(nat_char const *a, nat_char const *b) {
+    return strnatcmp0(a, b, 1);
+}

src/strnatcmp.h

@@ -0,0 +1,27 @@
+/* -*- mode: c; c-file-style: "k&r" -*-
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+/* CUSTOMIZATION SECTION
+ *
+ * You can change this typedef, but must then also change the inline
+ * functions in strnatcmp.c */
+typedef char nat_char;
+
+int strnatcmp(nat_char const *a, nat_char const *b);
+int strnatcasecmp(nat_char const *a, nat_char const *b);