Revamped creditmining GUI

Squashed Commits:
- Integrate uniform channel source into GUI
- Add credit mining manager and list
- Integrating gumby with Boostingmanager
- Update info to summary panel
- Fix bugs in credit mining panel and make prettier popular channel @home
- Refreshing-connecting home and Credit Mining Panel
- Beautify home channel list -need to expand horizontally-
- Change credit mining order in GUI
- Remove PostInit in creditmining list
- Fix channel source interpretation

What this commits do is :
- Change BoostingDialog GUI as we don't need channel there
- Create CreditMiningPanel as container for credit mining tab
- Add Credit Mining option in GUI Utility (lists in tab)
- Put CreditMiningPanel in MainFrame
- Put popular channels in Home. Directly affected with credit mining
- Make current credit mining list to adapt new GUI structure

Tribler/Main/Dialogs/BoostingDialogs.py

@@ -10,16 +10,16 @@
 class AddBoostingSource(wx.Dialog):
 
  def __init__(self, parent):
- wx.Dialog.__init__(self, parent, -1, 'Add boosting source', size=(475, 475), name="AddBoostingSourceDialog")
+ wx.Dialog.__init__(self, parent, -1, 'Add boosting source', size=(275, 275), name="AddBoostingSourceDialog")
 
  self.guiutility = GUIUtility.getInstance()
  self.channels = []
  self.source = ''
 
- text = wx.StaticText(self, -1, 'Please enter a RSS feed URL or select a channel to start boosting swarms:')
- self.channel_radio = wx.RadioButton(self, -1, 'Subscribed Channel:', style=wx.RB_GROUP)
- self.channel_choice = wx.Choice(self, -1)
- self.channel_choice.Bind(wx.EVT_CHOICE, lambda evt: self.channel_radio.SetValue(True))
+ text = wx.StaticText(self, -1, 'Please enter a RSS feed URL or directory to start boosting swarms:')
+ # self.channel_radio = wx.RadioButton(self, -1, 'Subscribed Channel:', style=wx.RB_GROUP)
+ # self.channel_choice = wx.Choice(self, -1)
+ # self.channel_choice.Bind(wx.EVT_CHOICE, lambda evt: self.channel_radio.SetValue(True))
 
  self.rss_feed_radio = wx.RadioButton(self, -1, 'RSS feed:')
  self.rss_feed_edit = wx.TextCtrl(self, -1)
@@ -37,8 +37,8 @@ def __init__(self, parent):
 
  sourceGrid = wx.FlexGridSizer(2, 2, 0, 0)
  sourceGrid.AddGrowableCol(1)
