Add flags to remove for more fine-grained removals

This commit is contained in:
nytpu
2021-03-20 10:10:01 -06:00
parent 71f087b2ad
commit 6639a4288f
3 changed files with 30 additions and 9 deletions
+7 -7
View File
@@ -104,12 +104,11 @@ func main() {
}
case "remove":
argCheck(c.Args(), 1, true, "Please provide a URL to remove.")
delete(core.Data.Feeds, c.Arg(0))
delete(core.Data.Pages, c.Arg(0))
err = core.Data.WriteSubs(dataPath)
if err != nil {
fmt.Fprintf(os.Stderr, "Error saving subscriptions: %v\n", err)
os.Exit(1)
if (!*removeFeedsFlag && !*removePagesFlag) || *removeFeedsFlag {
delete(core.Data.Feeds, c.Arg(0))
}
if (!*removeFeedsFlag && !*removePagesFlag) || *removePagesFlag {
delete(core.Data.Pages, c.Arg(0))
}
}
@@ -182,7 +181,8 @@ func usage() {
fmt.Fprintf(os.Stderr, "\nGlobal Flags:\n%v", globalFs.FlagUsages())
// command-specific flags should be printed here
fmt.Fprintf(os.Stderr, "Flags for \"add\":\n%v", commands["add"].FlagUsages())
fmt.Fprintf(os.Stderr, "Flags for \"refresh\":\n%v\n", commands["refresh"].FlagUsages())
fmt.Fprintf(os.Stderr, "Flags for \"refresh\":\n%v", commands["refresh"].FlagUsages())
fmt.Fprintf(os.Stderr, "Flags for \"remove\":\n%v\n", commands["remove"].FlagUsages())
fmt.Fprint(os.Stderr, "For more help, see comitium(1).\n")
}