Better error messages for invalid CSVs

Author: contactashish13

classes/Visualizer/Module/Chart.php

@@ -964,7 +964,7 @@ public function uploadData() {
 		} elseif ( isset( $_POST['table_data'] ) && 'yes' === $_POST['table_data'] ) {
 			$source = $this->handleTabularData();
 		} else {
-			$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please, try again.', 'visualizer' );
+			$render->message = esc_html__( 'CSV file with chart data was not uploaded. Please try again.', 'visualizer' );
 		}
 		if ( $source ) {
 			if ( $source->fetch() ) {
@@ -996,7 +996,10 @@ public function uploadData() {
 				$render->series = json_encode( $source->getSeries() );
 				$render->settings = json_encode( $settings );
 			} else {
-				$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
+				$render->message = $source->get_error();
+				if ( empty( $render->message ) ) {
+					$render->message = esc_html__( 'CSV file is broken or invalid. Please try again.', 'visualizer' );
+				}
 			}
 		}
 		$render->render();

classes/Visualizer/Source/Csv.php

@@ -77,20 +77,18 @@ private function _fetchSeries( &$handle ) {
 			$types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
 		}
 
+		$labels = array_filter( $labels );
+		$types = array_filter( $types );
+
 		if ( ! $labels || ! $types ) {
+			$this->_error = esc_html__( 'File should have a heading row (1st row) and a data type row (2nd row). Please try again.', 'visualizer' );
 			return false;
 		}
 
-		// if no types were setup, re read labels and empty types array
 		$types = array_map( 'trim', $types );
 		if ( ! self::_validateTypes( $types ) ) {
-			// re open the file
-			fclose( $handle );
-			$handle = $this->_get_file_handle();
-
-			// re read the labels and empty types array
-			$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
-			$types = array();
+			$this->_error = esc_html__( 'Invalid data types detected in the data type row (2nd row). Please try again.', 'visualizer' );
+			return false;
 		}
 
 		for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) {
@@ -134,6 +132,7 @@ protected function _get_file_handle( $filename = false ) {
 	public function fetch() {
 		// if filename is empty return false
 		if ( empty( $this->_filename ) ) {
+			$this->_error = esc_html__( 'No file provided. Please try again.', 'visualizer' );
 			return false;
 		}