From 6d1910da30c5d384d4822887f3806f8a96f9999b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 6 Jan 2026 12:27:22 -0600 Subject: [PATCH] refactor: move deprecated keys from quark.h to api-compat.cc --- libtransmission/api-compat.cc | 326 ++++++++++++++++++++++++++++++++++ libtransmission/api-compat.h | 2 + libtransmission/quark.h | 310 +------------------------------- libtransmission/utils.cc | 3 + 4 files changed, 332 insertions(+), 309 deletions(-) diff --git a/libtransmission/api-compat.cc b/libtransmission/api-compat.cc index 7e61e39a3..2da30f805 100644 --- a/libtransmission/api-compat.cc +++ b/libtransmission/api-compat.cc @@ -23,6 +23,321 @@ namespace libtransmission::api_compat { namespace { +#define API_COMPAT_KEYS(X) \ + X(TR_KEY_active_torrent_count_camel_APICOMPAT, "activeTorrentCount") /* rpc */ \ + X(TR_KEY_activity_date_kebab_APICOMPAT, "activity-date") /* .resume */ \ + X(TR_KEY_activity_date_camel_APICOMPAT, "activityDate") /* rpc */ \ + X(TR_KEY_added_date_kebab_APICOMPAT, "added-date") /* .resume */ \ + X(TR_KEY_added_date_camel_APICOMPAT, "addedDate") /* rpc */ \ + X(TR_KEY_alt_speed_down_kebab_APICOMPAT, "alt-speed-down") /* gtk app, rpc, speed settings */ \ + X(TR_KEY_alt_speed_enabled_kebab_APICOMPAT, "alt-speed-enabled") /* gtk app, rpc, speed settings */ \ + X(TR_KEY_alt_speed_time_begin_kebab_APICOMPAT, "alt-speed-time-begin") /* rpc, speed settings */ \ + X(TR_KEY_alt_speed_time_day_kebab_APICOMPAT, "alt-speed-time-day") /* rpc, speed settings */ \ + X(TR_KEY_alt_speed_time_enabled_kebab_APICOMPAT, "alt-speed-time-enabled") /* rpc, speed settings */ \ + X(TR_KEY_alt_speed_time_end_kebab_APICOMPAT, "alt-speed-time-end") /* rpc, speed settings */ \ + X(TR_KEY_alt_speed_up_kebab_APICOMPAT, "alt-speed-up") /* gtk app, rpc, speed settings */ \ + X(TR_KEY_announce_ip_kebab_APICOMPAT, "announce-ip") /* tr_session::Settings */ \ + X(TR_KEY_announce_ip_enabled_kebab_APICOMPAT, "announce-ip-enabled") /* tr_session::Settings */ \ + X(TR_KEY_announce_state_camel_APICOMPAT, "announceState") /* rpc */ \ + X(TR_KEY_anti_brute_force_enabled_kebab_APICOMPAT, "anti-brute-force-enabled") /* rpc, rpc server settings */ \ + X(TR_KEY_anti_brute_force_threshold_kebab_APICOMPAT, "anti-brute-force-threshold") /* rpc server settings */ \ + X(TR_KEY_bandwidth_priority_kebab_APICOMPAT, "bandwidth-priority") /* .resume */ \ + X(TR_KEY_bandwidth_priority_camel_APICOMPAT, "bandwidthPriority") /* rpc */ \ + X(TR_KEY_bind_address_ipv4_kebab_APICOMPAT, "bind-address-ipv4") /* daemon, tr_session::Settings */ \ + X(TR_KEY_bind_address_ipv6_kebab_APICOMPAT, "bind-address-ipv6") /* daemon, tr_session::Settings */ \ + X(TR_KEY_blocklist_date_kebab_APICOMPAT, "blocklist-date") /* gtk app, qt app */ \ + X(TR_KEY_blocklist_enabled_kebab_APICOMPAT, "blocklist-enabled") /* daemon, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_blocklist_size_kebab_APICOMPAT, "blocklist-size") /* rpc */ \ + X(TR_KEY_blocklist_update_kebab_APICOMPAT, "blocklist-update") /* rpc */ \ + X(TR_KEY_blocklist_updates_enabled_kebab_APICOMPAT, "blocklist-updates-enabled") /* gtk app, qt app */ \ + X(TR_KEY_blocklist_url_kebab_APICOMPAT, "blocklist-url") /* rpc, tr_session::Settings */ \ + X(TR_KEY_bytes_completed_camel_APICOMPAT, "bytesCompleted") /* rpc */ \ + X(TR_KEY_cache_size_mb_kebab_APICOMPAT, "cache-size-mb") /* rpc, tr_session::Settings */ \ + X(TR_KEY_client_is_choked_camel_APICOMPAT, "clientIsChoked") /* rpc */ \ + X(TR_KEY_client_is_interested_camel_APICOMPAT, "clientIsInterested") /* rpc */ \ + X(TR_KEY_client_name_camel_APICOMPAT, "clientName") /* rpc */ \ + X(TR_KEY_compact_view_kebab_APICOMPAT, "compact-view") /* gtk app, qt app */ \ + X(TR_KEY_config_dir_kebab_APICOMPAT, "config-dir") /* rpc */ \ + X(TR_KEY_corrupt_ever_camel_APICOMPAT, "corruptEver") /* rpc */ \ + X(TR_KEY_cumulative_stats_kebab_APICOMPAT, "cumulative-stats") /* rpc */ \ + X(TR_KEY_current_stats_kebab_APICOMPAT, "current-stats") /* rpc */ \ + X(TR_KEY_date_created_camel_APICOMPAT, "dateCreated") /* rpc */ \ + X(TR_KEY_default_trackers_kebab_APICOMPAT, "default-trackers") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_delete_local_data_kebab_APICOMPAT, "delete-local-data") /* rpc */ \ + X(TR_KEY_desired_available_camel_APICOMPAT, "desiredAvailable") /* rpc */ \ + X(TR_KEY_details_window_height_kebab_APICOMPAT, "details-window-height") /* gtk app */ \ + X(TR_KEY_details_window_width_kebab_APICOMPAT, "details-window-width") /* gtk app */ \ + X(TR_KEY_dht_enabled_kebab_APICOMPAT, "dht-enabled") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_done_date_kebab_APICOMPAT, "done-date") /* .resume */ \ + X(TR_KEY_done_date_camel_APICOMPAT, "doneDate") /* rpc */ \ + X(TR_KEY_download_dir_kebab_APICOMPAT, "download-dir") /* daemon, gtk app, tr_session::Settings */ \ + X(TR_KEY_download_dir_free_space_kebab_APICOMPAT, "download-dir-free-space") /* rpc */ \ + X(TR_KEY_download_queue_enabled_kebab_APICOMPAT, "download-queue-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_download_queue_size_kebab_APICOMPAT, "download-queue-size") /* rpc, tr_session::Settings */ \ + X(TR_KEY_download_count_camel_APICOMPAT, "downloadCount") /* rpc */ \ + X(TR_KEY_download_dir_camel_APICOMPAT, "downloadDir") /* rpc */ \ + X(TR_KEY_download_limit_camel_APICOMPAT, "downloadLimit") /* rpc */ \ + X(TR_KEY_download_limited_camel_APICOMPAT, "downloadLimited") /* rpc */ \ + X(TR_KEY_download_speed_camel_APICOMPAT, "downloadSpeed") /* rpc */ \ + X(TR_KEY_downloaded_bytes_kebab_APICOMPAT, "downloaded-bytes") /* stats.json */ \ + X(TR_KEY_downloaded_bytes_camel_APICOMPAT, "downloadedBytes") /* rpc */ \ + X(TR_KEY_downloaded_ever_camel_APICOMPAT, "downloadedEver") /* rpc */ \ + X(TR_KEY_downloading_time_seconds_kebab_APICOMPAT, "downloading-time-seconds") /* .resume */ \ + X(TR_KEY_edit_date_camel_APICOMPAT, "editDate") /* rpc */ \ + X(TR_KEY_error_string_camel_APICOMPAT, "errorString") /* rpc */ \ + X(TR_KEY_eta_idle_camel_APICOMPAT, "etaIdle") /* rpc */ \ + X(TR_KEY_file_count_kebab_APICOMPAT, "file-count") /* rpc */ \ + X(TR_KEY_file_stats_camel_APICOMPAT, "fileStats") /* rpc */ \ + X(TR_KEY_files_added_kebab_APICOMPAT, "files-added") /* stats.json */ \ + X(TR_KEY_files_unwanted_kebab_APICOMPAT, "files-unwanted") /* rpc */ \ + X(TR_KEY_files_wanted_kebab_APICOMPAT, "files-wanted") /* rpc */ \ + X(TR_KEY_files_added_camel_APICOMPAT, "filesAdded") /* rpc */ \ + X(TR_KEY_filter_mode_kebab_APICOMPAT, "filter-mode") /* qt app */ \ + X(TR_KEY_filter_text_kebab_APICOMPAT, "filter-text") /* qt app */ \ + X(TR_KEY_filter_trackers_kebab_APICOMPAT, "filter-trackers") /* qt app */ \ + X(TR_KEY_flag_str_camel_APICOMPAT, "flagStr") /* rpc */ \ + X(TR_KEY_free_space_kebab_APICOMPAT, "free-space") /* rpc */ \ + X(TR_KEY_from_cache_camel_APICOMPAT, "fromCache") /* rpc */ \ + X(TR_KEY_from_dht_camel_APICOMPAT, "fromDht") /* rpc */ \ + X(TR_KEY_from_incoming_camel_APICOMPAT, "fromIncoming") /* rpc */ \ + X(TR_KEY_from_lpd_camel_APICOMPAT, "fromLpd") /* rpc */ \ + X(TR_KEY_from_ltep_camel_APICOMPAT, "fromLtep") /* rpc */ \ + X(TR_KEY_from_pex_camel_APICOMPAT, "fromPex") /* rpc */ \ + X(TR_KEY_from_tracker_camel_APICOMPAT, "fromTracker") /* rpc */ \ + X(TR_KEY_group_get_kebab_APICOMPAT, "group-get") /* rpc */ \ + X(TR_KEY_group_set_kebab_APICOMPAT, "group-set") /* rpc */ \ + X(TR_KEY_has_announced_camel_APICOMPAT, "hasAnnounced") /* rpc */ \ + X(TR_KEY_has_scraped_camel_APICOMPAT, "hasScraped") /* rpc */ \ + X(TR_KEY_hash_string_camel_APICOMPAT, "hashString") /* rpc */ \ + X(TR_KEY_have_unchecked_camel_APICOMPAT, "haveUnchecked") /* rpc */ \ + X(TR_KEY_have_valid_camel_APICOMPAT, "haveValid") /* rpc */ \ + X(TR_KEY_honors_session_limits_camel_APICOMPAT, "honorsSessionLimits") /* rpc */ \ + X(TR_KEY_idle_limit_kebab_APICOMPAT, "idle-limit") /* .resume */ \ + X(TR_KEY_idle_mode_kebab_APICOMPAT, "idle-mode") /* .resume */ \ + X(TR_KEY_idle_seeding_limit_kebab_APICOMPAT, "idle-seeding-limit") /* rpc, tr_session::Settings */ \ + X(TR_KEY_idle_seeding_limit_enabled_kebab_APICOMPAT, "idle-seeding-limit-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_incomplete_dir_kebab_APICOMPAT, "incomplete-dir") /* .resume, daemon, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_incomplete_dir_enabled_kebab_APICOMPAT, "incomplete-dir-enabled") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_inhibit_desktop_hibernation_kebab_APICOMPAT, "inhibit-desktop-hibernation") /* gtk app, qt app */ \ + X(TR_KEY_is_backup_camel_APICOMPAT, "isBackup") /* rpc */ \ + X(TR_KEY_is_downloading_from_camel_APICOMPAT, "isDownloadingFrom") /* rpc */ \ + X(TR_KEY_is_encrypted_camel_APICOMPAT, "isEncrypted") /* rpc */ \ + X(TR_KEY_is_finished_camel_APICOMPAT, "isFinished") /* rpc */ \ + X(TR_KEY_is_incoming_camel_APICOMPAT, "isIncoming") /* rpc */ \ + X(TR_KEY_is_private_camel_APICOMPAT, "isPrivate") /* rpc */ \ + X(TR_KEY_is_stalled_camel_APICOMPAT, "isStalled") /* rpc */ \ + X(TR_KEY_is_utp_camel_APICOMPAT, "isUTP") /* rpc */ \ + X(TR_KEY_is_uploading_to_camel_APICOMPAT, "isUploadingTo") /* rpc */ \ + X(TR_KEY_last_announce_peer_count_camel_APICOMPAT, "lastAnnouncePeerCount") /* rpc */ \ + X(TR_KEY_last_announce_result_camel_APICOMPAT, "lastAnnounceResult") /* rpc */ \ + X(TR_KEY_last_announce_start_time_camel_APICOMPAT, "lastAnnounceStartTime") /* rpc */ \ + X(TR_KEY_last_announce_succeeded_camel_APICOMPAT, "lastAnnounceSucceeded") /* rpc */ \ + X(TR_KEY_last_announce_time_camel_APICOMPAT, "lastAnnounceTime") /* rpc */ \ + X(TR_KEY_last_announce_timed_out_camel_APICOMPAT, "lastAnnounceTimedOut") /* rpc */ \ + X(TR_KEY_last_scrape_result_camel_APICOMPAT, "lastScrapeResult") /* rpc */ \ + X(TR_KEY_last_scrape_start_time_camel_APICOMPAT, "lastScrapeStartTime") /* rpc */ \ + X(TR_KEY_last_scrape_succeeded_camel_APICOMPAT, "lastScrapeSucceeded") /* rpc */ \ + X(TR_KEY_last_scrape_time_camel_APICOMPAT, "lastScrapeTime") /* rpc */ \ + X(TR_KEY_last_scrape_timed_out_camel_APICOMPAT, "lastScrapeTimedOut") /* rpc */ \ + X(TR_KEY_leecher_count_camel_APICOMPAT, "leecherCount") /* rpc */ \ + X(TR_KEY_left_until_done_camel_APICOMPAT, "leftUntilDone") /* rpc */ \ + X(TR_KEY_lpd_enabled_kebab_APICOMPAT, "lpd-enabled") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_magnet_link_camel_APICOMPAT, "magnetLink") /* rpc */ \ + X(TR_KEY_main_window_height_kebab_APICOMPAT, "main-window-height") /* gtk app, qt app */ \ + X(TR_KEY_main_window_is_maximized_kebab_APICOMPAT, "main-window-is-maximized") /* gtk app */ \ + X(TR_KEY_main_window_layout_order_kebab_APICOMPAT, "main-window-layout-order") /* qt app */ \ + X(TR_KEY_main_window_width_kebab_APICOMPAT, "main-window-width") /* gtk app, qt app */ \ + X(TR_KEY_main_window_x_kebab_APICOMPAT, "main-window-x") /* gtk app, qt app */ \ + X(TR_KEY_main_window_y_kebab_APICOMPAT, "main-window-y") /* gtk app, qt app */ \ + X(TR_KEY_manual_announce_time_camel_APICOMPAT, "manualAnnounceTime") /* rpc */ \ + X(TR_KEY_max_peers_kebab_APICOMPAT, "max-peers") /* .resume */ \ + X(TR_KEY_max_connected_peers_camel_APICOMPAT, "maxConnectedPeers") /* rpc */ \ + X(TR_KEY_memory_bytes_kebab_APICOMPAT, "memory-bytes") /* rpc */ \ + X(TR_KEY_memory_units_kebab_APICOMPAT, "memory-units") /* rpc */ \ + X(TR_KEY_message_level_kebab_APICOMPAT, "message-level") /* daemon, gtk app, tr_session::Settings */ \ + X(TR_KEY_metadata_percent_complete_camel_APICOMPAT, "metadataPercentComplete") /* rpc */ \ + X(TR_KEY_next_announce_time_camel_APICOMPAT, "nextAnnounceTime") /* rpc */ \ + X(TR_KEY_next_scrape_time_camel_APICOMPAT, "nextScrapeTime") /* rpc */ \ + X(TR_KEY_open_dialog_dir_kebab_APICOMPAT, "open-dialog-dir") /* gtk app, qt app */ \ + X(TR_KEY_paused_torrent_count_camel_APICOMPAT, "pausedTorrentCount") /* rpc */ \ + X(TR_KEY_peer_congestion_algorithm_kebab_APICOMPAT, "peer-congestion-algorithm") /* tr_session::Settings */ \ + X(TR_KEY_peer_limit_kebab_APICOMPAT, "peer-limit") /* rpc */ \ + X(TR_KEY_peer_limit_global_kebab_APICOMPAT, "peer-limit-global") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_peer_limit_per_torrent_kebab_APICOMPAT, \ + "peer-limit-per-torrent") /* daemon, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_peer_port_kebab_APICOMPAT, "peer-port") /* daemon, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_peer_port_random_high_kebab_APICOMPAT, "peer-port-random-high") /* tr_session::Settings */ \ + X(TR_KEY_peer_port_random_low_kebab_APICOMPAT, "peer-port-random-low") /* tr_session::Settings */ \ + X(TR_KEY_peer_port_random_on_start_kebab_APICOMPAT, "peer-port-random-on-start") /* rpc, tr_session::Settings */ \ + X(TR_KEY_peer_socket_tos_kebab_APICOMPAT, "peer-socket-tos") /* tr_session::Settings */ \ + X(TR_KEY_peer_is_choked_camel_APICOMPAT, "peerIsChoked") /* rpc */ \ + X(TR_KEY_peer_is_interested_camel_APICOMPAT, "peerIsInterested") /* rpc */ \ + X(TR_KEY_peers2_6_kebab_APICOMPAT, "peers2-6") /* .resume */ \ + X(TR_KEY_peers_connected_camel_APICOMPAT, "peersConnected") /* rpc */ \ + X(TR_KEY_peers_from_camel_APICOMPAT, "peersFrom") /* rpc */ \ + X(TR_KEY_peers_getting_from_us_camel_APICOMPAT, "peersGettingFromUs") /* rpc */ \ + X(TR_KEY_peers_sending_to_us_camel_APICOMPAT, "peersSendingToUs") /* rpc */ \ + X(TR_KEY_percent_complete_camel_APICOMPAT, "percentComplete") /* rpc */ \ + X(TR_KEY_percent_done_camel_APICOMPAT, "percentDone") /* rpc */ \ + X(TR_KEY_pex_enabled_kebab_APICOMPAT, "pex-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_piece_count_camel_APICOMPAT, "pieceCount") /* rpc */ \ + X(TR_KEY_piece_size_camel_APICOMPAT, "pieceSize") /* rpc */ \ + X(TR_KEY_port_forwarding_enabled_kebab_APICOMPAT, "port-forwarding-enabled") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_port_is_open_kebab_APICOMPAT, "port-is-open") /* rpc */ \ + X(TR_KEY_port_test_kebab_APICOMPAT, "port-test") /* rpc */ \ + X(TR_KEY_primary_mime_type_kebab_APICOMPAT, "primary-mime-type") /* rpc */ \ + X(TR_KEY_priority_high_kebab_APICOMPAT, "priority-high") /* rpc */ \ + X(TR_KEY_priority_low_kebab_APICOMPAT, "priority-low") /* rpc */ \ + X(TR_KEY_priority_normal_kebab_APICOMPAT, "priority-normal") /* rpc */ \ + X(TR_KEY_prompt_before_exit_kebab_APICOMPAT, "prompt-before-exit") /* qt app */ \ + X(TR_KEY_queue_move_bottom_kebab_APICOMPAT, "queue-move-bottom") /* rpc */ \ + X(TR_KEY_queue_move_down_kebab_APICOMPAT, "queue-move-down") /* rpc */ \ + X(TR_KEY_queue_move_top_kebab_APICOMPAT, "queue-move-top") /* rpc */ \ + X(TR_KEY_queue_move_up_kebab_APICOMPAT, "queue-move-up") /* rpc */ \ + X(TR_KEY_queue_stalled_enabled_kebab_APICOMPAT, "queue-stalled-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_queue_stalled_minutes_kebab_APICOMPAT, "queue-stalled-minutes") /* rpc, tr_session::Settings */ \ + X(TR_KEY_queue_position_camel_APICOMPAT, "queuePosition") /* rpc */ \ + X(TR_KEY_rate_download_camel_APICOMPAT, "rateDownload") /* rpc */ \ + X(TR_KEY_rate_to_client_camel_APICOMPAT, "rateToClient") /* rpc */ \ + X(TR_KEY_rate_to_peer_camel_APICOMPAT, "rateToPeer") /* rpc */ \ + X(TR_KEY_rate_upload_camel_APICOMPAT, "rateUpload") /* rpc */ \ + X(TR_KEY_ratio_limit_kebab_APICOMPAT, "ratio-limit") /* .resume, daemon, gtk app, tr_session::Settings */ \ + X(TR_KEY_ratio_limit_enabled_kebab_APICOMPAT, "ratio-limit-enabled") /* daemon, tr_session::Settings */ \ + X(TR_KEY_ratio_mode_kebab_APICOMPAT, "ratio-mode") /* .resume */ \ + X(TR_KEY_read_clipboard_kebab_APICOMPAT, "read-clipboard") /* qt app */ \ + X(TR_KEY_recently_active_kebab_APICOMPAT, "recently-active") /* rpc */ \ + X(TR_KEY_recheck_progress_camel_APICOMPAT, "recheckProgress") /* rpc */ \ + X(TR_KEY_remote_session_enabled_kebab_APICOMPAT, "remote-session-enabled") /* qt app */ \ + X(TR_KEY_remote_session_host_kebab_APICOMPAT, "remote-session-host") /* qt app */ \ + X(TR_KEY_remote_session_https_kebab_APICOMPAT, "remote-session-https") /* qt app */ \ + X(TR_KEY_remote_session_password_kebab_APICOMPAT, "remote-session-password") /* qt app */ \ + X(TR_KEY_remote_session_port_kebab_APICOMPAT, "remote-session-port") /* qt app */ \ + X(TR_KEY_remote_session_requres_authentication_kebab_APICOMPAT, \ + "remote-session-requres-authentication") /* SIC: misspelled prior to 4.1.0-beta.4; qt app */ \ + X(TR_KEY_remote_session_username_kebab_APICOMPAT, "remote-session-username") /* qt app */ \ + X(TR_KEY_rename_partial_files_kebab_APICOMPAT, "rename-partial-files") /* rpc, tr_session::Settings */ \ + X(TR_KEY_rpc_authentication_required_kebab_APICOMPAT, "rpc-authentication-required") /* daemon, rpc server settings */ \ + X(TR_KEY_rpc_bind_address_kebab_APICOMPAT, "rpc-bind-address") /* daemon, rpc server settings */ \ + X(TR_KEY_rpc_enabled_kebab_APICOMPAT, "rpc-enabled") /* daemon, rpc server settings */ \ + X(TR_KEY_rpc_host_whitelist_kebab_APICOMPAT, "rpc-host-whitelist") /* rpc, rpc server settings */ \ + X(TR_KEY_rpc_host_whitelist_enabled_kebab_APICOMPAT, "rpc-host-whitelist-enabled") /* rpc, rpc server settings */ \ + X(TR_KEY_rpc_password_kebab_APICOMPAT, "rpc-password") /* daemon, rpc server settings */ \ + X(TR_KEY_rpc_port_kebab_APICOMPAT, "rpc-port") /* daemon, gtk app, rpc server settings */ \ + X(TR_KEY_rpc_socket_mode_kebab_APICOMPAT, "rpc-socket-mode") /* rpc server settings */ \ + X(TR_KEY_rpc_url_kebab_APICOMPAT, "rpc-url") /* rpc server settings */ \ + X(TR_KEY_rpc_username_kebab_APICOMPAT, "rpc-username") /* daemon, rpc server settings */ \ + X(TR_KEY_rpc_version_kebab_APICOMPAT, "rpc-version") /* rpc */ \ + X(TR_KEY_rpc_version_minimum_kebab_APICOMPAT, "rpc-version-minimum") /* rpc */ \ + X(TR_KEY_rpc_version_semver_kebab_APICOMPAT, "rpc-version-semver") /* rpc */ \ + X(TR_KEY_rpc_whitelist_kebab_APICOMPAT, "rpc-whitelist") /* daemon, gtk app, rpc server settings */ \ + X(TR_KEY_rpc_whitelist_enabled_kebab_APICOMPAT, "rpc-whitelist-enabled") /* daemon, rpc server settings */ \ + X(TR_KEY_scrape_paused_torrents_enabled_kebab_APICOMPAT, "scrape-paused-torrents-enabled") /* tr_session::Settings */ \ + X(TR_KEY_scrape_state_camel_APICOMPAT, "scrapeState") /* rpc */ \ + X(TR_KEY_script_torrent_added_enabled_kebab_APICOMPAT, "script-torrent-added-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_script_torrent_added_filename_kebab_APICOMPAT, "script-torrent-added-filename") /* rpc, tr_session::Settings */ \ + X(TR_KEY_script_torrent_done_enabled_kebab_APICOMPAT, "script-torrent-done-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_script_torrent_done_filename_kebab_APICOMPAT, "script-torrent-done-filename") /* rpc, tr_session::Settings */ \ + X(TR_KEY_script_torrent_done_seeding_enabled_kebab_APICOMPAT, \ + "script-torrent-done-seeding-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_script_torrent_done_seeding_filename_kebab_APICOMPAT, \ + "script-torrent-done-seeding-filename") /* rpc, tr_session::Settings */ \ + X(TR_KEY_seconds_active_kebab_APICOMPAT, "seconds-active") /* stats.json */ \ + X(TR_KEY_seconds_active_camel_APICOMPAT, "secondsActive") /* rpc */ \ + X(TR_KEY_seconds_downloading_camel_APICOMPAT, "secondsDownloading") /* rpc */ \ + X(TR_KEY_seconds_seeding_camel_APICOMPAT, "secondsSeeding") /* rpc */ \ + X(TR_KEY_seed_queue_enabled_kebab_APICOMPAT, "seed-queue-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_seed_queue_size_kebab_APICOMPAT, "seed-queue-size") /* rpc, tr_session::Settings */ \ + X(TR_KEY_seed_idle_limit_camel_APICOMPAT, "seedIdleLimit") /* rpc */ \ + X(TR_KEY_seed_idle_mode_camel_APICOMPAT, "seedIdleMode") /* rpc */ \ + X(TR_KEY_seed_ratio_limit_camel_APICOMPAT, "seedRatioLimit") /* rpc */ \ + X(TR_KEY_seed_ratio_limited_camel_APICOMPAT, "seedRatioLimited") /* rpc */ \ + X(TR_KEY_seed_ratio_mode_camel_APICOMPAT, "seedRatioMode") /* rpc */ \ + X(TR_KEY_seeder_count_camel_APICOMPAT, "seederCount") /* rpc */ \ + X(TR_KEY_seeding_time_seconds_kebab_APICOMPAT, "seeding-time-seconds") /* .resume */ \ + X(TR_KEY_session_close_kebab_APICOMPAT, "session-close") /* rpc */ \ + X(TR_KEY_session_count_kebab_APICOMPAT, "session-count") /* stats.json */ \ + X(TR_KEY_session_get_kebab_APICOMPAT, "session-get") /* rpc */ \ + X(TR_KEY_session_id_kebab_APICOMPAT, "session-id") /* rpc */ \ + X(TR_KEY_session_set_kebab_APICOMPAT, "session-set") /* rpc */ \ + X(TR_KEY_session_stats_kebab_APICOMPAT, "session-stats") /* rpc */ \ + X(TR_KEY_session_count_camel_APICOMPAT, "sessionCount") /* rpc */ \ + X(TR_KEY_show_backup_trackers_kebab_APICOMPAT, "show-backup-trackers") /* gtk app, qt app */ \ + X(TR_KEY_show_extra_peer_details_kebab_APICOMPAT, "show-extra-peer-details") /* gtk app */ \ + X(TR_KEY_show_filterbar_kebab_APICOMPAT, "show-filterbar") /* gtk app, qt app */ \ + X(TR_KEY_show_notification_area_icon_kebab_APICOMPAT, "show-notification-area-icon") /* gtk app, qt app */ \ + X(TR_KEY_show_options_window_kebab_APICOMPAT, "show-options-window") /* gtk app, qt app */ \ + X(TR_KEY_show_statusbar_kebab_APICOMPAT, "show-statusbar") /* gtk app, qt app */ \ + X(TR_KEY_show_toolbar_kebab_APICOMPAT, "show-toolbar") /* gtk app, qt app */ \ + X(TR_KEY_show_tracker_scrapes_kebab_APICOMPAT, "show-tracker-scrapes") /* gtk app, qt app */ \ + X(TR_KEY_size_bytes_kebab_APICOMPAT, "size-bytes") /* rpc */ \ + X(TR_KEY_size_units_kebab_APICOMPAT, "size-units") /* rpc */ \ + X(TR_KEY_size_when_done_camel_APICOMPAT, "sizeWhenDone") /* rpc */ \ + X(TR_KEY_sleep_per_seconds_during_verify_kebab_APICOMPAT, "sleep-per-seconds-during-verify") /* tr_session::Settings */ \ + X(TR_KEY_sort_mode_kebab_APICOMPAT, "sort-mode") /* gtk app, qt app */ \ + X(TR_KEY_sort_reversed_kebab_APICOMPAT, "sort-reversed") /* gtk app, qt app */ \ + X(TR_KEY_speed_Bps_kebab_APICOMPAT, "speed-Bps") /* .resume */ \ + X(TR_KEY_speed_bytes_kebab_APICOMPAT, "speed-bytes") /* rpc */ \ + X(TR_KEY_speed_limit_down_kebab_APICOMPAT, "speed-limit-down") /* .resume, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_speed_limit_down_enabled_kebab_APICOMPAT, "speed-limit-down-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_speed_limit_up_kebab_APICOMPAT, "speed-limit-up") /* .resume, gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_speed_limit_up_enabled_kebab_APICOMPAT, "speed-limit-up-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_speed_units_kebab_APICOMPAT, "speed-units") /* rpc */ \ + X(TR_KEY_start_added_torrents_kebab_APICOMPAT, "start-added-torrents") /* gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_start_minimized_kebab_APICOMPAT, "start-minimized") /* qt app */ \ + X(TR_KEY_start_date_camel_APICOMPAT, "startDate") /* rpc */ \ + X(TR_KEY_statusbar_stats_kebab_APICOMPAT, "statusbar-stats") /* gtk app, qt app */ \ + X(TR_KEY_tcp_enabled_kebab_APICOMPAT, "tcp-enabled") /* rpc, tr_session::Settings */ \ + X(TR_KEY_time_checked_kebab_APICOMPAT, "time-checked") /* .resume */ \ + X(TR_KEY_torrent_add_kebab_APICOMPAT, "torrent-add") /* rpc */ \ + X(TR_KEY_torrent_added_kebab_APICOMPAT, "torrent-added") /* rpc */ \ + X(TR_KEY_torrent_added_notification_enabled_kebab_APICOMPAT, "torrent-added-notification-enabled") /* gtk app, qt app */ \ + X(TR_KEY_torrent_added_verify_mode_kebab_APICOMPAT, "torrent-added-verify-mode") /* tr_session::Settings */ \ + X(TR_KEY_torrent_complete_notification_enabled_kebab_APICOMPAT, \ + "torrent-complete-notification-enabled") /* gtk app, qt app */ \ + X(TR_KEY_torrent_complete_sound_command_kebab_APICOMPAT, "torrent-complete-sound-command") /* gtk app, qt app */ \ + X(TR_KEY_torrent_complete_sound_enabled_kebab_APICOMPAT, "torrent-complete-sound-enabled") /* gtk app, qt app */ \ + X(TR_KEY_torrent_duplicate_kebab_APICOMPAT, "torrent-duplicate") /* rpc */ \ + X(TR_KEY_torrent_reannounce_kebab_APICOMPAT, "torrent-reannounce") /* rpc */ \ + X(TR_KEY_torrent_remove_kebab_APICOMPAT, "torrent-remove") /* rpc */ \ + X(TR_KEY_torrent_rename_path_kebab_APICOMPAT, "torrent-rename-path") /* rpc */ \ + X(TR_KEY_torrent_set_kebab_APICOMPAT, "torrent-set") /* rpc */ \ + X(TR_KEY_torrent_set_location_kebab_APICOMPAT, "torrent-set-location") /* rpc */ \ + X(TR_KEY_torrent_start_kebab_APICOMPAT, "torrent-start") /* rpc */ \ + X(TR_KEY_torrent_start_now_kebab_APICOMPAT, "torrent-start-now") /* rpc */ \ + X(TR_KEY_torrent_stop_kebab_APICOMPAT, "torrent-stop") /* rpc */ \ + X(TR_KEY_torrent_verify_kebab_APICOMPAT, "torrent-verify") /* rpc */ \ + X(TR_KEY_torrent_count_camel_APICOMPAT, "torrentCount") /* rpc */ \ + X(TR_KEY_torrent_file_camel_APICOMPAT, "torrentFile") /* rpc */ \ + X(TR_KEY_total_size_camel_APICOMPAT, "totalSize") /* rpc */ \ + X(TR_KEY_tracker_add_camel_APICOMPAT, "trackerAdd") /* rpc */ \ + X(TR_KEY_tracker_list_camel_APICOMPAT, "trackerList") /* rpc */ \ + X(TR_KEY_tracker_remove_camel_APICOMPAT, "trackerRemove") /* rpc */ \ + X(TR_KEY_tracker_replace_camel_APICOMPAT, "trackerReplace") /* rpc */ \ + X(TR_KEY_tracker_stats_camel_APICOMPAT, "trackerStats") /* rpc */ \ + X(TR_KEY_trash_can_enabled_kebab_APICOMPAT, "trash-can-enabled") /* gtk app */ \ + X(TR_KEY_trash_original_torrent_files_kebab_APICOMPAT, \ + "trash-original-torrent-files") /* gtk app, rpc, tr_session::Settings */ \ + X(TR_KEY_upload_slots_per_torrent_kebab_APICOMPAT, "upload-slots-per-torrent") /* tr_session::Settings */ \ + X(TR_KEY_upload_limit_camel_APICOMPAT, "uploadLimit") /* rpc */ \ + X(TR_KEY_upload_limited_camel_APICOMPAT, "uploadLimited") /* rpc */ \ + X(TR_KEY_upload_ratio_camel_APICOMPAT, "uploadRatio") /* rpc */ \ + X(TR_KEY_upload_speed_camel_APICOMPAT, "uploadSpeed") /* rpc */ \ + X(TR_KEY_uploaded_bytes_kebab_APICOMPAT, "uploaded-bytes") /* stats.json */ \ + X(TR_KEY_uploaded_bytes_camel_APICOMPAT, "uploadedBytes") /* rpc */ \ + X(TR_KEY_uploaded_ever_camel_APICOMPAT, "uploadedEver") /* rpc */ \ + X(TR_KEY_use_global_speed_limit_kebab_APICOMPAT, "use-global-speed-limit") /* .resume */ \ + X(TR_KEY_use_speed_limit_kebab_APICOMPAT, "use-speed-limit") /* .resume */ \ + X(TR_KEY_utp_enabled_kebab_APICOMPAT, "utp-enabled") /* daemon, rpc, tr_session::Settings */ \ + X(TR_KEY_watch_dir_kebab_APICOMPAT, "watch-dir") /* daemon, gtk app, qt app */ \ + X(TR_KEY_watch_dir_enabled_kebab_APICOMPAT, "watch-dir-enabled") /* daemon, gtk app, qt app */ \ + X(TR_KEY_watch_dir_force_generic_kebab_APICOMPAT, "watch-dir-force-generic") /* daemon */ \ + X(TR_KEY_webseeds_sending_to_us_camel_APICOMPAT, "webseedsSendingToUs") /* rpc */ + +// NOLINTNEXTLINE(bugprone-macro-parentheses) +#define MAKE_API_COMPAT_KEY(_key, _str) constexpr auto _key = transmission::symbol::known(_str); +API_COMPAT_KEYS(MAKE_API_COMPAT_KEY) +#undef MAKE_API_COMPAT_KEY + struct ApiKey { // snake-case quark @@ -1032,4 +1347,15 @@ void convert_incoming_data(tr_variant& var) { convert(var, Style::Tr5); } + +void register_deprecated_keys() +{ + using namespace transmission::symbol; + auto const keys = std::vector{ +#define KEY_NAME(_key, _str) _key, + API_COMPAT_KEYS(KEY_NAME) +#undef KEY_NAME + }; + StringInterner::instance().add_known(std::data(keys), std::size(keys)); +} } // namespace libtransmission::api_compat diff --git a/libtransmission/api-compat.h b/libtransmission/api-compat.h index f0f372641..7239450ec 100644 --- a/libtransmission/api-compat.h +++ b/libtransmission/api-compat.h @@ -21,4 +21,6 @@ void convert(tr_variant& var, Style tgt_style); void convert_incoming_data(tr_variant& var); void convert_outgoing_data(tr_variant& var); +void register_deprecated_keys(); + } // namespace libtransmission::api_compat diff --git a/libtransmission/quark.h b/libtransmission/quark.h index c6915ab36..1537ebe0f 100644 --- a/libtransmission/quark.h +++ b/libtransmission/quark.h @@ -23,26 +23,14 @@ using tr_quark = transmission::symbol::Symbol; #define KNOWN_KEYS(X) \ X(TR_KEY_NONE, "") \ - X(TR_KEY_active_torrent_count_camel_APICOMPAT, "activeTorrentCount") /* rpc */ \ X(TR_KEY_active_torrent_count, "active_torrent_count") /* rpc */ \ - X(TR_KEY_activity_date_kebab_APICOMPAT, "activity-date") /* .resume */ \ - X(TR_KEY_activity_date_camel_APICOMPAT, "activityDate") /* rpc */ \ X(TR_KEY_activity_date, "activity_date") /* .resume, rpc */ \ X(TR_KEY_added, "added") /* BEP0011; BT protocol, rpc */ \ - X(TR_KEY_added_date_kebab_APICOMPAT, "added-date") /* .resume */ \ X(TR_KEY_added_f, "added.f") /* BEP0011; BT protocol */ \ X(TR_KEY_added6, "added6") /* BEP0011; BT protocol */ \ X(TR_KEY_added6_f, "added6.f") /* BEP0011; BT protocol */ \ - X(TR_KEY_added_date_camel_APICOMPAT, "addedDate") /* rpc */ \ X(TR_KEY_added_date, "added_date") /* .resume, rpc */ \ X(TR_KEY_address, "address") /* rpc */ \ - X(TR_KEY_alt_speed_down_kebab_APICOMPAT, "alt-speed-down") /* gtk app, rpc, speed settings */ \ - X(TR_KEY_alt_speed_enabled_kebab_APICOMPAT, "alt-speed-enabled") /* gtk app, rpc, speed settings */ \ - X(TR_KEY_alt_speed_time_begin_kebab_APICOMPAT, "alt-speed-time-begin") /* rpc, speed settings */ \ - X(TR_KEY_alt_speed_time_day_kebab_APICOMPAT, "alt-speed-time-day") /* rpc, speed settings */ \ - X(TR_KEY_alt_speed_time_enabled_kebab_APICOMPAT, "alt-speed-time-enabled") /* rpc, speed settings */ \ - X(TR_KEY_alt_speed_time_end_kebab_APICOMPAT, "alt-speed-time-end") /* rpc, speed settings */ \ - X(TR_KEY_alt_speed_up_kebab_APICOMPAT, "alt-speed-up") /* gtk app, rpc, speed settings */ \ X(TR_KEY_alt_speed_down, "alt_speed_down") /* gtk app, rpc, speed settings */ \ X(TR_KEY_alt_speed_enabled, "alt_speed_enabled") /* gtk app, rpc, speed settings */ \ X(TR_KEY_alt_speed_time_begin, "alt_speed_time_begin") /* rpc, speed settings */ \ @@ -51,34 +39,19 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_alt_speed_time_end, "alt_speed_time_end") /* rpc, speed settings */ \ X(TR_KEY_alt_speed_up, "alt_speed_up") /* gtk app, rpc, speed settings */ \ X(TR_KEY_announce, "announce") /* BEP0003; BT protocol */ \ - X(TR_KEY_announce_ip_kebab_APICOMPAT, "announce-ip") /* tr_session::Settings */ \ - X(TR_KEY_announce_ip_enabled_kebab_APICOMPAT, "announce-ip-enabled") /* tr_session::Settings */ \ X(TR_KEY_announce_list, "announce-list") /* BEP0012; BT protocol */ \ - X(TR_KEY_announce_state_camel_APICOMPAT, "announceState") /* rpc */ \ X(TR_KEY_announce_ip, "announce_ip") /* tr_session::Settings */ \ X(TR_KEY_announce_ip_enabled, "announce_ip_enabled") /* tr_session::Settings */ \ X(TR_KEY_announce_state, "announce_state") /* rpc */ \ - X(TR_KEY_anti_brute_force_enabled_kebab_APICOMPAT, "anti-brute-force-enabled") /* rpc, rpc server settings */ \ - X(TR_KEY_anti_brute_force_threshold_kebab_APICOMPAT, "anti-brute-force-threshold") /* rpc server settings */ \ X(TR_KEY_anti_brute_force_enabled, "anti_brute_force_enabled") /* rpc, rpc server settings */ \ X(TR_KEY_anti_brute_force_threshold, "anti_brute_force_threshold") /* rpc server settings */ \ X(TR_KEY_arguments, "arguments") /* json-rpc */ \ X(TR_KEY_availability, "availability") /* rpc */ \ - X(TR_KEY_bandwidth_priority_kebab_APICOMPAT, "bandwidth-priority") /* .resume */ \ - X(TR_KEY_bandwidth_priority_camel_APICOMPAT, "bandwidthPriority") /* rpc */ \ X(TR_KEY_bandwidth_priority, "bandwidth_priority") /* .resume, rpc */ \ X(TR_KEY_begin_piece, "begin_piece") /* rpc */ \ - X(TR_KEY_bind_address_ipv4_kebab_APICOMPAT, "bind-address-ipv4") /* daemon, tr_session::Settings */ \ - X(TR_KEY_bind_address_ipv6_kebab_APICOMPAT, "bind-address-ipv6") /* daemon, tr_session::Settings */ \ X(TR_KEY_bind_address_ipv4, "bind_address_ipv4") /* daemon, tr_session::Settings */ \ X(TR_KEY_bind_address_ipv6, "bind_address_ipv6") /* daemon, tr_session::Settings */ \ X(TR_KEY_bitfield, "bitfield") /* .resume */ \ - X(TR_KEY_blocklist_date_kebab_APICOMPAT, "blocklist-date") /* gtk app, qt app */ \ - X(TR_KEY_blocklist_enabled_kebab_APICOMPAT, "blocklist-enabled") /* daemon, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_blocklist_size_kebab_APICOMPAT, "blocklist-size") /* rpc */ \ - X(TR_KEY_blocklist_update_kebab_APICOMPAT, "blocklist-update") /* rpc */ \ - X(TR_KEY_blocklist_updates_enabled_kebab_APICOMPAT, "blocklist-updates-enabled") /* gtk app, qt app */ \ - X(TR_KEY_blocklist_url_kebab_APICOMPAT, "blocklist-url") /* rpc, tr_session::Settings */ \ X(TR_KEY_blocklist_date, "blocklist_date") /* gtk app, qt app */ \ X(TR_KEY_blocklist_enabled, "blocklist_enabled") /* daemon, gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_blocklist_size, "blocklist_size") /* rpc */ \ @@ -86,65 +59,37 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_blocklist_updates_enabled, "blocklist_updates_enabled") /* gtk app, qt app */ \ X(TR_KEY_blocklist_url, "blocklist_url") /* rpc, tr_session::Settings */ \ X(TR_KEY_blocks, "blocks") /* .resume */ \ - X(TR_KEY_bytes_completed_camel_APICOMPAT, "bytesCompleted") /* rpc */ \ X(TR_KEY_bytes_completed, "bytes_completed") /* rpc */ \ X(TR_KEY_bytes_to_client, "bytes_to_client") /* rpc */ \ X(TR_KEY_bytes_to_peer, "bytes_to_peer") /* rpc */ \ - X(TR_KEY_cache_size_mb_kebab_APICOMPAT, "cache-size-mb") /* rpc, tr_session::Settings */ \ X(TR_KEY_cache_size_mib, "cache_size_mib") /* rpc, tr_session::Settings */ \ - X(TR_KEY_client_is_choked_camel_APICOMPAT, "clientIsChoked") /* rpc */ \ - X(TR_KEY_client_is_interested_camel_APICOMPAT, "clientIsInterested") /* rpc */ \ - X(TR_KEY_client_name_camel_APICOMPAT, "clientName") /* rpc */ \ X(TR_KEY_client_is_choked, "client_is_choked") /* rpc */ \ X(TR_KEY_client_is_interested, "client_is_interested") /* rpc */ \ X(TR_KEY_client_name, "client_name") /* rpc */ \ X(TR_KEY_code, "code") /* json-rpc */ \ X(TR_KEY_comment, "comment") /* .torrent, rpc */ \ - X(TR_KEY_compact_view_kebab_APICOMPAT, "compact-view") /* gtk app, qt app */ \ X(TR_KEY_compact_view, "compact_view") /* gtk app, qt app */ \ X(TR_KEY_complete, "complete") /* BEP0048; BT protocol */ \ - X(TR_KEY_config_dir_kebab_APICOMPAT, "config-dir") /* rpc */ \ X(TR_KEY_config_dir, "config_dir") /* rpc */ \ X(TR_KEY_cookies, "cookies") /* rpc */ \ X(TR_KEY_corrupt, "corrupt") /* .resume */ \ - X(TR_KEY_corrupt_ever_camel_APICOMPAT, "corruptEver") /* rpc */ \ X(TR_KEY_corrupt_ever, "corrupt_ever") /* rpc */ \ X(TR_KEY_created_by, "created by") /* .torrent */ \ X(TR_KEY_creation_date, "creation date") /* .torrent */ \ X(TR_KEY_creator, "creator") /* rpc */ \ - X(TR_KEY_cumulative_stats_kebab_APICOMPAT, "cumulative-stats") /* rpc */ \ X(TR_KEY_cumulative_stats, "cumulative_stats") /* rpc */ \ - X(TR_KEY_current_stats_kebab_APICOMPAT, "current-stats") /* rpc */ \ X(TR_KEY_current_stats, "current_stats") /* rpc */ \ X(TR_KEY_data, "data") /* json-rpc, rpc */ \ - X(TR_KEY_date_created_camel_APICOMPAT, "dateCreated") /* rpc */ \ X(TR_KEY_date_created, "date_created") /* rpc */ \ - X(TR_KEY_default_trackers_kebab_APICOMPAT, "default-trackers") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_default_trackers, "default_trackers") /* daemon, rpc, tr_session::Settings */ \ - X(TR_KEY_delete_local_data_kebab_APICOMPAT, "delete-local-data") /* rpc */ \ X(TR_KEY_delete_local_data, "delete_local_data") /* rpc */ \ - X(TR_KEY_desired_available_camel_APICOMPAT, "desiredAvailable") /* rpc */ \ X(TR_KEY_desired_available, "desired_available") /* rpc */ \ X(TR_KEY_destination, "destination") /* .resume */ \ - X(TR_KEY_details_window_height_kebab_APICOMPAT, "details-window-height") /* gtk app */ \ - X(TR_KEY_details_window_width_kebab_APICOMPAT, "details-window-width") /* gtk app */ \ X(TR_KEY_details_window_height, "details_window_height") /* gtk app */ \ X(TR_KEY_details_window_width, "details_window_width") /* gtk app */ \ - X(TR_KEY_dht_enabled_kebab_APICOMPAT, "dht-enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_dht_enabled, "dht_enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_dnd, "dnd") /* .resume */ \ - X(TR_KEY_done_date_kebab_APICOMPAT, "done-date") /* .resume */ \ - X(TR_KEY_done_date_camel_APICOMPAT, "doneDate") /* rpc */ \ X(TR_KEY_done_date, "done_date") /* .resume, rpc */ \ - X(TR_KEY_download_dir_kebab_APICOMPAT, "download-dir") /* daemon, gtk app, tr_session::Settings */ \ - X(TR_KEY_download_dir_free_space_kebab_APICOMPAT, "download-dir-free-space") /* rpc */ \ - X(TR_KEY_download_queue_enabled_kebab_APICOMPAT, "download-queue-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_download_queue_size_kebab_APICOMPAT, "download-queue-size") /* rpc, tr_session::Settings */ \ - X(TR_KEY_download_count_camel_APICOMPAT, "downloadCount") /* rpc */ \ - X(TR_KEY_download_dir_camel_APICOMPAT, "downloadDir") /* rpc */ \ - X(TR_KEY_download_limit_camel_APICOMPAT, "downloadLimit") /* rpc */ \ - X(TR_KEY_download_limited_camel_APICOMPAT, "downloadLimited") /* rpc */ \ - X(TR_KEY_download_speed_camel_APICOMPAT, "downloadSpeed") /* rpc */ \ X(TR_KEY_download_count, "download_count") /* rpc */ \ X(TR_KEY_download_dir, "download_dir") /* daemon, gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_download_dir_free_space, "download_dir_free_space") /* rpc */ \ @@ -154,61 +99,36 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_download_queue_size, "download_queue_size") /* rpc, tr_session::Settings */ \ X(TR_KEY_download_speed, "download_speed") /* rpc */ \ X(TR_KEY_downloaded, "downloaded") /* BEP0048; .resume, BT protocol */ \ - X(TR_KEY_downloaded_bytes_kebab_APICOMPAT, "downloaded-bytes") /* stats.json */ \ - X(TR_KEY_downloaded_bytes_camel_APICOMPAT, "downloadedBytes") /* rpc */ \ - X(TR_KEY_downloaded_ever_camel_APICOMPAT, "downloadedEver") /* rpc */ \ X(TR_KEY_downloaded_bytes, "downloaded_bytes") /* rpc, stats.json */ \ X(TR_KEY_downloaded_ever, "downloaded_ever") /* rpc */ \ X(TR_KEY_downloader_count, "downloader_count") /* rpc */ \ - X(TR_KEY_downloading_time_seconds_kebab_APICOMPAT, "downloading-time-seconds") /* .resume */ \ X(TR_KEY_downloading_time_seconds, "downloading_time_seconds") /* .resume */ \ X(TR_KEY_dropped, "dropped") /* BEP0011; BT protocol */ \ X(TR_KEY_dropped6, "dropped6") /* BEP0011; BT protocol */ \ X(TR_KEY_e, "e") /* BT protocol */ \ - X(TR_KEY_edit_date_camel_APICOMPAT, "editDate") /* rpc */ \ X(TR_KEY_edit_date, "edit_date") /* rpc */ \ X(TR_KEY_encoding, "encoding") /* .torrent */ \ X(TR_KEY_encryption, "encryption") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_end_piece, "end_piece") /* rpc */ \ X(TR_KEY_error, "error") /* rpc */ \ - X(TR_KEY_error_string_camel_APICOMPAT, "errorString") /* rpc */ \ X(TR_KEY_error_string, "error_string") /* rpc */ \ X(TR_KEY_eta, "eta") /* rpc */ \ - X(TR_KEY_eta_idle_camel_APICOMPAT, "etaIdle") /* rpc */ \ X(TR_KEY_eta_idle, "eta_idle") /* rpc */ \ X(TR_KEY_fields, "fields") /* rpc */ \ - X(TR_KEY_file_count_kebab_APICOMPAT, "file-count") /* rpc */ \ - X(TR_KEY_file_stats_camel_APICOMPAT, "fileStats") /* rpc */ \ X(TR_KEY_file_count, "file_count") /* rpc */ \ X(TR_KEY_file_stats, "file_stats") /* rpc */ \ X(TR_KEY_filename, "filename") /* rpc */ \ X(TR_KEY_files, "files") /* .resume, .torrent, rpc */ \ - X(TR_KEY_files_added_kebab_APICOMPAT, "files-added") /* stats.json */ \ - X(TR_KEY_files_unwanted_kebab_APICOMPAT, "files-unwanted") /* rpc */ \ - X(TR_KEY_files_wanted_kebab_APICOMPAT, "files-wanted") /* rpc */ \ - X(TR_KEY_files_added_camel_APICOMPAT, "filesAdded") /* rpc */ \ X(TR_KEY_files_added, "files_added") /* rpc, stats.json */ \ X(TR_KEY_files_unwanted, "files_unwanted") /* rpc */ \ X(TR_KEY_files_wanted, "files_wanted") /* rpc */ \ - X(TR_KEY_filter_mode_kebab_APICOMPAT, "filter-mode") /* qt app */ \ - X(TR_KEY_filter_text_kebab_APICOMPAT, "filter-text") /* qt app */ \ - X(TR_KEY_filter_trackers_kebab_APICOMPAT, "filter-trackers") /* qt app */ \ X(TR_KEY_filter_mode, "filter_mode") /* qt app */ \ X(TR_KEY_filter_text, "filter_text") /* qt app */ \ X(TR_KEY_filter_trackers, "filter_trackers") /* qt app */ \ - X(TR_KEY_flag_str_camel_APICOMPAT, "flagStr") /* rpc */ \ X(TR_KEY_flag_str, "flag_str") /* rpc */ \ X(TR_KEY_flags, "flags") /* .resume */ \ X(TR_KEY_format, "format") /* rpc */ \ - X(TR_KEY_free_space_kebab_APICOMPAT, "free-space") /* rpc */ \ X(TR_KEY_free_space, "free_space") /* rpc */ \ - X(TR_KEY_from_cache_camel_APICOMPAT, "fromCache") /* rpc */ \ - X(TR_KEY_from_dht_camel_APICOMPAT, "fromDht") /* rpc */ \ - X(TR_KEY_from_incoming_camel_APICOMPAT, "fromIncoming") /* rpc */ \ - X(TR_KEY_from_lpd_camel_APICOMPAT, "fromLpd") /* rpc */ \ - X(TR_KEY_from_ltep_camel_APICOMPAT, "fromLtep") /* rpc */ \ - X(TR_KEY_from_pex_camel_APICOMPAT, "fromPex") /* rpc */ \ - X(TR_KEY_from_tracker_camel_APICOMPAT, "fromTracker") /* rpc */ \ X(TR_KEY_from_cache, "from_cache") /* rpc */ \ X(TR_KEY_from_dht, "from_dht") /* rpc */ \ X(TR_KEY_from_incoming, "from_incoming") /* rpc */ \ @@ -217,54 +137,30 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_from_pex, "from_pex") /* rpc */ \ X(TR_KEY_from_tracker, "from_tracker") /* rpc */ \ X(TR_KEY_group, "group") /* .resume, rpc */ \ - X(TR_KEY_group_get_kebab_APICOMPAT, "group-get") /* rpc */ \ - X(TR_KEY_group_set_kebab_APICOMPAT, "group-set") /* rpc */ \ X(TR_KEY_group_get, "group_get") /* rpc */ \ X(TR_KEY_group_set, "group_set") /* rpc */ \ - X(TR_KEY_has_announced_camel_APICOMPAT, "hasAnnounced") /* rpc */ \ - X(TR_KEY_has_scraped_camel_APICOMPAT, "hasScraped") /* rpc */ \ X(TR_KEY_has_announced, "has_announced") /* rpc */ \ X(TR_KEY_has_scraped, "has_scraped") /* rpc */ \ - X(TR_KEY_hash_string_camel_APICOMPAT, "hashString") /* rpc */ \ X(TR_KEY_hash_string, "hash_string") /* rpc */ \ - X(TR_KEY_have_unchecked_camel_APICOMPAT, "haveUnchecked") /* rpc */ \ - X(TR_KEY_have_valid_camel_APICOMPAT, "haveValid") /* rpc */ \ X(TR_KEY_have_unchecked, "have_unchecked") /* rpc */ \ X(TR_KEY_have_valid, "have_valid") /* rpc */ \ - X(TR_KEY_honors_session_limits_camel_APICOMPAT, "honorsSessionLimits") /* rpc */ \ X(TR_KEY_honors_session_limits, "honors_session_limits") /* rpc */ \ X(TR_KEY_host, "host") /* rpc */ \ X(TR_KEY_id, "id") /* dht.dat, rpc */ \ X(TR_KEY_id_timestamp, "id_timestamp") /* dht.dat */ \ - X(TR_KEY_idle_limit_kebab_APICOMPAT, "idle-limit") /* .resume */ \ - X(TR_KEY_idle_mode_kebab_APICOMPAT, "idle-mode") /* .resume */ \ - X(TR_KEY_idle_seeding_limit_kebab_APICOMPAT, "idle-seeding-limit") /* rpc, tr_session::Settings */ \ - X(TR_KEY_idle_seeding_limit_enabled_kebab_APICOMPAT, "idle-seeding-limit-enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_idle_limit, "idle_limit") /* .resume */ \ X(TR_KEY_idle_mode, "idle_mode") /* .resume */ \ X(TR_KEY_idle_seeding_limit, "idle_seeding_limit") /* rpc, tr_session::Settings */ \ X(TR_KEY_idle_seeding_limit_enabled, "idle_seeding_limit_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_ids, "ids") /* rpc */ \ X(TR_KEY_incomplete, "incomplete") /* BEP0048; BT protocol */ \ - X(TR_KEY_incomplete_dir_kebab_APICOMPAT, "incomplete-dir") /* .resume, daemon, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_incomplete_dir_enabled_kebab_APICOMPAT, "incomplete-dir-enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_incomplete_dir, "incomplete_dir") /* .resume, daemon, gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_incomplete_dir_enabled, "incomplete_dir_enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_info, "info") /* .torrent */ \ - X(TR_KEY_inhibit_desktop_hibernation_kebab_APICOMPAT, "inhibit-desktop-hibernation") /* gtk app, qt app */ \ X(TR_KEY_inhibit_desktop_hibernation, "inhibit_desktop_hibernation") /* gtk app, qt app */ \ X(TR_KEY_ip_protocol, "ip_protocol") /* rpc */ \ X(TR_KEY_ipv4, "ipv4") /* BEP0010; BT protocol, rpc */ \ X(TR_KEY_ipv6, "ipv6") /* BEP0010; BT protocol, rpc */ \ - X(TR_KEY_is_backup_camel_APICOMPAT, "isBackup") /* rpc */ \ - X(TR_KEY_is_downloading_from_camel_APICOMPAT, "isDownloadingFrom") /* rpc */ \ - X(TR_KEY_is_encrypted_camel_APICOMPAT, "isEncrypted") /* rpc */ \ - X(TR_KEY_is_finished_camel_APICOMPAT, "isFinished") /* rpc */ \ - X(TR_KEY_is_incoming_camel_APICOMPAT, "isIncoming") /* rpc */ \ - X(TR_KEY_is_private_camel_APICOMPAT, "isPrivate") /* rpc */ \ - X(TR_KEY_is_stalled_camel_APICOMPAT, "isStalled") /* rpc */ \ - X(TR_KEY_is_utp_camel_APICOMPAT, "isUTP") /* rpc */ \ - X(TR_KEY_is_uploading_to_camel_APICOMPAT, "isUploadingTo") /* rpc */ \ X(TR_KEY_is_backup, "is_backup") /* rpc */ \ X(TR_KEY_is_downloading_from, "is_downloading_from") /* rpc */ \ X(TR_KEY_is_encrypted, "is_encrypted") /* rpc */ \ @@ -276,17 +172,6 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_is_utp, "is_utp") /* rpc */ \ X(TR_KEY_jsonrpc, "jsonrpc") /* json-rpc */ \ X(TR_KEY_labels, "labels") /* .resume, rpc */ \ - X(TR_KEY_last_announce_peer_count_camel_APICOMPAT, "lastAnnouncePeerCount") /* rpc */ \ - X(TR_KEY_last_announce_result_camel_APICOMPAT, "lastAnnounceResult") /* rpc */ \ - X(TR_KEY_last_announce_start_time_camel_APICOMPAT, "lastAnnounceStartTime") /* rpc */ \ - X(TR_KEY_last_announce_succeeded_camel_APICOMPAT, "lastAnnounceSucceeded") /* rpc */ \ - X(TR_KEY_last_announce_time_camel_APICOMPAT, "lastAnnounceTime") /* rpc */ \ - X(TR_KEY_last_announce_timed_out_camel_APICOMPAT, "lastAnnounceTimedOut") /* rpc */ \ - X(TR_KEY_last_scrape_result_camel_APICOMPAT, "lastScrapeResult") /* rpc */ \ - X(TR_KEY_last_scrape_start_time_camel_APICOMPAT, "lastScrapeStartTime") /* rpc */ \ - X(TR_KEY_last_scrape_succeeded_camel_APICOMPAT, "lastScrapeSucceeded") /* rpc */ \ - X(TR_KEY_last_scrape_time_camel_APICOMPAT, "lastScrapeTime") /* rpc */ \ - X(TR_KEY_last_scrape_timed_out_camel_APICOMPAT, "lastScrapeTimedOut") /* rpc */ \ X(TR_KEY_last_announce_peer_count, "last_announce_peer_count") /* rpc */ \ X(TR_KEY_last_announce_result, "last_announce_result") /* rpc */ \ X(TR_KEY_last_announce_start_time, "last_announce_start_time") /* rpc */ \ @@ -298,43 +183,26 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_last_scrape_succeeded, "last_scrape_succeeded") /* rpc */ \ X(TR_KEY_last_scrape_time, "last_scrape_time") /* rpc */ \ X(TR_KEY_last_scrape_timed_out, "last_scrape_timed_out") /* rpc */ \ - X(TR_KEY_leecher_count_camel_APICOMPAT, "leecherCount") /* rpc */ \ X(TR_KEY_leecher_count, "leecher_count") /* rpc */ \ - X(TR_KEY_left_until_done_camel_APICOMPAT, "leftUntilDone") /* rpc */ \ X(TR_KEY_left_until_done, "left_until_done") /* rpc */ \ X(TR_KEY_length, "length") /* .torrent, rpc */ \ X(TR_KEY_location, "location") /* rpc */ \ - X(TR_KEY_lpd_enabled_kebab_APICOMPAT, "lpd-enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_lpd_enabled, "lpd_enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_m, "m") /* BEP0010, BEP0011; BT protocol */ \ - X(TR_KEY_magnet_link_camel_APICOMPAT, "magnetLink") /* rpc */ \ X(TR_KEY_magnet_link, "magnet_link") /* rpc */ \ - X(TR_KEY_main_window_height_kebab_APICOMPAT, "main-window-height") /* gtk app, qt app */ \ - X(TR_KEY_main_window_is_maximized_kebab_APICOMPAT, "main-window-is-maximized") /* gtk app */ \ - X(TR_KEY_main_window_layout_order_kebab_APICOMPAT, "main-window-layout-order") /* qt app */ \ - X(TR_KEY_main_window_width_kebab_APICOMPAT, "main-window-width") /* gtk app, qt app */ \ - X(TR_KEY_main_window_x_kebab_APICOMPAT, "main-window-x") /* gtk app, qt app */ \ - X(TR_KEY_main_window_y_kebab_APICOMPAT, "main-window-y") /* gtk app, qt app */ \ X(TR_KEY_main_window_height, "main_window_height") /* gtk app, qt app */ \ X(TR_KEY_main_window_is_maximized, "main_window_is_maximized") /* gtk app */ \ X(TR_KEY_main_window_layout_order, "main_window_layout_order") /* qt app */ \ X(TR_KEY_main_window_width, "main_window_width") /* gtk app, qt app */ \ X(TR_KEY_main_window_x, "main_window_x") /* gtk app, qt app */ \ X(TR_KEY_main_window_y, "main_window_y") /* gtk app, qt app */ \ - X(TR_KEY_manual_announce_time_camel_APICOMPAT, "manualAnnounceTime") /* rpc */ \ X(TR_KEY_manual_announce_time, "manual_announce_time") /* rpc */ \ - X(TR_KEY_max_peers_kebab_APICOMPAT, "max-peers") /* .resume */ \ - X(TR_KEY_max_connected_peers_camel_APICOMPAT, "maxConnectedPeers") /* rpc */ \ X(TR_KEY_max_connected_peers, "max_connected_peers") /* rpc */ \ X(TR_KEY_max_peers, "max_peers") /* .resume */ \ - X(TR_KEY_memory_bytes_kebab_APICOMPAT, "memory-bytes") /* rpc */ \ - X(TR_KEY_memory_units_kebab_APICOMPAT, "memory-units") /* rpc */ \ X(TR_KEY_memory_bytes, "memory_bytes") /* rpc */ \ X(TR_KEY_memory_units, "memory_units") /* rpc */ \ X(TR_KEY_message, "message") /* json-rpc, rpc */ \ - X(TR_KEY_message_level_kebab_APICOMPAT, "message-level") /* daemon, gtk app, tr_session::Settings */ \ X(TR_KEY_message_level, "message_level") /* daemon, gtk app, tr_session::Settings */ \ - X(TR_KEY_metadata_percent_complete_camel_APICOMPAT, "metadataPercentComplete") /* rpc */ \ X(TR_KEY_metadata_percent_complete, "metadata_percent_complete") /* rpc */ \ X(TR_KEY_metadata_size, "metadata_size") /* BEP0009; BT protocol */ \ X(TR_KEY_metainfo, "metainfo") /* rpc */ \ @@ -343,32 +211,16 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_msg_type, "msg_type") /* BT protocol */ \ X(TR_KEY_mtimes, "mtimes") /* .resume */ \ X(TR_KEY_name, "name") /* .resume, .torrent, rpc */ \ - X(TR_KEY_next_announce_time_camel_APICOMPAT, "nextAnnounceTime") /* rpc */ \ - X(TR_KEY_next_scrape_time_camel_APICOMPAT, "nextScrapeTime") /* rpc */ \ X(TR_KEY_next_announce_time, "next_announce_time") /* rpc */ \ X(TR_KEY_next_scrape_time, "next_scrape_time") /* rpc */ \ X(TR_KEY_nodes, "nodes") /* dht.dat */ \ X(TR_KEY_nodes6, "nodes6") /* dht.dat */ \ - X(TR_KEY_open_dialog_dir_kebab_APICOMPAT, "open-dialog-dir") /* gtk app, qt app */ \ X(TR_KEY_open_dialog_dir, "open_dialog_dir") /* gtk app, qt app */ \ X(TR_KEY_p, "p") /* BEP0010; BT protocol */ \ X(TR_KEY_params, "params") /* json-rpc */ \ X(TR_KEY_path, "path") /* .torrent, rpc */ \ X(TR_KEY_paused, "paused") /* .resume, rpc */ \ - X(TR_KEY_paused_torrent_count_camel_APICOMPAT, "pausedTorrentCount") /* rpc */ \ X(TR_KEY_paused_torrent_count, "paused_torrent_count") /* rpc */ \ - X(TR_KEY_peer_congestion_algorithm_kebab_APICOMPAT, "peer-congestion-algorithm") /* tr_session::Settings */ \ - X(TR_KEY_peer_limit_kebab_APICOMPAT, "peer-limit") /* rpc */ \ - X(TR_KEY_peer_limit_global_kebab_APICOMPAT, "peer-limit-global") /* daemon, rpc, tr_session::Settings */ \ - X(TR_KEY_peer_limit_per_torrent_kebab_APICOMPAT, \ - "peer-limit-per-torrent") /* daemon, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_peer_port_kebab_APICOMPAT, "peer-port") /* daemon, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_peer_port_random_high_kebab_APICOMPAT, "peer-port-random-high") /* tr_session::Settings */ \ - X(TR_KEY_peer_port_random_low_kebab_APICOMPAT, "peer-port-random-low") /* tr_session::Settings */ \ - X(TR_KEY_peer_port_random_on_start_kebab_APICOMPAT, "peer-port-random-on-start") /* rpc, tr_session::Settings */ \ - X(TR_KEY_peer_socket_tos_kebab_APICOMPAT, "peer-socket-tos") /* tr_session::Settings */ \ - X(TR_KEY_peer_is_choked_camel_APICOMPAT, "peerIsChoked") /* rpc */ \ - X(TR_KEY_peer_is_interested_camel_APICOMPAT, "peerIsInterested") /* rpc */ \ X(TR_KEY_peer_congestion_algorithm, "peer_congestion_algorithm") /* tr_session::Settings */ \ X(TR_KEY_peer_id, "peer_id") /* rpc */ \ X(TR_KEY_peer_is_choked, "peer_is_choked") /* rpc */ \ @@ -383,61 +235,36 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_peer_socket_diffserv, "peer_socket_diffserv") /* tr_session::Settings */ \ X(TR_KEY_peers, "peers") /* rpc */ \ X(TR_KEY_peers2, "peers2") /* .resume */ \ - X(TR_KEY_peers2_6_kebab_APICOMPAT, "peers2-6") /* .resume */ \ X(TR_KEY_peers2_6, "peers2_6") /* .resume */ \ - X(TR_KEY_peers_connected_camel_APICOMPAT, "peersConnected") /* rpc */ \ - X(TR_KEY_peers_from_camel_APICOMPAT, "peersFrom") /* rpc */ \ - X(TR_KEY_peers_getting_from_us_camel_APICOMPAT, "peersGettingFromUs") /* rpc */ \ - X(TR_KEY_peers_sending_to_us_camel_APICOMPAT, "peersSendingToUs") /* rpc */ \ X(TR_KEY_peers_connected, "peers_connected") /* rpc */ \ X(TR_KEY_peers_from, "peers_from") /* rpc */ \ X(TR_KEY_peers_getting_from_us, "peers_getting_from_us") /* rpc */ \ X(TR_KEY_peers_sending_to_us, "peers_sending_to_us") /* rpc */ \ - X(TR_KEY_percent_complete_camel_APICOMPAT, "percentComplete") /* rpc */ \ - X(TR_KEY_percent_done_camel_APICOMPAT, "percentDone") /* rpc */ \ X(TR_KEY_percent_complete, "percent_complete") /* rpc */ \ X(TR_KEY_percent_done, "percent_done") /* rpc */ \ - X(TR_KEY_pex_enabled_kebab_APICOMPAT, "pex-enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_pex_enabled, "pex_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_pidfile, "pidfile") /* daemon */ \ X(TR_KEY_piece, "piece") /* BT protocol */ \ X(TR_KEY_piece_length, "piece length") /* .torrent */ \ - X(TR_KEY_piece_count_camel_APICOMPAT, "pieceCount") /* rpc */ \ - X(TR_KEY_piece_size_camel_APICOMPAT, "pieceSize") /* rpc */ \ X(TR_KEY_piece_count, "piece_count") /* rpc */ \ X(TR_KEY_piece_size, "piece_size") /* rpc */ \ X(TR_KEY_pieces, "pieces") /* .resume, .torrent, rpc */ \ X(TR_KEY_port, "port") /* rpc */ \ - X(TR_KEY_port_forwarding_enabled_kebab_APICOMPAT, "port-forwarding-enabled") /* daemon, rpc, tr_session::Settings */ \ - X(TR_KEY_port_is_open_kebab_APICOMPAT, "port-is-open") /* rpc */ \ - X(TR_KEY_port_test_kebab_APICOMPAT, "port-test") /* rpc */ \ X(TR_KEY_port_forwarding_enabled, "port_forwarding_enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_port_is_open, "port_is_open") /* rpc */ \ X(TR_KEY_port_test, "port_test") /* rpc */ \ X(TR_KEY_preallocation, "preallocation") /* tr_session::Settings */ \ X(TR_KEY_preferred_transports, "preferred_transports") /* rpc, tr_session::Settings */ \ - X(TR_KEY_primary_mime_type_kebab_APICOMPAT, "primary-mime-type") /* rpc */ \ X(TR_KEY_primary_mime_type, "primary_mime_type") /* rpc */ \ X(TR_KEY_priorities, "priorities") /* rpc */ \ X(TR_KEY_priority, "priority") /* .resume, rpc */ \ - X(TR_KEY_priority_high_kebab_APICOMPAT, "priority-high") /* rpc */ \ - X(TR_KEY_priority_low_kebab_APICOMPAT, "priority-low") /* rpc */ \ - X(TR_KEY_priority_normal_kebab_APICOMPAT, "priority-normal") /* rpc */ \ X(TR_KEY_priority_high, "priority_high") /* rpc */ \ X(TR_KEY_priority_low, "priority_low") /* rpc */ \ X(TR_KEY_priority_normal, "priority_normal") /* rpc */ \ X(TR_KEY_private, "private") /* .torrent */ \ X(TR_KEY_progress, "progress") /* .resume, rpc */ \ - X(TR_KEY_prompt_before_exit_kebab_APICOMPAT, "prompt-before-exit") /* qt app */ \ X(TR_KEY_prompt_before_exit, "prompt_before_exit") /* qt app */ \ X(TR_KEY_proxy_url, "proxy_url") /* tr_session::Settings */ \ - X(TR_KEY_queue_move_bottom_kebab_APICOMPAT, "queue-move-bottom") /* rpc */ \ - X(TR_KEY_queue_move_down_kebab_APICOMPAT, "queue-move-down") /* rpc */ \ - X(TR_KEY_queue_move_top_kebab_APICOMPAT, "queue-move-top") /* rpc */ \ - X(TR_KEY_queue_move_up_kebab_APICOMPAT, "queue-move-up") /* rpc */ \ - X(TR_KEY_queue_stalled_enabled_kebab_APICOMPAT, "queue-stalled-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_queue_stalled_minutes_kebab_APICOMPAT, "queue-stalled-minutes") /* rpc, tr_session::Settings */ \ - X(TR_KEY_queue_position_camel_APICOMPAT, "queuePosition") /* rpc */ \ X(TR_KEY_queue_move_bottom, "queue_move_bottom") /* rpc */ \ X(TR_KEY_queue_move_down, "queue_move_down") /* rpc */ \ X(TR_KEY_queue_move_top, "queue_move_top") /* rpc */ \ @@ -445,34 +272,16 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_queue_position, "queue_position") /* rpc */ \ X(TR_KEY_queue_stalled_enabled, "queue_stalled_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_queue_stalled_minutes, "queue_stalled_minutes") /* rpc, tr_session::Settings */ \ - X(TR_KEY_rate_download_camel_APICOMPAT, "rateDownload") /* rpc */ \ - X(TR_KEY_rate_to_client_camel_APICOMPAT, "rateToClient") /* rpc */ \ - X(TR_KEY_rate_to_peer_camel_APICOMPAT, "rateToPeer") /* rpc */ \ - X(TR_KEY_rate_upload_camel_APICOMPAT, "rateUpload") /* rpc */ \ X(TR_KEY_rate_download, "rate_download") /* rpc */ \ X(TR_KEY_rate_to_client, "rate_to_client") /* rpc */ \ X(TR_KEY_rate_to_peer, "rate_to_peer") /* rpc */ \ X(TR_KEY_rate_upload, "rate_upload") /* rpc */ \ - X(TR_KEY_ratio_limit_kebab_APICOMPAT, "ratio-limit") /* .resume, daemon, gtk app, tr_session::Settings */ \ - X(TR_KEY_ratio_limit_enabled_kebab_APICOMPAT, "ratio-limit-enabled") /* daemon, tr_session::Settings */ \ - X(TR_KEY_ratio_mode_kebab_APICOMPAT, "ratio-mode") /* .resume */ \ X(TR_KEY_ratio_limit, "ratio_limit") /* .resume, daemon, gtk app, tr_session::Settings */ \ X(TR_KEY_ratio_limit_enabled, "ratio_limit_enabled") /* daemon, tr_session::Settings */ \ X(TR_KEY_ratio_mode, "ratio_mode") /* .resume */ \ - X(TR_KEY_read_clipboard_kebab_APICOMPAT, "read-clipboard") /* qt app */ \ X(TR_KEY_read_clipboard, "read_clipboard") /* qt app */ \ - X(TR_KEY_recently_active_kebab_APICOMPAT, "recently-active") /* rpc */ \ X(TR_KEY_recently_active, "recently_active") /* rpc */ \ - X(TR_KEY_recheck_progress_camel_APICOMPAT, "recheckProgress") /* rpc */ \ X(TR_KEY_recheck_progress, "recheck_progress") /* rpc */ \ - X(TR_KEY_remote_session_enabled_kebab_APICOMPAT, "remote-session-enabled") /* qt app */ \ - X(TR_KEY_remote_session_host_kebab_APICOMPAT, "remote-session-host") /* qt app */ \ - X(TR_KEY_remote_session_https_kebab_APICOMPAT, "remote-session-https") /* qt app */ \ - X(TR_KEY_remote_session_password_kebab_APICOMPAT, "remote-session-password") /* qt app */ \ - X(TR_KEY_remote_session_port_kebab_APICOMPAT, "remote-session-port") /* qt app */ \ - X(TR_KEY_remote_session_requres_authentication_kebab_APICOMPAT, \ - "remote-session-requres-authentication") /* SIC: misspelled prior to 4.1.0-beta.4; qt app */ \ - X(TR_KEY_remote_session_username_kebab_APICOMPAT, "remote-session-username") /* qt app */ \ X(TR_KEY_remote_session_enabled, "remote_session_enabled") /* qt app */ \ X(TR_KEY_remote_session_host, "remote_session_host") /* qt app */ \ X(TR_KEY_remote_session_https, "remote_session_https") /* qt app */ \ @@ -482,25 +291,9 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_remote_session_rpc_url_path, "remote_session_rpc_url_path") /* qt app */ \ X(TR_KEY_remote_session_username, "remote_session_username") /* qt app */ \ X(TR_KEY_removed, "removed") /* rpc */ \ - X(TR_KEY_rename_partial_files_kebab_APICOMPAT, "rename-partial-files") /* rpc, tr_session::Settings */ \ X(TR_KEY_rename_partial_files, "rename_partial_files") /* rpc, tr_session::Settings */ \ X(TR_KEY_reqq, "reqq") /* BEP0010; BT protocol, rpc, tr_session::Settings */ \ X(TR_KEY_result, "result") /* rpc */ \ - X(TR_KEY_rpc_authentication_required_kebab_APICOMPAT, "rpc-authentication-required") /* daemon, rpc server settings */ \ - X(TR_KEY_rpc_bind_address_kebab_APICOMPAT, "rpc-bind-address") /* daemon, rpc server settings */ \ - X(TR_KEY_rpc_enabled_kebab_APICOMPAT, "rpc-enabled") /* daemon, rpc server settings */ \ - X(TR_KEY_rpc_host_whitelist_kebab_APICOMPAT, "rpc-host-whitelist") /* rpc, rpc server settings */ \ - X(TR_KEY_rpc_host_whitelist_enabled_kebab_APICOMPAT, "rpc-host-whitelist-enabled") /* rpc, rpc server settings */ \ - X(TR_KEY_rpc_password_kebab_APICOMPAT, "rpc-password") /* daemon, rpc server settings */ \ - X(TR_KEY_rpc_port_kebab_APICOMPAT, "rpc-port") /* daemon, gtk app, rpc server settings */ \ - X(TR_KEY_rpc_socket_mode_kebab_APICOMPAT, "rpc-socket-mode") /* rpc server settings */ \ - X(TR_KEY_rpc_url_kebab_APICOMPAT, "rpc-url") /* rpc server settings */ \ - X(TR_KEY_rpc_username_kebab_APICOMPAT, "rpc-username") /* daemon, rpc server settings */ \ - X(TR_KEY_rpc_version_kebab_APICOMPAT, "rpc-version") /* rpc */ \ - X(TR_KEY_rpc_version_minimum_kebab_APICOMPAT, "rpc-version-minimum") /* rpc */ \ - X(TR_KEY_rpc_version_semver_kebab_APICOMPAT, "rpc-version-semver") /* rpc */ \ - X(TR_KEY_rpc_whitelist_kebab_APICOMPAT, "rpc-whitelist") /* daemon, gtk app, rpc server settings */ \ - X(TR_KEY_rpc_whitelist_enabled_kebab_APICOMPAT, "rpc-whitelist-enabled") /* daemon, rpc server settings */ \ X(TR_KEY_rpc_authentication_required, "rpc_authentication_required") /* daemon, rpc server settings */ \ X(TR_KEY_rpc_bind_address, "rpc_bind_address") /* daemon, rpc server settings */ \ X(TR_KEY_rpc_enabled, "rpc_enabled") /* daemon, rpc server settings */ \ @@ -517,38 +310,17 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_rpc_whitelist, "rpc_whitelist") /* daemon, gtk app, rpc server settings */ \ X(TR_KEY_rpc_whitelist_enabled, "rpc_whitelist_enabled") /* daemon, rpc server settings */ \ X(TR_KEY_scrape, "scrape") /* rpc */ \ - X(TR_KEY_scrape_paused_torrents_enabled_kebab_APICOMPAT, "scrape-paused-torrents-enabled") /* tr_session::Settings */ \ - X(TR_KEY_scrape_state_camel_APICOMPAT, "scrapeState") /* rpc */ \ X(TR_KEY_scrape_paused_torrents_enabled, "scrape_paused_torrents_enabled") /* tr_session::Settings */ \ X(TR_KEY_scrape_state, "scrape_state") /* rpc */ \ - X(TR_KEY_script_torrent_added_enabled_kebab_APICOMPAT, "script-torrent-added-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_script_torrent_added_filename_kebab_APICOMPAT, "script-torrent-added-filename") /* rpc, tr_session::Settings */ \ - X(TR_KEY_script_torrent_done_enabled_kebab_APICOMPAT, "script-torrent-done-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_script_torrent_done_filename_kebab_APICOMPAT, "script-torrent-done-filename") /* rpc, tr_session::Settings */ \ - X(TR_KEY_script_torrent_done_seeding_enabled_kebab_APICOMPAT, \ - "script-torrent-done-seeding-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_script_torrent_done_seeding_filename_kebab_APICOMPAT, \ - "script-torrent-done-seeding-filename") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_added_enabled, "script_torrent_added_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_added_filename, "script_torrent_added_filename") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_done_enabled, "script_torrent_done_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_done_filename, "script_torrent_done_filename") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_done_seeding_enabled, "script_torrent_done_seeding_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_script_torrent_done_seeding_filename, "script_torrent_done_seeding_filename") /* rpc, tr_session::Settings */ \ - X(TR_KEY_seconds_active_kebab_APICOMPAT, "seconds-active") /* stats.json */ \ - X(TR_KEY_seconds_active_camel_APICOMPAT, "secondsActive") /* rpc */ \ - X(TR_KEY_seconds_downloading_camel_APICOMPAT, "secondsDownloading") /* rpc */ \ - X(TR_KEY_seconds_seeding_camel_APICOMPAT, "secondsSeeding") /* rpc */ \ X(TR_KEY_seconds_active, "seconds_active") /* rpc, stats.json */ \ X(TR_KEY_seconds_downloading, "seconds_downloading") /* rpc */ \ X(TR_KEY_seconds_seeding, "seconds_seeding") /* rpc */ \ - X(TR_KEY_seed_queue_enabled_kebab_APICOMPAT, "seed-queue-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_seed_queue_size_kebab_APICOMPAT, "seed-queue-size") /* rpc, tr_session::Settings */ \ - X(TR_KEY_seed_idle_limit_camel_APICOMPAT, "seedIdleLimit") /* rpc */ \ - X(TR_KEY_seed_idle_mode_camel_APICOMPAT, "seedIdleMode") /* rpc */ \ - X(TR_KEY_seed_ratio_limit_camel_APICOMPAT, "seedRatioLimit") /* rpc */ \ - X(TR_KEY_seed_ratio_limited_camel_APICOMPAT, "seedRatioLimited") /* rpc */ \ - X(TR_KEY_seed_ratio_mode_camel_APICOMPAT, "seedRatioMode") /* rpc */ \ X(TR_KEY_seed_idle_limit, "seed_idle_limit") /* rpc */ \ X(TR_KEY_seed_idle_mode, "seed_idle_mode") /* rpc */ \ X(TR_KEY_seed_queue_enabled, "seed_queue_enabled") /* rpc, tr_session::Settings */ \ @@ -556,33 +328,16 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_seed_ratio_limit, "seed_ratio_limit") /* rpc */ \ X(TR_KEY_seed_ratio_limited, "seed_ratio_limited") /* rpc */ \ X(TR_KEY_seed_ratio_mode, "seed_ratio_mode") /* rpc */ \ - X(TR_KEY_seeder_count_camel_APICOMPAT, "seederCount") /* rpc */ \ X(TR_KEY_seeder_count, "seeder_count") /* rpc */ \ - X(TR_KEY_seeding_time_seconds_kebab_APICOMPAT, "seeding-time-seconds") /* .resume */ \ X(TR_KEY_seeding_time_seconds, "seeding_time_seconds") /* .resume */ \ X(TR_KEY_sequential_download, "sequential_download") /* .resume, daemon, rpc, tr_session::Settings */ \ X(TR_KEY_sequential_download_from_piece, "sequential_download_from_piece") /* .resume, rpc */ \ - X(TR_KEY_session_close_kebab_APICOMPAT, "session-close") /* rpc */ \ - X(TR_KEY_session_count_kebab_APICOMPAT, "session-count") /* stats.json */ \ - X(TR_KEY_session_get_kebab_APICOMPAT, "session-get") /* rpc */ \ - X(TR_KEY_session_id_kebab_APICOMPAT, "session-id") /* rpc */ \ - X(TR_KEY_session_set_kebab_APICOMPAT, "session-set") /* rpc */ \ - X(TR_KEY_session_stats_kebab_APICOMPAT, "session-stats") /* rpc */ \ - X(TR_KEY_session_count_camel_APICOMPAT, "sessionCount") /* rpc */ \ X(TR_KEY_session_close, "session_close") /* rpc */ \ X(TR_KEY_session_count, "session_count") /* rpc, stats.json */ \ X(TR_KEY_session_get, "session_get") /* rpc */ \ X(TR_KEY_session_id, "session_id") /* rpc */ \ X(TR_KEY_session_set, "session_set") /* rpc */ \ X(TR_KEY_session_stats, "session_stats") /* rpc */ \ - X(TR_KEY_show_backup_trackers_kebab_APICOMPAT, "show-backup-trackers") /* gtk app, qt app */ \ - X(TR_KEY_show_extra_peer_details_kebab_APICOMPAT, "show-extra-peer-details") /* gtk app */ \ - X(TR_KEY_show_filterbar_kebab_APICOMPAT, "show-filterbar") /* gtk app, qt app */ \ - X(TR_KEY_show_notification_area_icon_kebab_APICOMPAT, "show-notification-area-icon") /* gtk app, qt app */ \ - X(TR_KEY_show_options_window_kebab_APICOMPAT, "show-options-window") /* gtk app, qt app */ \ - X(TR_KEY_show_statusbar_kebab_APICOMPAT, "show-statusbar") /* gtk app, qt app */ \ - X(TR_KEY_show_toolbar_kebab_APICOMPAT, "show-toolbar") /* gtk app, qt app */ \ - X(TR_KEY_show_tracker_scrapes_kebab_APICOMPAT, "show-tracker-scrapes") /* gtk app, qt app */ \ X(TR_KEY_show_backup_trackers, "show_backup_trackers") /* gtk app, qt app */ \ X(TR_KEY_show_extra_peer_details, "show_extra_peer_details") /* gtk app */ \ X(TR_KEY_show_filterbar, "show_filterbar") /* gtk app, qt app */ \ @@ -592,28 +347,15 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_show_toolbar, "show_toolbar") /* gtk app, qt app */ \ X(TR_KEY_show_tracker_scrapes, "show_tracker_scrapes") /* gtk app, qt app */ \ X(TR_KEY_sitename, "sitename") /* rpc */ \ - X(TR_KEY_size_bytes_kebab_APICOMPAT, "size-bytes") /* rpc */ \ - X(TR_KEY_size_units_kebab_APICOMPAT, "size-units") /* rpc */ \ - X(TR_KEY_size_when_done_camel_APICOMPAT, "sizeWhenDone") /* rpc */ \ X(TR_KEY_size_bytes, "size_bytes") /* rpc */ \ X(TR_KEY_size_units, "size_units") /* rpc */ \ X(TR_KEY_size_when_done, "size_when_done") /* rpc */ \ - X(TR_KEY_sleep_per_seconds_during_verify_kebab_APICOMPAT, "sleep-per-seconds-during-verify") /* tr_session::Settings */ \ X(TR_KEY_sleep_per_seconds_during_verify, "sleep_per_seconds_during_verify") /* tr_session::Settings */ \ X(TR_KEY_socket_address, "socket_address") /* .resume */ \ - X(TR_KEY_sort_mode_kebab_APICOMPAT, "sort-mode") /* gtk app, qt app */ \ - X(TR_KEY_sort_reversed_kebab_APICOMPAT, "sort-reversed") /* gtk app, qt app */ \ X(TR_KEY_sort_mode, "sort_mode") /* gtk app, qt app */ \ X(TR_KEY_sort_reversed, "sort_reversed") /* gtk app, qt app */ \ X(TR_KEY_source, "source") /* .torrent */ \ X(TR_KEY_speed, "speed") /* .resume */ \ - X(TR_KEY_speed_Bps_kebab_APICOMPAT, "speed-Bps") /* .resume */ \ - X(TR_KEY_speed_bytes_kebab_APICOMPAT, "speed-bytes") /* rpc */ \ - X(TR_KEY_speed_limit_down_kebab_APICOMPAT, "speed-limit-down") /* .resume, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_speed_limit_down_enabled_kebab_APICOMPAT, "speed-limit-down-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_speed_limit_up_kebab_APICOMPAT, "speed-limit-up") /* .resume, gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_speed_limit_up_enabled_kebab_APICOMPAT, "speed-limit-up-enabled") /* rpc, tr_session::Settings */ \ - X(TR_KEY_speed_units_kebab_APICOMPAT, "speed-units") /* rpc */ \ X(TR_KEY_speed_Bps, "speed_Bps") /* .resume */ \ X(TR_KEY_speed_bytes, "speed_bytes") /* rpc */ \ X(TR_KEY_speed_limit_down, "speed_limit_down") /* .resume, gtk app, rpc, tr_session::Settings */ \ @@ -621,43 +363,17 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_speed_limit_up, "speed_limit_up") /* .resume, gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_speed_limit_up_enabled, "speed_limit_up_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_speed_units, "speed_units") /* rpc */ \ - X(TR_KEY_start_added_torrents_kebab_APICOMPAT, "start-added-torrents") /* gtk app, rpc, tr_session::Settings */ \ - X(TR_KEY_start_minimized_kebab_APICOMPAT, "start-minimized") /* qt app */ \ - X(TR_KEY_start_date_camel_APICOMPAT, "startDate") /* rpc */ \ X(TR_KEY_start_added_torrents, "start_added_torrents") /* gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_start_date, "start_date") /* rpc */ \ X(TR_KEY_start_minimized, "start_minimized") /* qt app */ \ X(TR_KEY_start_paused, "start_paused") /* daemon */ \ X(TR_KEY_status, "status") /* rpc */ \ - X(TR_KEY_statusbar_stats_kebab_APICOMPAT, "statusbar-stats") /* gtk app, qt app */ \ X(TR_KEY_statusbar_stats, "statusbar_stats") /* gtk app, qt app */ \ X(TR_KEY_tag, "tag") /* rpc */ \ - X(TR_KEY_tcp_enabled_kebab_APICOMPAT, "tcp-enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_tcp_enabled, "tcp_enabled") /* rpc, tr_session::Settings */ \ X(TR_KEY_tier, "tier") /* rpc */ \ - X(TR_KEY_time_checked_kebab_APICOMPAT, "time-checked") /* .resume */ \ X(TR_KEY_time_checked, "time_checked") /* .resume */ \ - X(TR_KEY_torrent_add_kebab_APICOMPAT, "torrent-add") /* rpc */ \ - X(TR_KEY_torrent_added_kebab_APICOMPAT, "torrent-added") /* rpc */ \ - X(TR_KEY_torrent_added_notification_enabled_kebab_APICOMPAT, "torrent-added-notification-enabled") /* gtk app, qt app */ \ - X(TR_KEY_torrent_added_verify_mode_kebab_APICOMPAT, "torrent-added-verify-mode") /* tr_session::Settings */ \ - X(TR_KEY_torrent_complete_notification_enabled_kebab_APICOMPAT, \ - "torrent-complete-notification-enabled") /* gtk app, qt app */ \ - X(TR_KEY_torrent_complete_sound_command_kebab_APICOMPAT, "torrent-complete-sound-command") /* gtk app, qt app */ \ - X(TR_KEY_torrent_complete_sound_enabled_kebab_APICOMPAT, "torrent-complete-sound-enabled") /* gtk app, qt app */ \ - X(TR_KEY_torrent_duplicate_kebab_APICOMPAT, "torrent-duplicate") /* rpc */ \ X(TR_KEY_torrent_get_kebab, "torrent-get") /* rpc */ \ - X(TR_KEY_torrent_reannounce_kebab_APICOMPAT, "torrent-reannounce") /* rpc */ \ - X(TR_KEY_torrent_remove_kebab_APICOMPAT, "torrent-remove") /* rpc */ \ - X(TR_KEY_torrent_rename_path_kebab_APICOMPAT, "torrent-rename-path") /* rpc */ \ - X(TR_KEY_torrent_set_kebab_APICOMPAT, "torrent-set") /* rpc */ \ - X(TR_KEY_torrent_set_location_kebab_APICOMPAT, "torrent-set-location") /* rpc */ \ - X(TR_KEY_torrent_start_kebab_APICOMPAT, "torrent-start") /* rpc */ \ - X(TR_KEY_torrent_start_now_kebab_APICOMPAT, "torrent-start-now") /* rpc */ \ - X(TR_KEY_torrent_stop_kebab_APICOMPAT, "torrent-stop") /* rpc */ \ - X(TR_KEY_torrent_verify_kebab_APICOMPAT, "torrent-verify") /* rpc */ \ - X(TR_KEY_torrent_count_camel_APICOMPAT, "torrentCount") /* rpc */ \ - X(TR_KEY_torrent_file_camel_APICOMPAT, "torrentFile") /* rpc */ \ X(TR_KEY_torrent_add, "torrent_add") /* rpc */ \ X(TR_KEY_torrent_added, "torrent_added") /* rpc */ \ X(TR_KEY_torrent_added_notification_enabled, "torrent_added_notification_enabled") /* gtk app, qt app */ \ @@ -680,31 +396,17 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_torrent_stop, "torrent_stop") /* rpc */ \ X(TR_KEY_torrent_verify, "torrent_verify") /* rpc */ \ X(TR_KEY_torrents, "torrents") /* rpc */ \ - X(TR_KEY_total_size_camel_APICOMPAT, "totalSize") /* rpc */ \ X(TR_KEY_total_size, "total_size") /* BT protocol, rpc */ \ - X(TR_KEY_tracker_add_camel_APICOMPAT, "trackerAdd") /* rpc */ \ - X(TR_KEY_tracker_list_camel_APICOMPAT, "trackerList") /* rpc */ \ - X(TR_KEY_tracker_remove_camel_APICOMPAT, "trackerRemove") /* rpc */ \ - X(TR_KEY_tracker_replace_camel_APICOMPAT, "trackerReplace") /* rpc */ \ - X(TR_KEY_tracker_stats_camel_APICOMPAT, "trackerStats") /* rpc */ \ X(TR_KEY_tracker_add, "tracker_add") /* rpc */ \ X(TR_KEY_tracker_list, "tracker_list") /* rpc */ \ X(TR_KEY_tracker_remove, "tracker_remove") /* rpc */ \ X(TR_KEY_tracker_replace, "tracker_replace") /* rpc */ \ X(TR_KEY_tracker_stats, "tracker_stats") /* rpc */ \ X(TR_KEY_trackers, "trackers") /* rpc */ \ - X(TR_KEY_trash_can_enabled_kebab_APICOMPAT, "trash-can-enabled") /* gtk app */ \ - X(TR_KEY_trash_original_torrent_files_kebab_APICOMPAT, \ - "trash-original-torrent-files") /* gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_trash_can_enabled, "trash_can_enabled") /* gtk app */ \ X(TR_KEY_trash_original_torrent_files, "trash_original_torrent_files") /* gtk app, rpc, tr_session::Settings */ \ X(TR_KEY_umask, "umask") /* tr_session::Settings */ \ X(TR_KEY_units, "units") /* rpc */ \ - X(TR_KEY_upload_slots_per_torrent_kebab_APICOMPAT, "upload-slots-per-torrent") /* tr_session::Settings */ \ - X(TR_KEY_upload_limit_camel_APICOMPAT, "uploadLimit") /* rpc */ \ - X(TR_KEY_upload_limited_camel_APICOMPAT, "uploadLimited") /* rpc */ \ - X(TR_KEY_upload_ratio_camel_APICOMPAT, "uploadRatio") /* rpc */ \ - X(TR_KEY_upload_speed_camel_APICOMPAT, "uploadSpeed") /* rpc */ \ X(TR_KEY_upload_limit, "upload_limit") /* rpc */ \ X(TR_KEY_upload_limited, "upload_limited") /* rpc */ \ X(TR_KEY_upload_only, "upload_only") /* BEP0021; BT protocol */ \ @@ -712,32 +414,22 @@ using tr_quark = transmission::symbol::Symbol; X(TR_KEY_upload_slots_per_torrent, "upload_slots_per_torrent") /* tr_session::Settings */ \ X(TR_KEY_upload_speed, "upload_speed") /* rpc */ \ X(TR_KEY_uploaded, "uploaded") /* .resume */ \ - X(TR_KEY_uploaded_bytes_kebab_APICOMPAT, "uploaded-bytes") /* stats.json */ \ - X(TR_KEY_uploaded_bytes_camel_APICOMPAT, "uploadedBytes") /* rpc */ \ - X(TR_KEY_uploaded_ever_camel_APICOMPAT, "uploadedEver") /* rpc */ \ X(TR_KEY_uploaded_bytes, "uploaded_bytes") /* rpc, stats.json */ \ X(TR_KEY_uploaded_ever, "uploaded_ever") /* rpc */ \ X(TR_KEY_url_list, "url-list") /* .torrent */ \ - X(TR_KEY_use_global_speed_limit_kebab_APICOMPAT, "use-global-speed-limit") /* .resume */ \ - X(TR_KEY_use_speed_limit_kebab_APICOMPAT, "use-speed-limit") /* .resume */ \ X(TR_KEY_use_global_speed_limit, "use_global_speed_limit") /* .resume */ \ X(TR_KEY_use_speed_limit, "use_speed_limit") /* .resume */ \ X(TR_KEY_ut_holepunch, "ut_holepunch") /* BT protocol */ \ X(TR_KEY_ut_metadata, "ut_metadata") /* BEP0011; BT protocol */ \ X(TR_KEY_ut_pex, "ut_pex") /* BEP0010, BEP0011; BT protocol */ \ - X(TR_KEY_utp_enabled_kebab_APICOMPAT, "utp-enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_utp_enabled, "utp_enabled") /* daemon, rpc, tr_session::Settings */ \ X(TR_KEY_v, "v") /* BEP0010; BT protocol */ \ X(TR_KEY_version, "version") /* rpc */ \ X(TR_KEY_wanted, "wanted") /* rpc */ \ - X(TR_KEY_watch_dir_kebab_APICOMPAT, "watch-dir") /* daemon, gtk app, qt app */ \ - X(TR_KEY_watch_dir_enabled_kebab_APICOMPAT, "watch-dir-enabled") /* daemon, gtk app, qt app */ \ - X(TR_KEY_watch_dir_force_generic_kebab_APICOMPAT, "watch-dir-force-generic") /* daemon */ \ X(TR_KEY_watch_dir, "watch_dir") /* daemon, gtk app, qt app */ \ X(TR_KEY_watch_dir_enabled, "watch_dir_enabled") /* daemon, gtk app, qt app */ \ X(TR_KEY_watch_dir_force_generic, "watch_dir_force_generic") /* daemon */ \ X(TR_KEY_webseeds, "webseeds") /* rpc */ \ - X(TR_KEY_webseeds_sending_to_us_camel_APICOMPAT, "webseedsSendingToUs") /* rpc */ \ X(TR_KEY_webseeds_sending_to_us, "webseeds_sending_to_us") /* rpc */ \ X(TR_KEY_yourip, "yourip") /* BEP0010; BT protocol */ @@ -750,7 +442,7 @@ KNOWN_KEYS(MAKE_KNOWN_KEY) * * @return true if the specified string exists as a quark */ -[[nodiscard]] std::optional tr_quark_lookup(std::string_view key); +[[nodiscard]] std::optional tr_quark_lookup(std::string_view str); /** * Get the string view that corresponds to the specified quark. diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc index aed34c576..42916ed5f 100644 --- a/libtransmission/utils.cc +++ b/libtransmission/utils.cc @@ -48,6 +48,7 @@ #include "libtransmission/transmission.h" +#include "libtransmission/api-compat.h" #include "libtransmission/error-types.h" #include "libtransmission/error.h" #include "libtransmission/file.h" @@ -802,6 +803,8 @@ void tr_lib_init() #undef KNOWN_KEY_NAME }; StringInterner::instance().add_known(std::data(known), std::size(known)); + + libtransmission::api_compat::register_deprecated_keys(); }); }