Update oui.json

halo · Feb 13, 2024 · e31173c · e31173c
1 parent dc91b66
commit e31173c
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 93 deletions.
diff --git a/--help b/--help
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 4.0.0
+
+Rewrite everything from scratch.
+
 # 3.2.0
 
 * [FEATURE] If connected to a network, re-associate to the same SSID after a disconnect to change the MAC address.

diff --git a/LinkLiar.xcodeproj/project.pbxproj b/LinkLiar.xcodeproj/project.pbxproj
@@ -1270,7 +1270,7 @@
 				CODE_SIGN_ENTITLEMENTS = LinkLiar/LinkLiar.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"LinkLiar/Preview Content\"";
 				DEVELOPMENT_TEAM = B9J4QR64LK;
@@ -1300,7 +1300,7 @@
 				CODE_SIGN_ENTITLEMENTS = LinkLiar/LinkLiar.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"LinkLiar/Preview Content\"";
 				DEVELOPMENT_TEAM = B9J4QR64LK;

diff --git a/LinkLiar/oui.json b/LinkLiar/oui.json
diff --git a/LinkTools/Backends/PopularVendorsDatabase.swift b/LinkTools/Backends/PopularVendorsDatabase.swift
diff --git a/airport b/airport
diff --git a/bin/vendors b/bin/vendors
@@ -31,5 +31,8 @@ result.push '}'
 
 path = Pathname.new('LinkTools/Backends/PopularVendorsDatabase.swift')
 puts "Writing to #{path}"
-
 path.write result.join("\n")
+
+path = Pathname.new('LinkLiar/oui.json')
+puts "Writing to #{path}"
+path.write Macs::Vendors.as_json.to_json
diff --git a/lib/macs/vendor.rb b/lib/macs/vendor.rb
@@ -37,8 +37,7 @@ def to_s
 
     def to_swift_ouis
       # E.g. `"ibm": ["IBM": [0x3440b5,0x40f2e9,0x98be94,0xa897dc]],`
-      %|      // #{@name}   #{prefixes.join(',')}| + "\n" +
-        %|      "#{id}": ["#{name}": [#{prefixes.map { "0x#{_1.to_i(16).to_s(16).to_s.rjust(6, '0')}" }.join(',')}]],|
+      %|      "#{id}": ["#{name}": [#{prefixes.map { "0x#{_1.to_i(16).to_s(16).to_s.rjust(6, '0')}" }.join(',')}]],|
     end
 
     def to_swift_counts

diff --git a/lib/macs/vendors.rb b/lib/macs/vendors.rb
@@ -15,10 +15,21 @@ def self.all
       result.values.select(&:popular?).sort
     end
 
+    def self.as_json
+      result = {}
+
+      rows do |row|
+        result[row.first] = row.last
+      end
+
+      result
+    end
+
     # See https://mac2vendor.com/articles/download
     def self.rows
       URI.open('https://mac2vendor.com/download/vendorMacs.prop') do |file|
         CSV.foreach(file, liberal_parsing: true, col_sep: '=') do |row|
+          next if row.first.start_with?('*')
           yield row
         end
       end