Reverts #384

bdfr/__main__.py

@@ -51,9 +51,9 @@ def cli():
 @click.option('--max-wait-time', type=int, default=None)
 @click.option('--no-dupes', is_flag=True, default=None)
 @click.option('--search-existing', is_flag=True, default=None)
-@click.option('--skip-id', default=None, multiple=True)
-@click.option('--skip-id-file', default=None, multiple=True)
-@click.option('--skip-format', default=None, multiple=True)
+@click.option('--exclude-id', default=None, multiple=True)
+@click.option('--exclude-id-file', default=None, multiple=True)
+@click.option('--skip', default=None, multiple=True)
 @click.option('--skip-domain', default=None, multiple=True)
 @click.option('--skip-subreddit', default=None, multiple=True)
 @_add_common_options

bdfr/configuration.py

@@ -13,8 +13,8 @@ class Configuration(Namespace):
         self.authenticate = False
         self.config = None
         self.directory: str = '.'
-        self.skip_id = []
-        self.skip_id_file = []
+        self.exclude_id = []
+        self.exclude_id_file = []
         self.limit: Optional[int] = None
         self.link: list[str] = []
         self.log: Optional[str] = None
@@ -26,7 +26,7 @@ class Configuration(Namespace):
         self.search_existing: bool = False
         self.file_scheme: str = '{REDDITOR}_{TITLE}_{POSTID}'
         self.folder_scheme: str = '{SUBREDDIT}'
-        self.skip_format: list[str] = []
+        self.skip: list[str] = []
         self.skip_domain: list[str] = []
         self.skip_subreddit: list[str] = []
         self.sort: str = 'hot'

bdfr/connector.py

@@ -367,7 +367,7 @@ class RedditConnector(metaclass=ABCMeta):
             return RedditTypes.SortType.HOT
 
     def create_download_filter(self) -> DownloadFilter:
-        return DownloadFilter(self.args.skip_format, self.args.skip_domain)
+        return DownloadFilter(self.args.skip, self.args.skip_domain)
 
     def create_authenticator(self) -> SiteAuthenticator:
         return SiteAuthenticator(self.cfg_parser)
@@ -389,8 +389,8 @@ class RedditConnector(metaclass=ABCMeta):
 
     def read_excluded_ids(self) -> set[str]:
         out = []
-        out.extend(self.args.skip_id)
-        for id_file in self.args.skip_id_file:
+        out.extend(self.args.exclude_id)
+        for id_file in self.args.exclude_id_file:
             id_file = Path(id_file).resolve().expanduser()
             if not id_file.exists():
                 logger.warning(f'ID exclusion file at {id_file} does not exist')