summaryrefslogtreecommitdiff
path: root/comitium.go
diff options
context:
space:
mode:
Diffstat (limited to 'comitium.go')
-rw-r--r--comitium.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/comitium.go b/comitium.go
index 7a02521..08d026c 100644
--- a/comitium.go
+++ b/comitium.go
@@ -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")
}