From e135fd9d288e1d786d9b6286e67a47e7170f6a35 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 15 Jul 2024 16:23:14 +0200 Subject: [PATCH] new version with xapian --- dashboard/mixins.py | 4 +- dashboard/templates/unassigned_devices.html | 4 +- dashboard/views.py | 30 +- device/templates/details.html | 21 +- device/urls.py | 6 +- device/views.py | 30 +- dhub/settings.py | 5 +- snapshot/migrations/0004_anotation.py | 41 ++ .../0005_annotation_delete_anotation.py | 44 ++ snapshot/models.py | 10 +- snapshot/parse.py | 677 +----------------- snapshot/views.py | 16 +- snapshot/xapian.py | 22 + utils/constants.py | 1 + 14 files changed, 233 insertions(+), 678 deletions(-) create mode 100644 snapshot/migrations/0004_anotation.py create mode 100644 snapshot/migrations/0005_annotation_delete_anotation.py create mode 100644 snapshot/xapian.py diff --git a/dashboard/mixins.py b/dashboard/mixins.py index a6c372c..df9d6d1 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -61,7 +61,7 @@ class DetailsMixin(DashboardView, TemplateView): }) return context - + class InventaryMixin(DashboardView, TemplateView): def post(self, request, *args, **kwargs): @@ -76,5 +76,3 @@ class InventaryMixin(DashboardView, TemplateView): except Exception: pass return super().get(request, *args, **kwargs) - - diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html index bc1365f..df71266 100644 --- a/dashboard/templates/unassigned_devices.html +++ b/dashboard/templates/unassigned_devices.html @@ -44,7 +44,9 @@ - {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }} + + {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }} + diff --git a/dashboard/views.py b/dashboard/views.py index 16c34b1..c42d997 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -1,7 +1,11 @@ +import json + from django.utils.translation import gettext_lazy as _ from django.db.models import Count from dashboard.mixins import InventaryMixin, DetailsMixin from device.models import Device +from snapshot.xapian import search +from snapshot.models import Annotation from lot.models import Lot @@ -13,11 +17,29 @@ class UnassignedDevicesView(InventaryMixin): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - devices = Device.objects.filter( - owner=self.request.user - ).annotate(num_lots=Count('lot')).filter(num_lots=0) + annotations = Annotation.objects.filter( + owner=self.request.user).filter( + key="hidalgo1").order_by('created') + # 'created').distinct('value') + # ).annotate(num_lots=Count('lot')).filter(num_lots=0) + + hids = {} + ids = [] + for x in annotations: + if not hids.get(x.key): + hids[x.key] = x.uuid + ids.append(str(x.uuid)) + + devices = [] + for xa in search(ids): + # import pdb; pdb.set_trace() + snap = json.loads(xa.document.get_data()) + dev = snap.get("device", {}) + dev["id"] = snap["uuid"] + devices.append(dev) + context.update({ - 'devices': devices, + 'devices': devices }) return context diff --git a/device/templates/details.html b/device/templates/details.html index f5d484d..28261a8 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -4,7 +4,7 @@ {% block content %}
-

{{ object.pk }}

+

{{ object.uuid }}

