add exclude file and reverse list of contents

Author: imankarimi

log_reader/settings.py

@@ -11,3 +11,5 @@
 # The default value is '[(?i)[0-9]{4}-[0-9]{2}-[0-9]{2}\\s(?:[0-9]{2}:){2}[0-9]{2}.+?(?=[0-9]{4}-[0-9]{2}-[0-9]{2}\\s(?:[0-9]{2}:){2}[0-9]{2}|$)'
 LOG_READER_REGEX_SPLIT_PATTERN = '[(?i)[0-9]{4}-[0-9]{2}-[0-9]{2}\\s(?:[0-9]{2}:){2}[0-9]{2}.+?(?=[0-9]{4}-[0-9]{2}-[0-9]{2}\\s(?:[0-9]{2}:){2}[0-9]{2}|$)'
 LOG_READER_MAX_READ_LINES = getattr(settings, 'LOG_READER_MAX_READ_LINES', 1000)
+LOG_READER_EXCLUDE_LINES = getattr(settings, 'LOG_READER_EXCLUDE_LINES', [])
+

log_reader/templates/log_reader/admin/change_list.html

@@ -49,11 +49,13 @@ <h1>File Logs</h1>
                             </tr>
                             </thead>
                             <tbody>
-                            {% for content in file_contents %}
-                                <tr>
-                                    <td>{{ forloop.counter }}</td>
-                                    <td class="file_content">{{ content }}</td>
-                                </tr>
+                            {% for content in file_contents reversed %}
+                                {% if content|length > 5 %}
+                                    <tr>
+                                        <td>{{ forloop.counter }}</td>
+                                        <td class="file_content">{{ content }}</td>
+                                    </tr>
+                                {% endif %}
                             {% endfor %}
                             </tbody>
                         </table>

log_reader/utils.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import os
-import re
+# import re
 import subprocess
 from fnmatch import fnmatch
+from django.utils.translation import ugettext_lazy as _
 
 from log_reader import settings
 
@@ -12,12 +13,15 @@ def get_log_files(directory):
     for (dir_path, dir_names, filenames) in os.walk(directory):
         log_files = []
         all_files = list(filter(lambda x: x.find('~') == -1, filenames))
-        log_files.extend([x for x in all_files if fnmatch(x, settings.LOG_READER_FILES_PATTERN)])
+        log_files.extend([x for x in all_files if fnmatch(x, settings.LOG_READER_FILES_PATTERN) and x not in settings.LOG_READER_EXCLUDE_FILES])
         return list(set(log_files))
     return []
 
 
 def read_file_lines(file_name):
+    if file_name not in get_log_files(settings.LOG_READER_DIR_PATH):
+        return False, _("%s file, not found. Please try again." % file_name)
+
     try:
         file_path = '%s/%s' % (settings.LOG_READER_DIR_PATH, file_name)
         result = subprocess.run(
@@ -34,8 +38,9 @@ def read_file_lines(file_name):
 
 
 def split_file_content(content):
-    res = content.split(settings.LOG_READER_SPLIT_PATTERN) if content else []
+    data = content.split(settings.LOG_READER_SPLIT_PATTERN) if content else []
     # if content and len(res) == 1:
     #     res = re.findall(settings.LOG_READER_REGEX_SPLIT_PATTERN, content) if content else []
+    res = [x for x in data if len(x) > 5]
     return res
 

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-log-reader',
-    version='1.0.1',
+    version='1.1.0',
     zip_safe=False,
     packages=find_packages(),
     include_package_data=True,