From ca07d754052197384cd166463900669592a10b2f Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Sat, 6 Apr 2019 08:28:53 -0500 Subject: [PATCH] Add '--version' to command line --- README.md | 6 ++-- src/invidious.cr | 88 ++++++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 0d02fe32..70f2c500 100644 --- a/README.md +++ b/README.md @@ -172,15 +172,12 @@ Usage: invidious [arguments] --ssl-key-file FILE SSL key file --ssl-cert-file FILE SSL certificate file -h, --help Shows this help - -t THREADS, --crawl-threads=THREADS - Number of threads for crawling YouTube (default: 0) -c THREADS, --channel-threads=THREADS Number of threads for refreshing channels (default: 1) -f THREADS, --feed-threads=THREADS Number of threads for refreshing feeds (default: 1) - -v THREADS, --video-threads=THREADS - Number of threads for refreshing videos (default: 0) -o OUTPUT, --output=OUTPUT Redirect output (default: STDOUT) + -v, --version Print version ``` Or for development: @@ -188,6 +185,7 @@ Or for development: ```bash $ curl -fsSLo- https://raw.githubusercontent.com/samueleaton/sentry/master/install.cr | crystal eval $ ./sentry +🤖 Your SentryBot is vigilant. beep-boop... ``` ## Documentation diff --git a/src/invidious.cr b/src/invidious.cr index 53edf843..9aa27205 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -31,6 +31,47 @@ require "./invidious/*" CONFIG = Config.from_yaml(File.read("config/config.yml")) HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32) +PG_URL = URI.new( + scheme: "postgres", + user: CONFIG.db[:user], + password: CONFIG.db[:password], + host: CONFIG.db[:host], + port: CONFIG.db[:port], + path: CONFIG.db[:dbname], +) + +PG_DB = DB.open PG_URL +ARCHIVE_URL = URI.parse("https://archive.org") +LOGIN_URL = URI.parse("https://accounts.google.com") +PUBSUB_URL = URI.parse("https://pubsubhubbub.appspot.com") +REDDIT_URL = URI.parse("https://www.reddit.com") +TEXTCAPTCHA_URL = URI.parse("http://textcaptcha.com/omarroth@protonmail.com.json") +YT_URL = URI.parse("https://www.youtube.com") +CHARS_SAFE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_" +CURRENT_BRANCH = {{ "#{`git branch | sed -n '/\* /s///p'`.strip}" }} +CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }} +CURRENT_VERSION = {{ "#{`git describe --tags --abbrev=0`.strip}" }} + +SOFTWARE = { + "name" => "invidious", + "version" => "#{CURRENT_VERSION}-#{CURRENT_COMMIT}", + "branch" => "#{CURRENT_BRANCH}", +} + +LOCALES = { + "ar" => load_locale("ar"), + "de" => load_locale("de"), + "en-US" => load_locale("en-US"), + "es" => load_locale("es"), + "eu" => load_locale("eu"), + "fr" => load_locale("fr"), + "it" => load_locale("it"), + "nb_NO" => load_locale("nb_NO"), + "nl" => load_locale("nl"), + "pl" => load_locale("pl"), + "ru" => load_locale("ru"), +} + config = CONFIG logger = Invidious::LogHandler.new @@ -56,45 +97,14 @@ Kemal.config.extra_options do |parser| FileUtils.mkdir_p(File.dirname(output)) logger = Invidious::LogHandler.new(File.open(output, mode: "a")) end + parser.on("-v", "--version", "Print version") do |output| + puts SOFTWARE.to_pretty_json + exit + end end Kemal::CLI.new ARGV -PG_URL = URI.new( - scheme: "postgres", - user: CONFIG.db[:user], - password: CONFIG.db[:password], - host: CONFIG.db[:host], - port: CONFIG.db[:port], - path: CONFIG.db[:dbname], -) - -PG_DB = DB.open PG_URL -ARCHIVE_URL = URI.parse("https://archive.org") -LOGIN_URL = URI.parse("https://accounts.google.com") -PUBSUB_URL = URI.parse("https://pubsubhubbub.appspot.com") -REDDIT_URL = URI.parse("https://www.reddit.com") -TEXTCAPTCHA_URL = URI.parse("http://textcaptcha.com/omarroth@protonmail.com.json") -YT_URL = URI.parse("https://www.youtube.com") -CHARS_SAFE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_" -CURRENT_BRANCH = {{ "#{`git branch | sed -n '/\* /s///p'`.strip}" }} -CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }} -CURRENT_VERSION = {{ "#{`git describe --tags --abbrev=0`.strip}" }} - -LOCALES = { - "ar" => load_locale("ar"), - "de" => load_locale("de"), - "en-US" => load_locale("en-US"), - "es" => load_locale("es"), - "eu" => load_locale("eu"), - "fr" => load_locale("fr"), - "it" => load_locale("it"), - "nb_NO" => load_locale("nb_NO"), - "nl" => load_locale("nl"), - "pl" => load_locale("pl"), - "ru" => load_locale("ru"), -} - refresh_channels(PG_DB, logger, config.channel_threads, config.full_refresh) refresh_feeds(PG_DB, logger, config.feed_threads) @@ -108,12 +118,8 @@ if config.statistics_enabled spawn do loop do statistics = { - "version" => "2.0", - "software" => { - "name" => "invidious", - "version" => "#{CURRENT_VERSION}-#{CURRENT_COMMIT}", - "branch" => "#{CURRENT_BRANCH}", - }, + "version" => "2.0", + "software" => SOFTWARE, "openRegistrations" => config.registration_enabled, "usage" => { "users" => {