Merge branch 'master' of github.com:B3rs/P2P

B3rs · May 29, 2012 · 393c8c3 · 393c8c3
2 parents c11e3ad + 6bde482
commit 393c8c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bittorrent/teamGML/managers/filesmanager.py b/bittorrent/teamGML/managers/filesmanager.py
@@ -14,7 +14,6 @@
 DOWNLOAD_FOLDER = "downloads"
 
 
-
 class FilesManager(object):
 
     FILES = []
@@ -148,6 +147,7 @@ def create_file_from_parts(cls, file_id):
                 for part_num in range(0, file.parts_count):
                     os.remove(cls.get_filepart_path_from_file(file_id, part_num))
 
+                file.filepath = DOWNLOAD_FOLDER+"/"+file.filename
             else:
                 raise Exception("File %s is not completed!" %file.filename)
         else:

diff --git a/bittorrent/teamGML/threads/service_thread.py b/bittorrent/teamGML/threads/service_thread.py
@@ -48,7 +48,7 @@ def run(self):
                 # Get the file matching the file_id
                 klog("finding file with id: %s, session_id %s, part %s" %(file_id, my_session_id, part_num))
 
-                file = FilesManager.find_shared_file_by_id(file_id)
+                file = FilesManager.find_file_by_id(file_id)
 
                 if file:
                     klog("i have found the file: %s stored in %s" % (file.filename, file.filepath))

diff --git a/bittorrent/teamGML/ui/qt/qbittorrent_window.py b/bittorrent/teamGML/ui/qt/qbittorrent_window.py
@@ -95,7 +95,7 @@ def _searchBtnClicked(self):
     def _resultsTreeClicked(self, item, index):
         file_id = item.text(1)
         self.request_emitter.download_file(file_id)
-        self.ui.tabsWidget.setCurrentIndex(4) #go to the transfer page
+        self.ui.tabsWidget.setCurrentIndex(2) #go to the transfer page
 
 
     def _redraw_shared_files(self):