Skip to content
Snippets Groups Projects
Commit 330373ac authored by Leonard Penzer's avatar Leonard Penzer
Browse files

make raw.json filename a command line argument

parent 2bf9d975
No related branches found
No related tags found
No related merge requests found
...@@ -7,8 +7,13 @@ import os ...@@ -7,8 +7,13 @@ import os
import sys import sys
import pprint import pprint
import requests import requests
import argparse
MAC_URL = 'http://macvendors.co/api/%s' MAC_URL = 'http://macvendors.co/api/%s'
ap = argparse.ArgumentParser()
ap.add_argument("--raw", type=argparse.FileType("r", encoding="utf-8"), required=True)
args = ap.parse_args()
def getHardwareModelFromEntry(d): def getHardwareModelFromEntry(d):
try: try:
hardware_model = d["nodeinfo"]["hardware"]["model"] hardware_model = d["nodeinfo"]["hardware"]["model"]
...@@ -90,10 +95,7 @@ for f in allNewFirmwareDownloads: ...@@ -90,10 +95,7 @@ for f in allNewFirmwareDownloads:
json.dump(allFirmwareDownloads,open("firmwareDownloads.json","w"),sort_keys=True, indent=4, separators=(',', ': ')) json.dump(allFirmwareDownloads,open("firmwareDownloads.json","w"),sort_keys=True, indent=4, separators=(',', ': '))
nodesdbFilename = "/home/www/html/netinfo/json/nodesdb.json" data = json.load(args.raw)
if not os.path.isfile(nodesdbFilename):
nodesdbFilename = "nodesdb.json"
data = json.load(open(nodesdbFilename, encoding='utf-8'))
for download in allFirmwareDownloads: for download in allFirmwareDownloads:
try: try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment