microsoft
/
InQRy
зеркало из https://github.com/microsoft/InQRy.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into master

This commit is contained in:
Eric Hanko 2018-10-23 10:28:20 -07:00 коммит произвёл GitHub
Родитель 34e2df5903 e8d8a9321f
Коммит 1ee6d0d65b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 78 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
inqry/form_instructions.py
Просмотреть файл

@ -10,7 +10,7 @@ class FormInstructions:
specs.drive1, specs.drive2,
specs.drive3, specs.drive4],
'Portable': [self.processor, specs.memory,
specs.drive1]}
specs.drive1]}
self.model_identifier = specs.model_identifier
self.model_name = specs.model_name
@ -32,9 +32,10 @@ class FormInstructions:
def new_asset(self, asset_tag, user, form_type) -> str:
status = 'Ready'
return barcode.textify(asset_tag) + barcode.listify(self.model_identifier) + self.get_asset_sequence(
form_type) + barcode.listify(status) + self.get_user_sequence(user) + barcode.delayify(
self.serial_number)
return (
barcode.textify(asset_tag) + barcode.listify(self.model_identifier) + self.get_asset_sequence(form_type)
+ barcode.listify(status) + self.get_user_sequence(user) + barcode.delayify(self.serial_number)
)
def new_model(self) -> str:
return barcode.textify(self.model_name) + barcode.tabify(2) + barcode.delayify(

24
inqry/gui.py
Просмотреть файл

@ -74,8 +74,8 @@ class InQRyGUI: # TODO: Extract GUI attributes to methods
def gather_user_input(self) -> tuple:
if self.qrcode_selection.get() == 'New Model':
return self.qrcode_selection.get(), None, None, self.form_selection.get()
else:
return self.qrcode_selection.get(), self.get_asset_tag(), self.get_alias(), self.form_selection.get()
return self.qrcode_selection.get(), self.get_asset_tag(), self.get_alias(), self.form_selection.get()
def _validate_field_contents(self, contents, field):
patterns = {'Alias': (re.compile(r'^(v\-)?[A-Za-z]+$'),
@ -84,12 +84,13 @@ class InQRyGUI: # TODO: Extract GUI attributes to methods
'The Asset Tag has to be an E followed by 7 numbers. The E can be ommited.')}
validator, human_readable = patterns[field]
if bool(re.match(validator, contents)):
return contents
else:
error_message = '{} is not properly formatted. {}'.format(field, human_readable)
error_message_box(error_message)
raise ValueError(error_message)
error_message = '{} is not properly formatted.'.format(field)
error_message_box(error_message)
raise ValueError(error_message)
def get_alias(self):
return self._validate_field_contents(self.alias_entry.get(), 'Alias')
@ -125,12 +126,13 @@ def mobile_capability(): # TODO: Re-implement mobile_capability() into GUI
return 'active'
except FileNotFoundError:
print(
'''
No such file or directory: "/usr/local/bin/cfgutil"
'''
No such file or directory: "/usr/local/bin/cfgutil"
You must install cfgutil using Apple Configurator in order to
use InQRy with a mobile device.
''')
You must install cfgutil using Apple Configurator in order to
use InQRy with a mobile device.
'''
)
return 'disable'
else:
pass

4
inqry/system_specs/__init__.py
Просмотреть файл

@ -16,5 +16,5 @@ def _human_readable(component):
size = round(int(component) / 10 ** 9)
if size >= 1000:
return str(size / 1000) + " TB"
else:
return str(size) + " GB"
return str(size) + " GB"

4
inqry/system_specs/windisk.py
Просмотреть файл

@ -59,5 +59,5 @@ class Disk(object):
size = round(int(component) / 10 ** 9)
if size >= 1000:
return str(size / 1000) + " TB"
else:
return str(size) + " GB"
return str(size) + " GB"

72
setup.py
Просмотреть файл

@ -24,41 +24,45 @@ try:
with open('Info.plist', 'rb') as plist_file:
plist = plistlib.load(plist_file)
plist.update(dict(
CFBundleVersion=__version__,
CFBundleShortVersionString=__version__,
CFBundleName='InQRy',
NSHumanReadableCopyright=__copyright__))
CFBundleVersion=__version__,
CFBundleShortVersionString=__version__,
CFBundleName='InQRy',
NSHumanReadableCopyright=__copyright__
))
except FileNotFoundError:
plist = None
setup(
name='inqry',
app=['inqry/__main__.py'],
author=[__author__],
author_email=__email__,
description='A cross-platform utility used to generate a QR code containing hardware specs',
license=__license__,
long_description=__description__,
packages=['inqry', 'inqry.system_specs'],
install_requires=['Pillow',
'pytest',
'PyYAML',
'qrcode',
'wmi;platform_system=="Windows"',
'pypiwin32;platform_system=="Windows"'],
tests_require=['pytest'],
url='https://github.com/Microsoft/InQRy',
version=__version__,
classifiers=[
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Intended Audience :: Information Technology',
'Intended Audience :: System Administrators',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only'],
options=dict(
py2app=dict(
plist=plist)))
name='inqry',
app=['inqry/__main__.py'],
author=[__author__],
author_email=__email__,
description='A cross-platform utility used to generate a QR code containing hardware specs',
license=__license__,
long_description=__description__,
packages=['inqry', 'inqry.system_specs'],
install_requires=['Pillow',
'pytest',
'PyYAML',
'qrcode',
'wmi;platform_system=="Windows"',
'pypiwin32;platform_system=="Windows"'],
tests_require=['pytest'],
url='https://github.com/Microsoft/InQRy',
version=__version__,
classifiers=[
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Intended Audience :: Information Technology',
'Intended Audience :: System Administrators',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only'],
options=dict(
py2app=dict(
plist=plist
)
)
)

1
tests/generic/test_form_instructions.py
Просмотреть файл

@ -11,6 +11,7 @@ def test_new_asset_method():
assert instructions.new_asset('1234567', 'admin',
'Desktop') == '~d1234567~d~t~d ~dMacPro6,1~d~e~d~t~d3.7 GHz Quad-Core Intel Xeon E5~d~t~d32 GB~d~t~d3.0 TB HDD (APPLE HDD ST3000DM001)~d~t~d121.3 GB SSD (APPLE SSD SM0128G)~d~t~d~t~d~t~d ~dReady~d~e~d~t~d ~d(admin)~d~e~d~t~dF5KQH0P9F9VN'
def test_new_model_method():
instructions = form_instructions.FormInstructions(MAC_SYSTEM_SPECS)
assert instructions.new_model() == '~dMac Pro~d~t~t~t~dMacPro6,1'

2
tests/ios/cfgutil/test_parsing_cfgutil_output_iphone.py
Просмотреть файл

@ -2,7 +2,7 @@ from inqry.system_specs import cfgutil
CFGUTIL_OUTPUT = '''
{"Command":"get","Output":{"0xA64D620D30D26":{"serialNumber":"F71SHPP0HG6W", "totalDiskCapacity":32000000000,
"deviceType":"iPhone9,1","IMEI":"359167076630320","color":"1"},"Errors":{"0xA64D620D30D26":{}}},
"deviceType":"iPhone9,1","IMEI":"359167076630320","color":"1"},"Errors":{"0xA64D620D30D26":{}}},
"Type":"CommandOutput","Devices":["0xA64D620D30D26"]}
'''

2
tests/mac/diskutil/test_getting_identifiers_disk_images.py
Просмотреть файл

@ -50,7 +50,7 @@ DISKUTIL_LIST_OUTPUT = '''
1: EFI EFI 209.7 MB disk7s1
2: Apple_RAID 999.9 GB disk7s2
3: Apple_Boot Boot OS X 134.2 MB disk7s3
/dev/disk8 (external, virtual):
#: TYPE NAME SIZE IDENTIFIER
0: Apple_HFS RedBackup +2.0 TB disk8

30
tests/windows/windisk/test_representing_surface_ssd_storage.py
Просмотреть файл

@ -15,35 +15,35 @@ SpindleSpeed : 0
ObjectId : {1}\\MININT-MSGHJGV\root/Microsoft/Windows/Storage/Providers_v2
\SPACES_PhysicalDisk.ObjectId="{7869a9f6-d79a-11e6-84dd-806e6f6e6963}:PD:{ed172607-d72a-1b5a-f
367-403fe45ca8d5}"
PassThroughClass :
PassThroughIds :
PassThroughNamespace :
PassThroughServer :
PassThroughClass :
PassThroughIds :
PassThroughNamespace :
PassThroughServer :
UniqueId : eui.0025384161B6798A
Description :
Description :
FriendlyName : SAMSUNG MZFLV256HCHP-000MV
Manufacturer :
Manufacturer :
Model : SAMSUNG MZFLV256HCHP-000MV
OperationalDetails :
OperationalDetails :
PhysicalLocation : PCI Slot 4 : Adapter 0
SerialNumber : 0025_3841_61B6_798A.
AdapterSerialNumber : S245NXCH108281
AdapterSerialNumber : S245NXCH108281
AllocatedSize : 256060514304
CanPool : False
DeviceId : 0
EnclosureNumber :
EnclosureNumber :
FirmwareVersion : BXV75M0Q
IsIndicationEnabled :
IsIndicationEnabled :
IsPartial : True
LogicalSectorSize : 512
OtherCannotPoolReasonDescription :
PartNumber :
OtherCannotPoolReasonDescription :
PartNumber :
PhysicalSectorSize : 512
Size : 256060514304
SlotNumber :
SoftwareVersion :
SlotNumber :
SoftwareVersion :
VirtualDiskFootprint : 0
PSComputerName :
PSComputerName :
CimClass : root/microsoft/windows/storage:MSFT_PhysicalDisk
CimInstanceProperties : {ObjectId, PassThroughClass, PassThroughIds, PassThroughNamespace...}
CimSystemProperties : Microsoft.Management.Infrastructure.CimSystemProperties