FlashIdInfo: add URL api (with fdb version 75)

Author: PeratX

FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/JMicron.php

@@ -27,65 +27,69 @@
 use iTXTech\FlashDetector\Fdb\Fdb;
 use iTXTech\SimpleFramework\Util\StringUtil;
 
-class JMicron extends Generator{
-	public static function getDirName() : string{
+class JMicron extends Generator {
+	public static function getDirName(): string {
 		return "jm";
 	}
 
-	public static function merge(Fdb $fdb, string $data, string $filename) : void{
+	public static function merge(Fdb $fdb, string $data, string $filename): void {
 		self::mergeInternal($fdb, $data, $filename, "JMF");
 	}
 
-	protected static function mergeInternal(Fdb $fdb, string $data, string $filename, string $prefix) : void{
-		$controller = $prefix . explode("_", $filename)[0];
+	protected static function mergeInternal(Fdb $fdb, string $data, string $filename, string $prefix, bool $usePartNumber = true, bool $ignoreSanDisk = false): void {
+		$controller = strtoupper($prefix . explode("_", $filename)[0]);
 		$data = parse_ini_string($data, true);
 		$fdb->getInfo()->addController($controller);
-		foreach($data as $vendor => $flashes){
+		foreach($data as $vendor => $flashes) {
 			$vendor = str_replace(["hynix"], ["skhynix"], strtolower($vendor));
-			if(in_array($vendor, ["version", "vendor"])){
+			if(in_array($vendor, ["version", "vendor"])) {
 				continue;
 			}
-			foreach($flashes as $flash){
+			foreach($flashes as $flash) {
 				$info = explode(" ", $flash);
 				$id = "";
-				foreach($info as $k => $v){
-					if($v === ""){
+				foreach($info as $k => $v) {
+					if($v === "") {
 						unset($info[$k]);
-					}else{
+					} else {
 						$v = trim($v);
 						$info[$k] = $v;
 					}
-					if(strlen($v) == 4 and StringUtil::startsWith($v, "0x")){
+					if(strlen($v) == 4 and StringUtil::startsWith($v, "0x")) {
 						$id .= substr($v, 2, 2);
 					}
 				}
 				$info = array_values($info);
-				if($id === str_repeat("0", strlen($id))){
+				if($id === str_repeat("0", strlen($id))) {
 					continue;
 				}
 				$pn = trim($info[1]);
 
-				switch($vendor){
-					case "sandisk":
-						$pn = substr_replace($pn, "-", strpos($pn, "0"), 0);
-						break;
-					case "toshiba":
-						if(strlen($pn) > 15){
-							$pn = substr($pn, 0, 15);
-						}
-						break;
-					case "micron":
-						$pn = Micron::removePackage($pn);
-						break;
-					case "skhynix":
-						$pn = SKHynix::removePackage($pn);
-						break;
-				}
+				if($usePartNumber && !($vendor == "sandisk" and $ignoreSanDisk)) {
+					switch($vendor) {
+						case "sandisk":
+							$pn = substr_replace($pn, "-", strpos($pn, "0"), 0);
+							break;
+						case "toshiba":
+							if(strlen($pn) > 15) {
+								$pn = substr($pn, 0, 15);
+							}
+							break;
+						case "micron":
+							$pn = Micron::removePackage($pn);
+							break;
+						case "skhynix":
+							$pn = SKHynix::removePackage($pn);
+							break;
+					}
 
-				$partNumber = $fdb->getPartNumber($vendor, $pn, true)
-					->addController($controller);
-				if(strlen($id) == 12){
-					$partNumber->addFlashId($id);
+					$partNumber = $fdb->getPartNumber($vendor, $pn, true)
+						->addController($controller);
+				}
+				if(strlen($id) == 12) {
+					if(isset($partNumber)) {
+						$partNumber->addFlashId($id);
+					}
 					$fdb->getIddb()->getFlashId($id, true)->addController($controller);
 				}
 			}

FDBGen/src/iTXTech/FlashDetector/FDBGen/Generator/Maxio.php

@@ -23,13 +23,18 @@
 namespace iTXTech\FlashDetector\FDBGen\Generator;
 
 use iTXTech\FlashDetector\Fdb\Fdb;
+use iTXTech\SimpleFramework\Util\StringUtil;
 
-class Maxio extends JMicron{
-	public static function getDirName() : string{
-		return "mas";
+class Maxio extends JMicron {
+	public static function getDirName(): string {
+		return "ma";
 	}
 
-	public static function merge(Fdb $fdb, string $data, string $filename) : void{
-		self::mergeInternal($fdb, $data, $filename, "MAS");
+	public static function merge(Fdb $fdb, string $data, string $filename): void {
+		if (StringUtil::startsWith($filename, "map")) {
+			self::mergeInternal($fdb, $data, $filename, "", false, true);
+		} else {
+			self::mergeInternal($fdb, $data, $filename, "", true, true);
+		}
 	}
 }