Fix ammo filtering

gui/builtinMarketBrowser/itemView.py

@@ -166,7 +166,7 @@ class ItemView(Display):
             self.updateItemStore(items)
             self.filterItemStore()
             return
-        
+
         # If "Fits" filter is active, re-filter the current view
         if self.marketBrowser.getFitsFilter():
             self.filterItemStore()

gui/marketBrowser.py

@@ -54,6 +54,7 @@ class MarketBrowser(wx.Panel):
         self.settings = MarketPriceSettings.getInstance()
         self.__mode = 'normal'
         self.__normalBtnMap = {}
+        self.__normalSlotBtnMap = {}
         self.marketView = MarketTree(self.splitter, self)
         self.itemView = ItemView(self.splitter, self)
 
@@ -216,6 +217,9 @@ class MarketBrowser(wx.Panel):
             self.__normalBtnMap.clear()
             for btn in self.metaButtons:
                 self.__normalBtnMap[btn] = btn.userSelected
+            self.__normalSlotBtnMap.clear()
+            for btn in self.slotButtons:
+                self.__normalSlotBtnMap[btn] = btn.userSelected
         if newMode == 'search':
             self.marketView.UnselectAll()
         setting = self.settings.get('marketMGSearchMode')
@@ -224,9 +228,14 @@ class MarketBrowser(wx.Panel):
             if newMode in ('search', 'recent', 'charges'):
                 for btn in self.metaButtons:
                     btn.setUserSelection(True)
+                # Clear slot button selections when searching (search can return any item type)
+                for btn in self.slotButtons:
+                    btn.setUserSelection(False)
             if newMode == 'normal':
                 for btn, state in self.__normalBtnMap.items():
                     btn.setUserSelection(state)
+                for btn, state in self.__normalSlotBtnMap.items():
+                    btn.setUserSelection(state)
         # We turn on all meta buttons permanently
         if setting == 2:
             for btn in self.metaButtons:

release.sh

@@ -24,9 +24,7 @@ echo "Building the binary..."
 
 echo "Creating release zip..."
 ZIP="pyfa-${TAG}-win.zip"
-cd dist/pyfa
-zip -r "../../${ZIP}" .
-cd ../..
+7z a "${ZIP}" dist/pyfa/*
 
 echo "Creating a release..."
 TOKEN="$GITEA_API_KEY"
@@ -56,5 +54,7 @@ curl -X POST \
   -H "Authorization: token $TOKEN" \
   -F "attachment=@${ZIP}" \
   "$GITEA/api/v1/repos/$REPO/releases/${RELEASE_ID}/assets?name=${ZIP}"
+  
+rm "${ZIP}"
 
 echo "Release complete! ${ZIP} uploaded to ${TAG}"