Merge lp:~gesha/linaro-license-protection/textile-view into lp:~linaro-infrastructure/linaro-license-protection/textile-view

[Georgy Redkozubov]

These revs add sorting to the list of paths based on pre-defined list of files to display and pep8 fixes.

[Milo Casagrande (milo)]

Gesha, there are some conflicts in the merge. Can you please take a look?

[Stevan Radaković (stevanr)]

Yea I updated the target branch directly yesterday.. Just remove those two comment lines (since we've implemented exceptions already) and you can resolve.
Other then that, approve +1.

review: Approve

=== modified file 'license_protected_downloads/render_text_files.py'
--- license_protected_downloads/render_text_files.py	2012-10-15 11:14:42 +0000
+++ license_protected_downloads/render_text_files.py	2012-10-16 12:07:32 +0000
@@ -25,12 +25,25 @@
         pass
 
     @classmethod
+    def sort_paths_list_by_files_list(cls, a, b):
+        base_list = ANDROID_FILES + UBUNTU_FILES
+        return base_list.index(os.path.basename(a)) - \
+               base_list.index(os.path.basename(b))
+
+    @classmethod
     def find_and_render(cls, path):
 
         result = {}
 
         try:
+<<<<<<< TREE
             filepaths = cls.find_relevant_files(path)
+=======
+            # This method should raise some custom error if there is more
+            # then one file of the same type recursively found.
+            filepaths = sorted(cls.find_relevant_files(path),
+                               cmp=cls.sort_paths_list_by_files_list)
+>>>>>>> MERGE-SOURCE
         except:
             # This is ok, no tabs when none is returned.
             return None
@@ -64,12 +77,14 @@
         # written above.
         multiple = 0
         filepaths = cls.dirEntries(path, True, UBUNTU_FILES, ANDROID_FILES)
-        if len(filepaths)>0:
+        if len(filepaths) > 0:
             for filepath in UBUNTU_FILES:
-                if len(cls.findall(filepaths, lambda x: re.search(filepath, x)))>1:
+                if len(cls.findall(filepaths,
+                                   lambda x: re.search(filepath, x))) > 1:
                     multiple += 1
             for filepath in ANDROID_FILES:
-                if len(cls.findall(filepaths, lambda x: re.search(filepath, x)))>1:
+                if len(cls.findall(filepaths,
+                                   lambda x: re.search(filepath, x))) > 1:
                     multiple += 1
             if multiple == 0:
                 return filepaths
@@ -122,7 +137,7 @@
     def findall(cls, L, test):
         ''' Return indices of list items that pass the 'test'
         '''
-        i=0
+        i = 0
         indices = []
         while(True):
             try:
@@ -132,7 +147,7 @@
                 # by searching the value in L[i:]
                 indices.append(L.index(nextvalue, i))
                 # iterate i, that is the next index from where to search
-                i=indices[-1]+1
+                i = indices[-1] + 1
             # when there is no further "good value", filter returns [],
             # hence there is an out of range exception
             except IndexError:

=== modified file 'license_protected_downloads/tests/test_render_text_files.py'
--- license_protected_downloads/tests/test_render_text_files.py	2012-10-16 07:09:04 +0000
+++ license_protected_downloads/tests/test_render_text_files.py	2012-10-16 12:07:32 +0000
@@ -5,8 +5,8 @@
 import re
 from license_protected_downloads.render_text_files import RenderTextFiles
 from license_protected_downloads.render_text_files import NoFilesException
-from license_protected_downloads.render_text_files import \
-    MultipleFilesException
+from license_protected_downloads.render_text_files \
+ import MultipleFilesException
 from license_protected_downloads.render_text_files import ANDROID_FILES
 from license_protected_downloads.render_text_files import UBUNTU_FILES
 
@@ -125,3 +125,14 @@
             sorted(RenderTextFiles.find_relevant_files(android_path)))
         self.assertEqual(sorted(full_ubuntu_files),
             sorted(RenderTextFiles.find_relevant_files(ubuntu_path)))
+
+    def test_sort_paths_list_by_files_list(self):
+        path = self.make_temp_dir(empty=False, file_list=UBUNTU_FILES)
+        full_ubuntu_files = []
+        for file in UBUNTU_FILES:
+            full_ubuntu_files.append(os.path.join(path, file))
+        paths_list = RenderTextFiles.find_relevant_files(path)
+        self.assertEqual(full_ubuntu_files,
+            sorted(paths_list,
+                   cmp=RenderTextFiles.sort_paths_list_by_files_list))
+        self.assertNotEqual(full_ubuntu_files, paths_list)