@@ -45,16 +45,16 @@
Details
- (Edit Device) + (Edit Device)
- {%if object.hid %}Snapshot{% else %}Placeholder{% endif %} + {% if object.hid %}Snapshot{% else %}Placeholder{% endif %}
Phid
-
{{ object.id }}
+
{{ object.uuid }}
@@ -69,22 +69,17 @@
Manufacturer
-
{{ object.manufacturer|default:"" }}
+
{{ object.device.manufacturer|default:"" }}
Model
-
{{ object.model|default:"" }}
-
- -
-
Part Number
-
{{ object.part_number|default:"" }}
+
{{ object.device.model|default:"" }}
Serial Number
-
{{ object.serial_number|default:"" }}
+
{{ object.device.serialNumber|default:"" }}
@@ -92,7 +87,7 @@
Physical Properties
- (Edit Physical Properties) + (Edit Physical Properties)
diff --git a/device/urls.py b/device/urls.py index 8445449..33260e9 100644 --- a/device/urls.py +++ b/device/urls.py @@ -5,7 +5,7 @@ app_name = 'device' urlpatterns = [ path("add/", views.NewDeviceView.as_view(), name="add"), - path("edit//", views.EditDeviceView.as_view(), name="edit"), - path("/", views.DetailsView.as_view(), name="details"), - path("physical//", views.PhysicalView.as_view(), name="physical_edit"), + path("edit//", views.EditDeviceView.as_view(), name="edit"), + path("/", views.DetailsView.as_view(), name="details"), + path("physical//", views.PhysicalView.as_view(), name="physical_edit"), ] diff --git a/device/views.py b/device/views.py index 249ee1e..0285529 100644 --- a/device/views.py +++ b/device/views.py @@ -1,3 +1,5 @@ +import json + from django.urls import reverse_lazy from django.shortcuts import get_object_or_404 from django.utils.translation import gettext_lazy as _ @@ -5,7 +7,10 @@ from django.views.generic.edit import ( CreateView, UpdateView, ) +from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, DetailsMixin +from snapshot.models import Annotation +from snapshot.xapian import search from device.models import Device, PhysicalProperties @@ -64,12 +69,35 @@ class EditDeviceView(DashboardView, UpdateView): return kwargs -class DetailsView(DetailsMixin): +class DetailsView2(DetailsMixin): template_name = "details.html" title = _("Device") breadcrumb = "Device / Details" model = Device +class DetailsView(DashboardView, TemplateView): + template_name = "details.html" + title = _("Device") + breadcrumb = "Device / Details" + + def get(self, request, *args, **kwargs): + # import pdb; pdb.set_trace() + self.pk = kwargs['pk'] + annotation = get_object_or_404(Annotation, owner=self.request.user, uuid=self.pk) + for xa in search([str(self.pk)]): + self.object = json.loads(xa.document.get_data()) + return super().get(request, *args, **kwargs) + + return super().get(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({ + 'object': self.object, + }) + return context + + class PhysicalView(DashboardView, UpdateView): template_name = "physical_properties.html" diff --git a/dhub/settings.py b/dhub/settings.py index 0dc2788..6444f43 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -10,6 +10,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/5.0/ref/settings/ """ +import xapian + from pathlib import Path from django.contrib.messages import constants as messages from decouple import config, Csv @@ -92,11 +94,10 @@ WSGI_APPLICATION = "dhub.wsgi.application" DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "NAME": BASE_DIR / "db/db.sqlite3", } } - # Password validation # https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators diff --git a/snapshot/migrations/0004_anotation.py b/snapshot/migrations/0004_anotation.py new file mode 100644 index 0000000..f2e6887 --- /dev/null +++ b/snapshot/migrations/0004_anotation.py @@ -0,0 +1,41 @@ +# Generated by Django 5.0.6 on 2024-07-15 09:20 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("snapshot", "0003_remove_snapshot_start_time"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="anotation", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("uuid", models.UUIDField(unique=True)), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + ] diff --git a/snapshot/migrations/0005_annotation_delete_anotation.py b/snapshot/migrations/0005_annotation_delete_anotation.py new file mode 100644 index 0000000..10c2ded --- /dev/null +++ b/snapshot/migrations/0005_annotation_delete_anotation.py @@ -0,0 +1,44 @@ +# Generated by Django 5.0.6 on 2024-07-15 09:21 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("snapshot", "0004_anotation"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="Annotation", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("uuid", models.UUIDField(unique=True)), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + migrations.DeleteModel( + name="anotation", + ), + ] diff --git a/snapshot/models.py b/snapshot/models.py index 72919ee..868b25a 100644 --- a/snapshot/models.py +++ b/snapshot/models.py @@ -1,5 +1,5 @@ from django.db import models -from utils.constants import STR_SM_SIZE +from utils.constants import STR_SM_SIZE, STR_EXTEND_SIZE from user.models import User from device.models import Computer, Component @@ -29,3 +29,11 @@ class Snapshot(models.Model): computer = models.ForeignKey(Computer, on_delete=models.CASCADE) components = models.ManyToManyField(Component) + +class Annotation(models.Model): + created = models.DateTimeField(auto_now_add=True) + uuid = models.UUIDField(unique=True) + owner = models.ForeignKey(User, on_delete=models.CASCADE) + key = models.CharField(max_length=STR_EXTEND_SIZE) + value = models.CharField(max_length=STR_EXTEND_SIZE) + diff --git a/snapshot/parse.py b/snapshot/parse.py index b09c5fa..f6ce559 100644 --- a/snapshot/parse.py +++ b/snapshot/parse.py @@ -1,15 +1,15 @@ import os import json import shutil +import xapian import hashlib from datetime import datetime -from django.conf import settings -from device.models import Device, Computer -from snapshot.models import Snapshot +from snapshot.models import Snapshot, Annotation +from snapshot.xapian import search, indexer, database -HID = [ +HID_ALGO1 = [ "manufacturer", "model", "chassis", @@ -23,651 +23,44 @@ class Build: self.json = snapshot_json self.user = user self.hid = None - self.result = False - self.save_disk() - self.json_device = self.json["device"] - self.json_components = self.json["components"] - self.uuid = self.json["uuid"] - self.get_hid() - self.gen_computer() - self.gen_components() - self.gen_actions() - self.gen_snapshot() + self.index() + self.create_annotation() - self.result = True - self.move_json() - - def save_disk(self): - snapshot_path = settings.SNAPSHOT_PATH - user = self.user.email - uuid = self.json.get("uuid", "") - now = datetime.now().strftime("%Y-%m-%d-%H-%M") - filename = f"{now}_{user}_{uuid}.json" - path_dir_base = os.path.join(snapshot_path, user) - path_upload = os.path.join(path_dir_base, 'upload') - path_name = os.path.join(path_upload, filename) - self.filename = path_name - self.path_dir_base = path_dir_base - - if not os.path.isdir(path_dir_base): - os.system(f'mkdir -p {path_upload}') - - with open(path_name, 'w') as file: - file.write(json.dumps(self.json)) - - def move_json(self): - if not self.result: + def index(self): + matches = search(self.json['uuid'], limit=1) + if matches.size() > 0: return - shutil.copy(self.filename, self.path_dir_base) - os.remove(self.filename) + snap = json.dumps(self.json) + doc = xapian.Document() + doc.set_data(snap) - def get_hid(self): - hid = "" - for f in HID: - hid += "-" + self.json_device[f] - self.hid = hid + indexer.set_document(doc) + indexer.index_text(snap) - def gen_computer(self): - self.device = Device.objects.filter( - hid=self.hid, - active=True, - reliable=True, - owner=self.user - ).first() + # Add the document to the database. + database.add_document(doc) - if self.device: - return + def get_hid_14(self): + device = self.json['device'] + manufacturer = device.get("manufacturer", '') + model = device.get("model", '') + chassis = device.get("chassis", '') + serial_number = device.get("serialNumber", '') + sku = device.get("sku", '') + hid = f"{manufacturer}{model}{chassis}{serial_number}{sku}" + return hashlib.sha3_256(hid.encode()).hexdigest() - chid = hashlib.sha3_256(self.hid.encode()).hexdigest() - self.device = Device.objects.create( - serial_number=self.json_device["serialNumber"], - manufacturer=self.json_device["manufacturer"], - version=self.json_device["version"], - model=self.json_device["model"], - type=self.json_device["type"], - hid=self.hid, - chid=chid, - owner=self.user + def create_annotation(self): + uuid = self.json['uuid'] + owner = self.user + key = 'hidalgo1' + value = self.get_hid_14() + Annotation.objects.create( + uuid=uuid, + owner=owner, + key=key, + value=value ) - Computer.objects.create( - device=self.device, - sku=self.json_device["sku"], - chassis=self.json_device["chassis"] - ) - - def gen_snapshot(self): - self.snapshot = Snapshot.objects.create( - uuid = self.uuid, - version = self.json["version"], - computer = self.device.computer, - sid = self.json.get("sid", ""), - settings_version = self.json.get("settings_version", ""), - end_time = self.json.get("endTime"), - owner=self.user - ) - - def gen_components(self): - pass - - def gen_actions(self): - pass - - -# class ParseSnapshot: -# def __init__(self, snapshot, default="n/a"): -# self.default = default -# self.dmidecode_raw = snapshot["hwmd"]["dmidecode"] -# self.smart_raw = snapshot["hwmd"]["smart"] -# self.hwinfo_raw = snapshot["hwmd"]["hwinfo"] -# self.lshw_raw = snapshot["hwmd"]["lshw"] -# self.lscpi_raw = snapshot["hwmd"]["lspci"] -# self.sanitize_raw = snapshot.get("sanitize", []) -# self.device = {"actions": []} -# self.components = [] -# self.monitors = [] - -# self.dmi = DMIParse(self.dmidecode_raw) -# self.smart = self.loads(self.smart_raw) -# self.lshw = self.loads(self.lshw_raw) -# self.hwinfo = self.parse_hwinfo() - -# self.set_computer() -# self.get_hwinfo_monitors() -# self.set_components() -# self.snapshot_json = { -# "type": "Snapshot", -# "device": self.device, -# "software": "Workbench", -# # "software": snapshot["software"], -# "components": self.components, -# "uuid": snapshot['uuid'], -# "version": "15.0.0", -# # "version": snapshot['version'], -# "settings_version": snapshot['settings_version'], -# "endTime": snapshot["timestamp"], -# "elapsed": 1, -# "sid": snapshot["sid"], -# } - -# def get_snapshot(self): -# return Snapshot().load(self.snapshot_json) - -# def set_computer(self): -# self.device['manufacturer'] = self.dmi.manufacturer().strip() -# self.device['model'] = self.dmi.model().strip() -# self.device['serialNumber'] = self.dmi.serial_number() -# self.device['type'] = self.get_type() -# self.device['sku'] = self.get_sku() -# self.device['version'] = self.get_version() -# self.device['system_uuid'] = self.get_uuid() -# self.device['family'] = self.get_family() -# self.device['chassis'] = self.get_chassis_dh() - -# def set_components(self): -# self.get_cpu() -# self.get_ram() -# self.get_mother_board() -# self.get_graphic() -# self.get_data_storage() -# self.get_display() -# self.get_sound_card() -# self.get_networks() - -# def get_cpu(self): -# for cpu in self.dmi.get('Processor'): -# serial = cpu.get('Serial Number') -# if serial == 'Not Specified' or not serial: -# serial = cpu.get('ID').replace(' ', '') -# self.components.append( -# { -# "actions": [], -# "type": "Processor", -# "speed": self.get_cpu_speed(cpu), -# "cores": int(cpu.get('Core Count', 1)), -# "model": cpu.get('Version'), -# "threads": int(cpu.get('Thread Count', 1)), -# "manufacturer": cpu.get('Manufacturer'), -# "serialNumber": serial, -# "generation": None, -# "brand": cpu.get('Family'), -# "address": self.get_cpu_address(cpu), -# } -# ) - -# def get_ram(self): -# for ram in self.dmi.get("Memory Device"): -# if ram.get('size') == 'No Module Installed': -# continue -# if not ram.get("Speed"): -# continue - -# self.components.append( -# { -# "actions": [], -# "type": "RamModule", -# "size": self.get_ram_size(ram), -# "speed": self.get_ram_speed(ram), -# "manufacturer": ram.get("Manufacturer", self.default), -# "serialNumber": ram.get("Serial Number", self.default), -# "interface": ram.get("Type", "DDR"), -# "format": ram.get("Form Factor", "DIMM"), -# "model": ram.get("Part Number", self.default), -# } -# ) - -# def get_mother_board(self): -# for moder_board in self.dmi.get("Baseboard"): -# self.components.append( -# { -# "actions": [], -# "type": "Motherboard", -# "version": moder_board.get("Version"), -# "serialNumber": moder_board.get("Serial Number", "").strip(), -# "manufacturer": moder_board.get("Manufacturer", "").strip(), -# "biosDate": self.get_bios_date(), -# "ramMaxSize": self.get_max_ram_size(), -# "ramSlots": len(self.dmi.get("Memory Device")), -# "slots": self.get_ram_slots(), -# "model": moder_board.get("Product Name", "").strip(), -# "firewire": self.get_firmware_num(), -# "pcmcia": self.get_pcmcia_num(), -# "serial": self.get_serial_num(), -# "usb": self.get_usb_num(), -# } -# ) - -# def get_graphic(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'display') -# for c in nodes: -# if not c['configuration'].get('driver', None): -# continue - -# self.components.append( -# { -# "actions": [], -# "type": "GraphicCard", -# "memory": self.get_memory_video(c), -# "manufacturer": c.get("vendor", self.default), -# "model": c.get("product", self.default), -# "serialNumber": c.get("serial", self.default), -# } -# ) - -# def get_memory_video(self, c): -# # get info of lspci -# # pci_id = c['businfo'].split('@')[1] -# # lspci.get(pci_id) | grep size -# # lspci -v -s 00:02.0 -# return None - -# def get_data_storage(self): -# for sm in self.smart: -# if sm.get('smartctl', {}).get('exit_status') == 1: -# continue -# model = sm.get('model_name') -# manufacturer = None -# if model and len(model.split(" ")) > 1: -# mm = model.split(" ") -# model = mm[-1] -# manufacturer = " ".join(mm[:-1]) - -# self.components.append( -# { -# "actions": self.sanitize(sm), -# "type": self.get_data_storage_type(sm), -# "model": model, -# "manufacturer": manufacturer, -# "serialNumber": sm.get('serial_number'), -# "size": self.get_data_storage_size(sm), -# "variant": sm.get("firmware_version"), -# "interface": self.get_data_storage_interface(sm), -# } -# ) - -# def sanitize(self, disk): -# disk_sanitize = None -# for d in self.sanitize_raw: -# s = d.get('device_info', {}).get('export_data', {}) -# s = s.get('block', {}).get('serial') -# if s == disk.get('serial_number'): -# disk_sanitize = d -# break -# if not disk_sanitize: -# return [] - -# steps = [] -# step_type = 'EraseBasic' -# if d.get("method", {}).get('name') == 'Baseline Cryptographic': -# step_type = 'EraseCrypto' - -# if disk.get('type') == 'EraseCrypto': -# step_type = 'EraseCrypto' - -# erase = { -# 'type': step_type, -# 'severity': "Info", -# 'steps': steps, -# 'startTime': None, -# 'endTime': None, -# } -# severities = [] - -# for step in disk_sanitize.get('steps', []): -# severity = "Info" -# if not step['success']: -# severity = "Error" - -# steps.append( -# { -# 'severity': severity, -# 'startTime': unix_isoformat(step['start_time']), -# 'endTime': unix_isoformat(step['end_time']), -# 'type': 'StepRandom', -# } -# ) -# severities.append(severity) - -# erase['endTime'] = unix_isoformat(step['end_time']) -# if not erase['startTime']: -# erase['startTime'] = unix_isoformat(step['start_time']) - -# if "Error" in severities: -# erase['severity'] = "Error" - -# return [erase] - -# def get_networks(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'network') -# for c in nodes: -# capacity = c.get('capacity') -# units = c.get('units') -# speed = None -# if capacity and units: -# speed = unit.Quantity(capacity, units).to('Mbit/s').m -# wireless = bool(c.get('configuration', {}).get('wireless', False)) -# self.components.append( -# { -# "actions": [], -# "type": "NetworkAdapter", -# "model": c.get('product'), -# "manufacturer": c.get('vendor'), -# "serialNumber": c.get('serial'), -# "speed": speed, -# "variant": c.get('version', 1), -# "wireless": wireless, -# } -# ) - -# def get_sound_card(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'multimedia') -# for c in nodes: -# self.components.append( -# { -# "actions": [], -# "type": "SoundCard", -# "model": c.get('product'), -# "manufacturer": c.get('vendor'), -# "serialNumber": c.get('serial'), -# } -# ) - -# def get_display(self): # noqa: C901 -# TECHS = 'CRT', 'TFT', 'LED', 'PDP', 'LCD', 'OLED', 'AMOLED' - -# for c in self.monitors: -# resolution_width, resolution_height = (None,) * 2 -# refresh, serial, model, manufacturer, size = (None,) * 5 -# year, week, production_date = (None,) * 3 - -# for x in c: -# if "Vendor: " in x: -# manufacturer = x.split('Vendor: ')[-1].strip() -# if "Model: " in x: -# model = x.split('Model: ')[-1].strip() -# if "Serial ID: " in x: -# serial = x.split('Serial ID: ')[-1].strip() -# if " Resolution: " in x: -# rs = x.split(' Resolution: ')[-1].strip() -# if 'x' in rs: -# resolution_width, resolution_height = [ -# int(r) for r in rs.split('x') -# ] -# if "Frequencies: " in x: -# try: -# refresh = int(float(x.split(',')[-1].strip()[:-3])) -# except Exception: -# pass -# if 'Year of Manufacture' in x: -# year = x.split(': ')[1] - -# if 'Week of Manufacture' in x: -# week = x.split(': ')[1] - -# if "Size: " in x: -# size = self.get_size_monitor(x) -# technology = next((t for t in TECHS if t in c[0]), None) - -# if year and week: -# d = '{} {} 0'.format(year, week) -# production_date = datetime.strptime(d, '%Y %W %w').isoformat() - -# self.components.append( -# { -# "actions": [], -# "type": "Display", -# "model": model, -# "manufacturer": manufacturer, -# "serialNumber": serial, -# 'size': size, -# 'resolutionWidth': resolution_width, -# 'resolutionHeight': resolution_height, -# "productionDate": production_date, -# 'technology': technology, -# 'refreshRate': refresh, -# } -# ) - -# def get_hwinfo_monitors(self): -# for c in self.hwinfo: -# monitor = None -# external = None -# for x in c: -# if 'Hardware Class: monitor' in x: -# monitor = c -# if 'Driver Info' in x: -# external = c - -# if monitor and not external: -# self.monitors.append(c) - -# def get_size_monitor(self, x): -# i = 1 / 25.4 -# t = x.split('Size: ')[-1].strip() -# tt = t.split('mm') -# if not tt: -# return 0 -# sizes = tt[0].strip() -# if 'x' not in sizes: -# return 0 -# w, h = [int(x) for x in sizes.split('x')] -# return numpy.sqrt(w**2 + h**2) * i - -# def get_cpu_address(self, cpu): -# default = 64 -# for ch in self.lshw.get('children', []): -# for c in ch.get('children', []): -# if c['class'] == 'processor': -# return c.get('width', default) -# return default - -# def get_usb_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "USB" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_serial_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "SERIAL" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_firmware_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "FIRMWARE" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_pcmcia_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "PCMCIA" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_bios_date(self): -# return self.dmi.get("BIOS")[0].get("Release Date", self.default) - -# def get_firmware(self): -# return self.dmi.get("BIOS")[0].get("Firmware Revision", '1') - -# def get_max_ram_size(self): -# size = 0 -# for slot in self.dmi.get("Physical Memory Array"): -# capacity = slot.get("Maximum Capacity", '0').split(" ")[0] -# size += int(capacity) - -# return size - -# def get_ram_slots(self): -# slots = 0 -# for x in self.dmi.get("Physical Memory Array"): -# slots += int(x.get("Number Of Devices", 0)) -# return slots - -# def get_ram_size(self, ram): -# try: -# memory = ram.get("Size", "0") -# memory = memory.split(' ') -# if len(memory) > 1: -# size = int(memory[0]) -# units = memory[1] -# return base2.Quantity(size, units).to('MiB').m -# return int(size.split(" ")[0]) -# except Exception as err: -# logger.error("get_ram_size error: {}".format(err)) -# return 0 - -# def get_ram_speed(self, ram): -# size = ram.get("Speed", "0") -# return int(size.split(" ")[0]) - -# def get_cpu_speed(self, cpu): -# speed = cpu.get('Max Speed', "0") -# return float(speed.split(" ")[0]) / 1024 - -# def get_sku(self): -# return self.dmi.get("System")[0].get("SKU Number", self.default).strip() - -# def get_version(self): -# return self.dmi.get("System")[0].get("Version", self.default).strip() - -# def get_uuid(self): -# return self.dmi.get("System")[0].get("UUID", '').strip() - -# def get_family(self): -# return self.dmi.get("System")[0].get("Family", '') - -# def get_chassis(self): -# return self.dmi.get("Chassis")[0].get("Type", '_virtual') - -# def get_type(self): -# chassis_type = self.get_chassis() -# return self.translation_to_devicehub(chassis_type) - -# def translation_to_devicehub(self, original_type): -# lower_type = original_type.lower() -# CHASSIS_TYPE = { -# 'Desktop': [ -# 'desktop', -# 'low-profile', -# 'tower', -# 'docking', -# 'all-in-one', -# 'pizzabox', -# 'mini-tower', -# 'space-saving', -# 'lunchbox', -# 'mini', -# 'stick', -# ], -# 'Laptop': [ -# 'portable', -# 'laptop', -# 'convertible', -# 'tablet', -# 'detachable', -# 'notebook', -# 'handheld', -# 'sub-notebook', -# ], -# 'Server': ['server'], -# 'Computer': ['_virtual'], -# } -# for k, v in CHASSIS_TYPE.items(): -# if lower_type in v: -# return k -# return self.default - -# def get_chassis_dh(self): -# CHASSIS_DH = { -# 'Tower': {'desktop', 'low-profile', 'tower', 'server'}, -# 'Docking': {'docking'}, -# 'AllInOne': {'all-in-one'}, -# 'Microtower': {'mini-tower', 'space-saving', 'mini'}, -# 'PizzaBox': {'pizzabox'}, -# 'Lunchbox': {'lunchbox'}, -# 'Stick': {'stick'}, -# 'Netbook': {'notebook', 'sub-notebook'}, -# 'Handheld': {'handheld'}, -# 'Laptop': {'portable', 'laptop'}, -# 'Convertible': {'convertible'}, -# 'Detachable': {'detachable'}, -# 'Tablet': {'tablet'}, -# 'Virtual': {'_virtual'}, -# } - -# chassis = self.get_chassis() -# lower_type = chassis.lower() -# for k, v in CHASSIS_DH.items(): -# if lower_type in v: -# return k -# return self.default - -# def get_data_storage_type(self, x): -# # TODO @cayop add more SSDS types -# SSDS = ["nvme"] -# SSD = 'SolidStateDrive' -# HDD = 'HardDrive' -# type_dev = x.get('device', {}).get('type') -# trim = x.get('trim', {}).get("supported") in [True, "true"] -# return SSD if type_dev in SSDS or trim else HDD - -# def get_data_storage_interface(self, x): -# interface = x.get('device', {}).get('protocol', 'ATA') -# try: -# DataStorageInterface(interface.upper()) -# except ValueError as err: -# txt = "Sid: {}, interface {} is not in DataStorageInterface Enum".format( -# self.sid, interface -# ) -# self.errors("{}".format(err)) -# self.errors(txt, severity=Severity.Warning) -# return "ATA" - -# def get_data_storage_size(self, x): -# total_capacity = x.get('user_capacity', {}).get('bytes') -# if not total_capacity: -# return 1 -# # convert bytes to Mb -# return total_capacity / 1024**2 - -# def parse_hwinfo(self): -# hw_blocks = self.hwinfo_raw.split("\n\n") -# return [x.split("\n") for x in hw_blocks] - -# def loads(self, x): -# if isinstance(x, str): -# return json.loads(x) -# return x - -# def errors(self, txt=None, severity=Severity.Error): -# if not txt: -# return self._errors - -# logger.error(txt) -# self._errors.append(txt) -# error = SnapshotsLog( -# description=txt, -# snapshot_uuid=self.uuid, -# severity=severity, -# sid=self.sid, -# version=self.version, -# ) -# error.save() - - diff --git a/snapshot/views.py b/snapshot/views.py index 8a84d7c..0b143a9 100644 --- a/snapshot/views.py +++ b/snapshot/views.py @@ -5,7 +5,7 @@ from django.urls import reverse_lazy from dashboard.mixins import DashboardView from snapshot.models import Snapshot -from snapshot.forms import UploadForm +# from snapshot.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -31,10 +31,10 @@ class ListSnapshotsView(DashboardView, TemplateView): return context -class UploadView(DashboardView, FormView): - template_name = "upload.html" - section = "snapshots" - title = _("Upload Snapshot") - breadcrumb = "Snapshots / Upload" - success_url = reverse_lazy('snashot:list') - form_class = UploadForm +# class UploadView(DashboardView, FormView): +# template_name = "upload.html" +# section = "snapshots" +# title = _("Upload Snapshot") +# breadcrumb = "Snapshots / Upload" +# success_url = reverse_lazy('snashot:list') +# form_class = UploadForm diff --git a/snapshot/xapian.py b/snapshot/xapian.py new file mode 100644 index 0000000..8ed6261 --- /dev/null +++ b/snapshot/xapian.py @@ -0,0 +1,22 @@ +import xapian + +database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) + +indexer = xapian.TermGenerator() +stemmer = xapian.Stem("english") +indexer.set_stemmer(stemmer) + + +def search(qs, offset=0, limit=10): + query_string = str.join(' ', qs) + + qp = xapian.QueryParser() + qp.set_stemmer(stemmer) + qp.set_database(database) + qp.set_stemming_strategy(xapian.QueryParser.STEM_SOME) + query = qp.parse_query(query_string) + enquire = xapian.Enquire(database) + enquire.set_query(query) + matches = enquire.get_mset(offset, limit) + return matches + diff --git a/utils/constants.py b/utils/constants.py index d51519d..210b1c2 100644 --- a/utils/constants.py +++ b/utils/constants.py @@ -5,3 +5,4 @@ STR_XSM_SIZE = 16 STR_SM_SIZE = 32 STR_SIZE = 64 STR_BIG_SIZE = 128 +STR_EXTEND_SIZE = 256