zerosdev
diff --git a/‎src/Commands/Font.php
Lines changed: 27 additions & 9 deletions b/‎src/Commands/Font.php
Lines changed: 27 additions & 9 deletions
diff --git a/‎src/ServiceProvider.php
Lines changed: 1 addition & 1 deletion b/‎src/ServiceProvider.php
Lines changed: 1 addition & 1 deletion
@@ -44,13 +44,13 @@ public function handle()
 		$validExt = ['ttf', 'woff', 'woff2', 'eot'];
 
 		if( !file_exists($fontPath) || !is_dir($fontPath) ) {
-			return "Directory {$fontPath} is not exists or is not readable!";
+			return $this->error("Directory {$fontPath} is not exists or is not readable!");
 		}
 
 		if( empty($import) )
 		{
 			if( ($od = opendir($fontPath)) === false ) {
-				return "Failed to open directory: {$fontPath}";
+				return $this->error("Failed to open directory: {$fontPath}");
 			}
 
 			$files = [];
@@ -59,19 +59,37 @@ public function handle()
 			{
 				$originalName = $file;
 				$loweredName = strtolower($file);
+				$ext = pathinfo($loweredName, PATHINFO_EXTENSION);
 
-				if( in_array(substr($loweredName, -3), $validExt) )
+				if( in_array($ext, $validExt) )
 				{
 					$files[] = $originalName;
 				}
 			}
 
-			return implode("\n", $files);
+			$i = 1;
+			foreach( $files as $file ) {
+				$this->line("{$i}. ".$file);
+				$i++;
+			}
 		}
 		else
 		{
-			if( !in_array(substr($import, -3), $validExt) ) {
-				return "Unsupported font format. Please use one of supported font format: " . implode(", ", $validExt);
+			if( !filter_var($import, FILTER_VALIDATE_URL) )
+			{
+				if( !file_exists($import) ) {
+					return $this->error("{$import} is not exists or is not readable!");
+				}
+
+				if( !is_file($import) ) {
+					return $this->error("{$import} is not valid file or is not readable!");
+				}
+			}
+
+			$ext = pathinfo(strtolower($import), PATHINFO_EXTENSION);
+
+			if( !in_array($ext, $validExt) ) {
+				return $this->error("Unsupported font format. Please use one of supported font format: " . implode(", ", $validExt));
 			}
 
 			$fileName = basename($import);
@@ -81,15 +99,15 @@ public function handle()
 				@file_put_contents($fontPath.'/'.$fileName, $f);
 
 				if( !file_exists($fontPath.'/'.$fileName) || !is_file($fontPath.'/'.$fileName) ) {
-					return "Failed to import font";
+					return $this->error("Failed to import font");
 				}
 			}
 			else
 			{
-				return "Failed to import font";
+				return $this->error("Failed to import font");
 			}
 
-			return "Import font success!";
+			return $this->info("Import font success!");
 		}
 	}
 }
@@ -20,7 +20,7 @@ public function boot()
 
         if ($this->app->runningInConsole()) {
             $this->commands([
-                ZerosDev\LaravelCaptcha\Commands\Font::class,
+                Commands\Font::class,
             ]);
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ public function handle()`
`44`	`44`	`$validExt = ['ttf', 'woff', 'woff2', 'eot'];`
`45`	`45`
`46`	`46`	`if( !file_exists($fontPath) \|\| !is_dir($fontPath) ) {`
`47`		`- return "Directory {$fontPath} is not exists or is not readable!";`
	10000 `47`	`+ return $this->error("Directory {$fontPath} is not exists or is not readable!");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if( empty($import) )`
`51`	`51`	`{`
`52`	`52`	`if( ($od = opendir($fontPath)) === false ) {`
`53`		`- return "Failed to open directory: {$fontPath}";`
	`53`	`+ return $this->error("Failed to open directory: {$fontPath}");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`$files = [];`
`@@ -59,19 +59,37 @@ public function handle()`
`59`	`59`	`{`
`60`	`60`	`$originalName = $file;`
`61`	`61`	`$loweredName = strtolower($file);`
	`62`	`+ $ext = pathinfo($loweredName, PATHINFO_EXTENSION);`
`62`	`63`
`63`		`- if( in_array(substr($loweredName, -3), $validExt) )`
	`64`	`+ if( in_array($ext, $validExt) )`
`64`	`65`	`{`
`65`	`66`	`$files[] = $originalName;`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`
`69`		`- return implode("\n", $files);`
	`70`	`+ $i = 1;`
	`71`	`+ foreach( $files as $file ) {`
	`72`	`+ $this->line("{$i}. ".$file);`
	`73`	`+ $i++;`
	`74`	`+ }`
`70`	`75`	`}`
`71`	`76`	`else`
`72`	`77`	`{`
`73`		`- if( !in_array(substr($import, -3), $validExt) ) {`
`74`		`- return "Unsupported font format. Please use one of supported font format: " . implode(", ", $validExt);`
	`78`	`+ if( !filter_var($import, FILTER_VALIDATE_URL) )`
	`79`	`+ {`
	`80`	`+ if( !file_exists($import) ) {`
	`81`	`+ return $this->error("{$import} is not exists or is not readable!");`
	`82`	`+ }`
	`83`	`+`
	`84`	`+ if( !is_file($import) ) {`
	`85`	`+ return $this->error("{$import} is not valid file or is not readable!");`
	`86`	`+ }`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ $ext = pathinfo(strtolower($import), PATHINFO_EXTENSION);`
	`90`	`+`
	`91`	`+ if( !in_array($ext, $validExt) ) {`
	`92`	`+ return $this->error("Unsupported font format. Please use one of supported font format: " . implode(", ", $validExt));`
`75`	`93`	`}`
`76`	`94`
`77`	`95`	`$fileName = basename($import);`
`@@ -81,15 +99,15 @@ public function handle()`
`81`	`99`	`@file_put_contents($fontPath.'/'.$fileName, $f);`
`82`	`100`
`83`	`101`	`if( !file_exists($fontPath.'/'.$fileName) \|\| !is_file($fontPath.'/'.$fileName) ) {`
`84`		`- return "Failed to import font";`
	`102`	`+ return $this->error("Failed to import font");`
`85`	`103`	`}`
`86`	`104`	`}`
`87`	`105`	`else`
`88`	`106`	`{`
`89`		`- return "Failed to import font";`
	`107`	`+ return $this->error("Failed to import font");`
`90`	`108`	`}`
`91`	`109`
`92`		`- return "Import font success!";`
	`110`	`+ return $this->info("Import font success!");`
`93`	`111`	`}`
`94`	`112`	`}`
`95`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function boot()`
`20`	`20`
`21`	`21`	`if ($this->app->runningInConsole()) {`
`22`	`22`	`$this->commands([`
`23`		`- ZerosDev\LaravelCaptcha\Commands\Font::class,`
	`23`	`+ Commands\Font::class,`
`24`	`24`	`]);`
`25`	`25`	`}`
`26`	`26`	`}`