-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from onozaty/v1.7.0
Develp v1.7.0
- Loading branch information
Showing
12 changed files
with
1,516 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
|
|
||
| "github.com/onozaty/csvt/csv" | ||
| "github.com/onozaty/csvt/util" | ||
| "github.com/pkg/errors" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func newExcludeCmd() *cobra.Command { | ||
|
|
||
| excludeCmd := &cobra.Command{ | ||
| Use: "exclude", | ||
| Short: "Exclude rows by included in another CSV file", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
|
|
||
| format, err := getFlagBaseCsvFormat(cmd.Flags()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| inputPath, _ := cmd.Flags().GetString("input") | ||
| targetColumnName, _ := cmd.Flags().GetString("column") | ||
| anotherPath, _ := cmd.Flags().GetString("another") | ||
| anotherColumnName, _ := cmd.Flags().GetString("column-another") | ||
| outputPath, _ := cmd.Flags().GetString("output") | ||
|
|
||
| // 引数の解析に成功した時点で、エラーが起きてもUsageは表示しない | ||
| cmd.SilenceUsage = true | ||
|
|
||
| return runExclude( | ||
| format, | ||
| inputPath, | ||
| targetColumnName, | ||
| anotherPath, | ||
| outputPath, | ||
| ExcludeOptions{ | ||
| anotherColumnName: anotherColumnName, | ||
| }) | ||
| }, | ||
| } | ||
|
|
||
| excludeCmd.Flags().StringP("input", "i", "", "Input CSV file path.") | ||
| excludeCmd.MarkFlagRequired("input") | ||
| excludeCmd.Flags().StringP("column", "c", "", "Name of the column to use for exclude.") | ||
| excludeCmd.MarkFlagRequired("column") | ||
| excludeCmd.Flags().StringP("another", "a", "", "Another CSV file path. Exclude by included in this CSV file.") | ||
| excludeCmd.MarkFlagRequired("another") | ||
| excludeCmd.Flags().StringP("column-another", "", "", "(optional) Name of the column to use for exclude in the another CSV file. Specify if different from the input CSV file.") | ||
| excludeCmd.Flags().StringP("output", "o", "", "Output CSV file path.") | ||
| excludeCmd.MarkFlagRequired("output") | ||
|
|
||
| return excludeCmd | ||
| } | ||
|
|
||
| type ExcludeOptions struct { | ||
| anotherColumnName string | ||
| } | ||
|
|
||
| func runExclude(format csv.Format, inputPath string, targetColumnName string, anotherPath string, outputPath string, options ExcludeOptions) error { | ||
|
|
||
| reader, writer, close, err := setupInputOutput(inputPath, outputPath, format) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer close() | ||
|
|
||
| anotherReader, anotherClose, err := setupInput(anotherPath, format) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer anotherClose() | ||
|
|
||
| err = exclude(reader, targetColumnName, anotherReader, writer, options) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return writer.Flush() | ||
| } | ||
|
|
||
| func exclude(reader csv.CsvReader, targetColumnName string, anotherReader csv.CsvReader, writer csv.CsvWriter, options ExcludeOptions) error { | ||
|
|
||
| inputTargetColumnName := targetColumnName | ||
| anotherTargetColumnName := targetColumnName | ||
| if options.anotherColumnName != "" { | ||
| anotherTargetColumnName = options.anotherColumnName | ||
| } | ||
|
|
||
| inputColumnNames, err := reader.Read() | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to read the input CSV file") | ||
| } | ||
| inputTargetColumnIndex := util.IndexOf(inputColumnNames, inputTargetColumnName) | ||
| if inputTargetColumnIndex == -1 { | ||
| return fmt.Errorf("missing %s in the input CSV file", inputTargetColumnName) | ||
| } | ||
|
|
||
| anotherItemSet, err := csv.LoadItemSet(anotherReader, anotherTargetColumnName) | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to read the another CSV file") | ||
| } | ||
|
|
||
| writer.Write(inputColumnNames) | ||
|
|
||
| for { | ||
| row, err := reader.Read() | ||
| if err == io.EOF { | ||
| break | ||
| } | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to read the input CSV file") | ||
| } | ||
|
|
||
| // 比較対象のCSV内に存在ない場合は出力 | ||
| if !anotherItemSet.Contains(row[inputTargetColumnIndex]) { | ||
|
|
||
| err = writer.Write(row) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.