Changeset f1e708

Timestamp:

11/03/2015 07:43:29 PM (10 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

05ab06

Parents:

f500d7

git-author:

Calum Lind <calumlind+deluge@gmail.com> (11/03/2015 07:29:50 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (11/03/2015 07:43:29 PM)

Message:

Fix linting mistakes

Missed renaming file to _file. This commit now uses better naming with
some minor refactoring.

Location:

deluge/ui

Files:

• console/commands/info.py (modified) (3 diffs)
• gtkui/files_tab.py (modified) (2 diffs)

deluge/ui/console/commands/info.py

@@ -169 +169 @@
 
         prevpath = []
-        for i, _file in enumerate(status["files"]):
-            filename = _file["path"].split(dirsep)[-1]
-            filepath = _file["path"].split(dirsep)[:-1]
+        for index, torrent_file in enumerate(status["files"]):
+            filename = torrent_file["path"].split(dirsep)[-1]
+            filepath = torrent_file["path"].split(dirsep)[:-1]
 
             for depth, subdir in enumerate(filepath):
@@ -185 +185 @@
 
             col_filename = indent + filename
-            col_size = " ({!cyan!}%s{!input!})" % common.fsize(file["size"])
-            col_progress = " {!input!}%.2f%%" % (status["file_progress"][i] * 100)
+            col_size = " ({!cyan!}%s{!input!})" % common.fsize(torrent_file["size"])
+            col_progress = " {!input!}%.2f%%" % (status["file_progress"][index] * 100)
 
             col_priority = " {!info!}Priority: "
 
-            fp = common.FILE_PRIORITY[status["file_priorities"][i]].replace("Priority", "")
-            if status["file_progress"][i] != 1.0:
-                if fp == "Do Not Download":
+            file_priority = common.FILE_PRIORITY[status["file_priorities"][index]].replace("Priority", "")
+            if status["file_progress"][index] != 1.0:
+                if file_priority == "Do Not Download":
                     col_priority += "{!error!}"
                 else:
@@ -198 +198 @@
             else:
                 col_priority += "{!input!}"
-            col_priority += fp
+            col_priority += file_priority
 
             def tlen(string):

deluge/ui/gtkui/files_tab.py

@@ -344 +344 @@
 
     # The following 3 methods create the folder/file view in the treeview
-    def prepare_file_store(self, files):
+    def prepare_file_store(self, torrent_files):
         split_files = {}
-        i = 0
-        for _file in files:
-            self.prepare_file(_file, _file["path"], i, split_files)
-            i += 1
+        for index, torrent_file in enumerate(torrent_files):
+            self.prepare_file(torrent_file, torrent_file["path"], index, split_files)
         self.add_files(None, split_files)
 
-    def prepare_file(self, _file, file_name, file_num, files_storage):
+    def prepare_file(self, torrent_file, file_name, file_num, files_storage):
         first_slash_index = file_name.find("/")
         if first_slash_index == -1:
-            files_storage[file_name] = (file_num, _file)
+            files_storage[file_name] = (file_num, torrent_file)
         else:
             file_name_chunk = file_name[:first_slash_index + 1]
             if file_name_chunk not in files_storage:
                 files_storage[file_name_chunk] = {}
-            self.prepare_file(file, file_name[first_slash_index + 1:],
+            self.prepare_file(torrent_file, file_name[first_slash_index + 1:],
                               file_num, files_storage[file_name_chunk])
 
     def add_files(self, parent_iter, split_files):
-        ret = 0
+        chunk_size_total = 0
         for key, value in split_files.iteritems():
             if key.endswith("/"):
@@ -371 +369 @@
                 chunk_size = self.add_files(chunk_iter, value)
                 self.treestore.set(chunk_iter, 1, chunk_size)
-                ret += chunk_size
+                chunk_size_total += chunk_size
             else:
-                self.treestore.append(parent_iter, [key,
-                                                    value[1]["size"], "", 0, 0, value[0], gtk.STOCK_FILE])
-                ret += value[1]["size"]
-        return ret
+                self.treestore.append(parent_iter,
+                                      [key, value[1]["size"], "", 0, 0, value[0], gtk.STOCK_FILE])
+                chunk_size_total += value[1]["size"]
+        return chunk_size_total
 
     def update_files(self):