From 39e23237a599eaad276eee9ca54b5b6a14250157 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 8 Aug 2019 08:54:41 +0300 Subject: [PATCH] Move functionality of storing item to market service --- gui/builtinMarketBrowser/events.py | 2 +- gui/builtinMarketBrowser/itemView.py | 12 ++---------- service/market.py | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gui/builtinMarketBrowser/events.py b/gui/builtinMarketBrowser/events.py index be9e4d393..30dfd1e4d 100644 --- a/gui/builtinMarketBrowser/events.py +++ b/gui/builtinMarketBrowser/events.py @@ -1,7 +1,7 @@ # noinspection PyPackageRequirements import wx.lib.newevent + ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent() RECENTLY_USED_MODULES = -2 -MAX_RECENTLY_USED_MODULES = 20 diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index cabf2e96d..5c63c1f48 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -3,7 +3,7 @@ from logbook import Logger from eos.saveddata.module import Module import gui.builtinMarketBrowser.pfSearchBox as SBox -from gui.builtinMarketBrowser.events import ItemSelected, MAX_RECENTLY_USED_MODULES, RECENTLY_USED_MODULES +from gui.builtinMarketBrowser.events import ItemSelected, RECENTLY_USED_MODULES from gui.contextMenu import ContextMenu from gui.display import Display from gui.utils.staticHelpers import DragDropHelper @@ -85,21 +85,13 @@ class ItemView(Display): if self.mainFrame.getActiveFit(): - self.storeRecentlyUsedMarketItem(self.active[sel].ID) + self.sMkt.storeRecentlyUsed(self.active[sel].ID) self.recentlyUsedModules = [] for itemID in self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]: self.recentlyUsedModules.append(self.sMkt.getItem(itemID)) wx.PostEvent(self.mainFrame, ItemSelected(itemID=self.active[sel].ID)) - def storeRecentlyUsedMarketItem(self, itemID): - recentlyUsedModules = self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"] - while itemID in recentlyUsedModules: - recentlyUsedModules.remove(itemID) - while len(self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"]) >= MAX_RECENTLY_USED_MODULES: - self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].pop(-1) - self.sMkt.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"].insert(0, itemID) - def treeSelectionChanged(self, event=None): self.selectionMade('tree') diff --git a/service/market.py b/service/market.py index 766008d8e..d29131d89 100644 --- a/service/market.py +++ b/service/market.py @@ -820,3 +820,11 @@ class Market: if self.getPublicityByItem(item): items.append(item) return items + + def storeRecentlyUsed(self, itemID): + recentlyUsedModules = self.serviceMarketRecentlyUsedModules["pyfaMarketRecentlyUsedModules"] + while itemID in recentlyUsedModules: + recentlyUsedModules.remove(itemID) + while len(recentlyUsedModules) >= 20: + recentlyUsedModules.pop(-1) + recentlyUsedModules.insert(0, itemID)