detect if a query is hash, get rid of radio buttons

TODO.md

@@ -34,7 +34,6 @@ Basically any non-gui non-cli user interface
 
 ### Small Items
 
-* Detect if a query is hash, get rid of radio buttons
 * Detect if router is dead and show warning or exit
 * Wrapper of some kind for in-place upgrades
 * Download file sequentially

gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy

@@ -49,9 +49,20 @@ class MainFrameController {
         def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
         model.results[uuid.toString()] = group
 
+        boolean hashSearch = false
+        byte [] root = null
+        if (search.length() == 44 && search.indexOf(" ") < 0) {
+            try {
+                root = Base64.decode(search)
+                hashSearch = true
+            } catch (Exception e) {
+                // not a hash search
+            }
+        }
+        
         def searchEvent
-        if (model.hashSearch) {
-            searchEvent = new SearchEvent(searchHash : Base64.decode(search), uuid : uuid)
+        if (hashSearch) {
+            searchEvent = new SearchEvent(searchHash : root, uuid : uuid)
         } else {
             // this can be improved a lot
             def replaced = search.toLowerCase().trim().replaceAll(Constants.SPLIT_PATTERN, " ")
@@ -175,16 +186,6 @@ class MainFrameController {
         markTrust("trusted-table", TrustLevel.NEUTRAL, model.trusted)
     }
     
-    @ControllerAction
-    void keywordSearch() {
-        model.hashSearch = false
-    }
-    
-    @ControllerAction
-    void hashSearch() {
-        model.hashSearch = true
-    }
-    
     void unshareSelectedFiles() {
         println "unsharing selected files"
     }

gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy

@@ -56,8 +56,6 @@ class MainFrameModel {
     def trusted = []
     def distrusted = []
     
-    boolean hashSearch
-    
     @Observable int connections
     @Observable String me
     @Observable boolean searchButtonsEnabled

gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy

@@ -90,12 +90,6 @@ class MainFrameView {
 
                             }
                             panel( constraints: BorderLayout.EAST) {
-                                panel {
-                                    buttonGroup(id : "searchButtonGroup") 
-                                    radioButton(text : "Keywords", selected : true, buttonGroup : searchButtonGroup, keywordSearchAction)
-                                    radioButton(text : "Hash", selected : false, buttonGroup : searchButtonGroup, hashSearchAction)
-                                    
-                                }
                                 button(text: "Search", searchAction)
                             }
                         }