patchman 4.0.2__tar.gz → 4.0.4__tar.gz

{patchman-4.0.2 → patchman-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchman
-Version: 4.0.2
+Version: 4.0.4
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong

patchman-4.0.4/VERSION.txt

@@ -0,0 +1 @@
+4.0.4

{patchman-4.0.2 → patchman-4.0.4}/hosts/views.py

@@ -20,6 +20,7 @@ from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
+from django_filters import rest_framework as filters
 from django_tables2 import RequestConfig
 from rest_framework import viewsets
 from taggit.models import Tag
@@ -279,13 +280,27 @@ def host_bulk_action(request):
     return redirect('hosts:host_list')
 
 
+class HostFilter(filters.FilterSet):
+    package_id = filters.NumberFilter(field_name='packages', lookup_expr='exact')
+    package_name = filters.CharFilter(field_name='packages__name__name', lookup_expr='exact')
+    package_version = filters.CharFilter(field_name='packages__version', lookup_expr='exact')
+    package_release = filters.CharFilter(field_name='packages__release', lookup_expr='exact')
+    package_epoch = filters.CharFilter(field_name='packages__epoch', lookup_expr='exact')
+    package_arch = filters.CharFilter(field_name='packages__arch__name', lookup_expr='exact')
+    tag = filters.CharFilter(field_name='tags__name', lookup_expr='exact')
+
+    class Meta:
+        model = Host
+        fields = ['hostname']
+
+
 class HostViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows hosts to be viewed or edited.
     """
     queryset = Host.objects.all()
     serializer_class = HostSerializer
-    filterset_fields = ['hostname']
+    filterset_class = HostFilter
 
 
 class HostRepoViewSet(viewsets.ModelViewSet):

{patchman-4.0.2 → patchman-4.0.4}/patchman/settings.py

@@ -49,6 +49,7 @@ TEMPLATES = [
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
                 'util.context_processors.issues_count',
+                'util.context_processors.patchman_version',
             ],
             'debug': DEBUG,
         },

{patchman-4.0.2 → patchman-4.0.4}/patchman/static/css/base.css

@@ -31,6 +31,7 @@ td.truncate-cell a { display: block; overflow: hidden; text-overflow: ellipsis;
 .sidebar-header { padding: 15px; border-bottom: 1px solid #333; }
 .sidebar-brand { color: #9d9d9d; font-size: 18px; font-weight: bold; text-decoration: none; white-space: nowrap; }
 .sidebar-brand:hover { color: #fff; text-decoration: none; }
+.sidebar-version { color: #9d9d9d; font-size: 11px; margin-top: 5px; white-space: nowrap; }
 .sidebar-toggle { background: none; border: none; color: #666; cursor: pointer; padding: 0 10px 0 0; font-size: 14px; }
 .sidebar-toggle:hover { color: #333; }
 .sidebar-toggle .glyphicon { transition: transform 0.2s; }

{patchman-4.0.2 → patchman-4.0.4}/patchman.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchman
-Version: 4.0.2
+Version: 4.0.4
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong

{patchman-4.0.2 → patchman-4.0.4}/reports/utils.py

@@ -153,7 +153,7 @@ def parse_updates(updates_string, security):
         specifying whether it is a security update or not
     """
     updates = {}
-    ulist = updates_string..split()
+    ulist = updates_string.split()
     while ulist:
         name = f'{ulist[0]} {ulist[1]} {ulist[2]}\n'
         del ulist[:3]

{patchman-4.0.2 → patchman-4.0.4}/util/context_processors.py

@@ -26,6 +26,61 @@ from repos.models import Repository
 from util import get_setting_of_type
 
 
+def _get_git_ref():
+    """Get current git ref if in a git repo."""
+    git_dir = Path(__file__).parent.parent / '.git'
+    if not git_dir.exists():
+        return None
+    try:
+        result = subprocess.run(
+            ['git', 'rev-parse', '--short', 'HEAD'],
+            capture_output=True,
+            text=True,
+            timeout=5,
+            cwd=git_dir.parent,
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+    except (subprocess.TimeoutExpired, FileNotFoundError):
+        pass
+    return None
+
+
+def _get_version():
+    """Get version from package metadata or VERSION.txt."""
+    # Try importlib.metadata first (for installed packages)
+    try:
+        from importlib.metadata import version
+        return version('patchman')
+    except Exception:
+        pass
+
+    # Fall back to VERSION.txt (for development)
+    version_file = Path(__file__).parent.parent / 'VERSION.txt'
+    try:
+        return version_file.read_text().strip()
+    except FileNotFoundError:
+        return 'unknown'
+
+
+# Cache version info at module load time (once per process)
+_PATCHMAN_VERSION = _get_version()
+_PATCHMAN_GIT_REF = _get_git_ref()
+if _PATCHMAN_GIT_REF:
+    _PATCHMAN_VERSION_DISPLAY = f'v{_PATCHMAN_VERSION} ({_PATCHMAN_GIT_REF})'
+else:
+    _PATCHMAN_VERSION_DISPLAY = f'v{_PATCHMAN_VERSION}'
+
+
+def patchman_version(request):
+    """Context processor to provide version info for navbar."""
+    return {
+        'patchman_version': _PATCHMAN_VERSION,
+        'patchman_git_ref': _PATCHMAN_GIT_REF,
+        'patchman_version_display': _PATCHMAN_VERSION_DISPLAY,
+    }
+
+
 def issues_count(request):
     """Context processor to provide issues count for navbar."""
     if not request.user.is_authenticated:

{patchman-4.0.2 → patchman-4.0.4}/util/templates/navbar.html

@@ -1,6 +1,7 @@
     <nav class="sidebar-nav">
       <div class="sidebar-header">
         <a class="sidebar-brand" href="https://github.com/furlongm/patchman">Patchman</a>
+        <div class="sidebar-version">{{ patchman_version_display }}</div>
       </div>
       <ul class="sidebar-menu">
         <li class="{% if '/hosts' in request.path %}active{% endif %}"><a href="{% url 'hosts:host_list' %}">Hosts</a></li>

patchman-4.0.2/VERSION.txt

@@ -1 +0,0 @@
-4.0.2