- sourceGrid.Add(self.channel_radio, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT | wx.TOP, 5)
- sourceGrid.Add(self.channel_choice, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
+ # sourceGrid.Add(self.channel_radio, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT | wx.TOP, 5)
+ # sourceGrid.Add(self.channel_choice, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
  sourceGrid.Add(self.rss_feed_radio, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT | wx.TOP, 5)
  sourceGrid.Add(self.rss_feed_edit, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
  sourceGrid.Add(self.rss_dir_radio, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT | wx.TOP, 5)
@@ -55,25 +55,31 @@ def __init__(self, parent):
  vSizer.Add(btnSizer, 0, wx.EXPAND | wx.ALL, 5)
  self.SetSizer(vSizer)
 
- def do_db():
- return self.guiutility.channelsearch_manager.getMySubscriptions()
-
- def do_gui(delayedResult):
- _, channels = delayedResult.get()
- self.channels = sorted([(channel.name, channel.dispersy_cid) for channel in channels])
- self.channel_choice.SetItems([channel[0] for channel in self.channels])
-
- startWorker(do_gui, do_db, retryOnBusy=True, priority=GUI_PRI_DISPERSY)
+ # def do_db():
+ #  return self.guiutility.channelsearch_manager.getAllChannels()
+ #
+ # def do_gui(delayedResult):
+ #  _, channels = delayedResult.get()
+ #  self.channels = sorted([(channel.name, channel.dispersy_cid) for channel in channels])
+ #  self.channel_choice.SetItems([channel[0] for channel in self.channels])
+ #
+ # startWorker(do_gui, do_db, retryOnBusy=True, priority=GUI_PRI_DISPERSY)
 
  def OnOK(self, event):
- if self.channel_radio.GetValue():
- selection = self.channel_choice.GetSelection()
- if selection < len(self.channels):
- self.source = self.channels[selection][1]
- elif self.rss_feed_radio.GetValue():
+ # if self.channel_radio.GetValue():
+ # selection = self.channel_choice.GetSelection()
+ # if selection < len(self.channels):
+ # self.source = self.channels[selection][1]
+ # el
+
+ if self.rss_feed_radio.GetValue():
  self.source = self.rss_feed_edit.GetValue()
  else:
  self.source = self.rss_dir_edit.GetValue()
+
+ self.guiutility.Notify(
+ "Successfully add source for credit mining %s" % self.source)
+
  self.EndModal(wx.ID_OK)
 
  def OnCancel(self, event):

Tribler/Main/Utility/GuiDBTuples.py

@@ -101,7 +101,7 @@ def __init__(self, torrent_id, infohash, name, length, category, status, num_see
  Helper.__init__(self)
 
  assert isinstance(infohash, str), type(infohash)
- assert isinstance(name, basestring), type(name)
+ # assert isinstance(name, basestring), type(name)
 
  self.infohash = infohash
  self.name = name
@@ -127,7 +127,7 @@ def __init__(self, torrent_id, infohash, name, length, category, status, num_see
 
  @cacheProperty
  def torrent_id(self):
- self._logger.debug("Torrent: fetching getTorrentID from DB %s", self)
+ self._logger.error("Torrent: fetching getTorrentID from DB %s", self)
  return self.torrent_db.getTorrentID(self.infohash)
 
  def update_torrent_id(self, torrent_id):
@@ -300,7 +300,7 @@ def __init__(self, torrent_id, infohash, name, length=0, category=None, status=N
 
 
 class CollectedTorrent(Helper):
- __slots__ = ('comment', 'trackers', 'creation_date', 'files', 'last_check', 'torrent')
+ __slots__ = ('comment', 'trackers', 'creation_date', 'files', 'last_check', 'torrent', 'tdef')
 
  def __init__(self, torrent, torrentdef):
  assert isinstance(torrent, Torrent)
@@ -314,6 +314,7 @@ def __init__(self, torrent, torrentdef):
  self.creation_date = min(long(time()), torrentdef.get_creation_date())
  self.files = torrentdef.get_files_as_unicode_with_length()
  self.last_check = -1
+ self.tdef = torrentdef
 
  def __getattr__(self, name):
  return getattr(self.torrent, name)

Tribler/Main/tribler_main.py

@@ -9,6 +9,7 @@
 # see LICENSE.txt for license information
 #
 from Tribler.Core.Modules.process_checker import ProcessChecker
+from Tribler.Policies.BoostingManager import BoostingManager
 from Tribler.Main.Dialogs.NewVersionDialog import NewVersionDialog
 
 try:
@@ -263,6 +264,8 @@ def __init__(self, params, installdir, autoload_discovery=True,
  # gracefully closes Tribler after 120 seconds.
  # wx.CallLater(120*1000, wx.GetApp().Exit)
 
+ self.boosting_manager = BoostingManager.get_instance()
+
  self.ready = True
 
  except Exception as e:
@@ -815,6 +818,15 @@ def OnExit(self):
  self.webUI.stop()
  self.webUI.delInstance()
 
+ if self.boosting_manager:
+
+ #remove credit mining data
+ #TODO(ardhi) : not persistent mode only
+ import shutil; shutil.rmtree(self.boosting_manager.credit_mining_path, ignore_errors=True)
+
+ self.boosting_manager.shutdown()
+ self.boosting_manager.del_instance()
+
  if self.frame:
  self.frame.Destroy()
  self.frame = None