Aphrodite merged health check

.editorconfig

@@ -185,9 +185,17 @@ dotnet_diagnostic.CA1814.severity = suggestion
 dotnet_diagnostic.CA1815.severity = suggestion
 dotnet_diagnostic.CA1816.severity = suggestion
 dotnet_diagnostic.CA1819.severity = suggestion
+dotnet_diagnostic.CA1820.severity = suggestion
+dotnet_diagnostic.CA1821.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1823.severity = suggestion
 dotnet_diagnostic.CA1824.severity = suggestion
+dotnet_diagnostic.CA1825.severity = suggestion
+dotnet_diagnostic.CA1826.severity = suggestion
+dotnet_diagnostic.CA1827.severity = suggestion
+dotnet_diagnostic.CA1828.severity = suggestion
+dotnet_diagnostic.CA1829.severity = suggestion
+dotnet_diagnostic.CA1834.severity = suggestion
 dotnet_diagnostic.CA2000.severity = suggestion
 dotnet_diagnostic.CA2002.severity = suggestion
 dotnet_diagnostic.CA2007.severity = suggestion

.esprintrc

@@ -1,7 +1,6 @@
 {
   "paths": [
-    "frontend/src/**/*.js",
-    "src/NzbDrone.Core/Localization/Core/*.json"
+    "frontend/src/**/*.js"
   ],
   "ignored": [
     "**/node_modules/**/*"

.gitchangelog.rc

@@ -0,0 +1,305 @@
+# -*- coding: utf-8; mode: python -*-
+##
+## Format
+##
+##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
+##
+## Description
+##
+##   ACTION is one of 'chg', 'fix', 'new'
+##
+##       Is WHAT the change is about.
+##
+##       'chg' is for refactor, small improvement, cosmetic changes...
+##       'fix' is for bug fixes
+##       'new' is for new features, big improvement
+##
+##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
+##
+##       Is WHO is concerned by the change.
+##
+##       'dev'  is for developpers (API changes, refactors...)
+##       'usr'  is for final users (UI changes)
+##       'pkg'  is for packagers   (packaging changes)
+##       'test' is for testers     (test only related changes)
+##       'doc'  is for doc guys    (doc only changes)
+##
+##   COMMIT_MSG is ... well ... the commit message itself.
+##
+##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
+##
+##       They are preceded with a '!' or a '@' (prefer the former, as the
+##       latter is wrongly interpreted in github.) Commonly used tags are:
+##
+##       'refactor' is obviously for refactoring code only
+##       'minor' is for a very meaningless change (a typo, adding a comment)
+##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
+##       'wip' is for partial functionality but complete subfunctionality.
+##
+## Example:
+##
+##   new: usr: support of bazaar implemented
+##   chg: re-indentend some lines !cosmetic
+##   new: dev: updated code to be compatible with last version of killer lib.
+##   fix: pkg: updated year of licence coverage.
+##   new: test: added a bunch of test around user usability of feature X.
+##   fix: typo in spelling my name in comment. !minor
+##
+##   Please note that multi-line commit message are supported, and only the
+##   first line will be considered as the "summary" of the commit message. So
+##   tags, and other rules only applies to the summary.  The body of the commit
+##   message will be displayed in the changelog without reformatting.
+
+
+##
+## ``ignore_regexps`` is a line of regexps
+##
+## Any commit having its full commit message matching any regexp listed here
+## will be ignored and won't be reported in the changelog.
+##
+ignore_regexps = [
+    r'@minor', r'!minor',
+    r'@cosmetic', r'!cosmetic',
+    r'@refactor', r'!refactor',
+    r'@wip', r'!wip',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
+    r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
+    r'^$',  ## ignore commits with empty messages
+]
+
+
+## ``section_regexps`` is a list of 2-tuples associating a string label and a
+## list of regexp
+##
+## Commit messages will be classified in sections thanks to this. Section
+## titles are the label, and a commit is classified under this section if any
+## of the regexps associated is matching.
+##
+## Please note that ``section_regexps`` will only classify commits and won't
+## make any changes to the contents. So you'll probably want to go check
+## ``subject_process`` (or ``body_process``) to do some changes to the subject,
+## whenever you are tweaking this variable.
+##
+section_regexps = [
+    ('**New features**', [
+        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?(.*)$',
+        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[nN]ew?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+    ('**Fixes**', [
+        r'^(?![mM]erge\s*)'
+    ]
+    ),
+
+]
+
+
+## ``body_process`` is a callable
+##
+## This callable will be given the original body and result will
+## be used in the changelog.
+##
+## Available constructs are:
+##
+##   - any python callable that take one txt argument and return txt argument.
+##
+##   - ReSub(pattern, replacement): will apply regexp substitution.
+##
+##   - Indent(chars="  "): will indent the text with the prefix
+##     Please remember that template engines gets also to modify the text and
+##     will usually indent themselves the text if needed.
+##
+##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
+##
+##   - noop: do nothing
+##
+##   - ucfirst: ensure the first letter is uppercase.
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - final_dot: ensure text finishes with a dot
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - strip: remove any spaces before or after the content of the string
+##
+##   - SetIfEmpty(msg="No commit message."): will set the text to
+##     whatever given ``msg`` if the current text is empty.
+##
+## Additionally, you can `pipe` the provided filters, for instance:
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
+#body_process = noop
+body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
+
+
+## ``subject_process`` is a callable
+##
+## This callable will be given the original subject and result will
+## be used in the changelog.
+## subject_process = (strip |
+##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
+##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
+##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
+##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
+##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
+##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+## Available constructs are those listed in ``body_process`` doc.
+subject_process = (strip |
+    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/--%20-New-brightgreen.svg?style=flat-square) \4') |
+    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/--%20-Changed-orange.svg?style=flat-square) \4') |
+    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/--%20-Fixed-red.svg?style=flat-square) \4') |
+    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/--%20-Updated-blue.svg?style=flat-square) \4') |
+    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
+    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+
+## ``tag_filter_regexp`` is a regexp
+##
+## Tags that will be used for the changelog must match this regexp.
+##
+tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]{3,4}$'
+
+
+## ``unreleased_version_label`` is a string or a callable that outputs a string
+##
+## This label will be used as the changelog Title of the last set of changes
+## between last valid tag and HEAD if any.
+unreleased_version_label = "(unreleased)"
+
+
+## ``output_engine`` is a callable
+##
+## This will change the output format of the generated changelog file
+##
+## Available choices are:
+##
+##   - rest_py
+##
+##        Legacy pure python engine, outputs ReSTructured text.
+##        This is the default.
+##
+##   - mustache(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mustache/*.tpl``.
+##        Requires python package ``pystache``.
+##        Examples:
+##           - mustache("markdown")
+##           - mustache("restructuredtext")
+##
+##   - makotemplate(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mako/*.tpl``.
+##        Requires python package ``mako``.
+##        Examples:
+##           - makotemplate("restructuredtext")
+##
+#output_engine = rest_py
+#output_engine = mustache("restructuredtext")
+output_engine = mustache("changelog.tpl")
+#output_engine = makotemplate("restructuredtext")
+
+
+## ``include_merge`` is a boolean
+##
+## This option tells git-log whether to include merge commits in the log.
+## The default is to include them.
+include_merge = False
+
+
+## ``log_encoding`` is a string identifier
+##
+## This option tells gitchangelog what encoding is outputed by ``git log``.
+## The default is to be clever about it: it checks ``git config`` for
+## ``i18n.logOutputEncoding``, and if not found will default to git's own
+## default: ``utf-8``.
+#log_encoding = 'utf-8'
+
+
+## ``publish`` is a callable
+##
+## Sets what ``gitchangelog`` should do with the output generated by
+## the output engine. ``publish`` is a callable taking one argument
+## that is an interator on lines from the output engine.
+##
+## Some helper callable are provided:
+##
+## Available choices are:
+##
+##   - stdout
+##
+##        Outputs directly to standard output
+##        (This is the default)
+##
+##   - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
+##
+##        Creates a callable that will parse given file for the given
+##        regex pattern and will insert the output in the file.
+##        ``idx`` is a callable that receive the matching object and
+##        must return a integer index point where to insert the
+##        the output in the file. Default is to return the position of
+##        the start of the matched string.
+##
+##   - FileRegexSubst(file, pattern, replace, flags)
+##
+##        Apply a replace inplace in the given file. Your regex pattern must
+##        take care of everything and might be more complex. Check the README
+##        for a complete copy-pastable example.
+##
+# publish = FileInsertIntoFirstRegexMatch(
+#     "CHANGELOG.rst",
+#     r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
+#     idx=lambda m: m.start(1)
+# )
+#publish = stdout
+
+def write_to_file(content):
+  with open("CHANGELOG.md", "w+") as f:
+    for chunk in content:
+      f.write(chunk)
+
+publish = write_to_file
+
+
+## ``revs`` is a list of callable or a list of string
+##
+## callable will be called to resolve as strings and allow dynamical
+## computation of these. The result will be used as revisions for
+## gitchangelog (as if directly stated on the command line). This allows
+## to filter exaclty which commits will be read by gitchangelog.
+##
+## To get a full documentation on the format of these strings, please
+## refer to the ``git rev-list`` arguments. There are many examples.
+##
+## Using callables is especially useful, for instance, if you
+## are using gitchangelog to generate incrementally your changelog.
+##
+## Some helpers are provided, you can use them::
+##
+##   - FileFirstRegexMatch(file, pattern): will return a callable that will
+##     return the first string match for the given pattern in the given file.
+##     If you use named sub-patterns in your regex pattern, it'll output only
+##     the string matching the regex pattern named "rev".
+##
+##   - Caret(rev): will return the rev prefixed by a "^", which is a
+##     way to remove the given revision and all its ancestor.
+##
+## Please note that if you provide a rev-list on the command line, it'll
+## replace this value (which will then be ignored).
+##
+## If empty, then ``gitchangelog`` will act as it had to generate a full
+## changelog.
+##
+## The default is to use all commits to make the changelog.
+#revs = ["^1.0.3", ]
+#revs = [
+#    Caret(
+#        FileFirstRegexMatch(
+#            "CHANGELOG.rst",
+#            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
+#    "HEAD"
+#]
+revs = ["v0.2.0.134..."]

.gitchangelog.rc.release

@@ -0,0 +1,311 @@
+# -*- coding: utf-8; mode: python -*-
+##
+## Format
+##
+##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
+##
+## Description
+##
+##   ACTION is one of 'chg', 'fix', 'new'
+##
+##       Is WHAT the change is about.
+##
+##       'chg' is for refactor, small improvement, cosmetic changes...
+##       'fix' is for bug fixes
+##       'new' is for new features, big improvement
+##
+##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
+##
+##       Is WHO is concerned by the change.
+##
+##       'dev'  is for developpers (API changes, refactors...)
+##       'usr'  is for final users (UI changes)
+##       'pkg'  is for packagers   (packaging changes)
+##       'test' is for testers     (test only related changes)
+##       'doc'  is for doc guys    (doc only changes)
+##
+##   COMMIT_MSG is ... well ... the commit message itself.
+##
+##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
+##
+##       They are preceded with a '!' or a '@' (prefer the former, as the
+##       latter is wrongly interpreted in github.) Commonly used tags are:
+##
+##       'refactor' is obviously for refactoring code only
+##       'minor' is for a very meaningless change (a typo, adding a comment)
+##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
+##       'wip' is for partial functionality but complete subfunctionality.
+##
+## Example:
+##
+##   new: usr: support of bazaar implemented
+##   chg: re-indentend some lines !cosmetic
+##   new: dev: updated code to be compatible with last version of killer lib.
+##   fix: pkg: updated year of licence coverage.
+##   new: test: added a bunch of test around user usability of feature X.
+##   fix: typo in spelling my name in comment. !minor
+##
+##   Please note that multi-line commit message are supported, and only the
+##   first line will be considered as the "summary" of the commit message. So
+##   tags, and other rules only applies to the summary.  The body of the commit
+##   message will be displayed in the changelog without reformatting.
+
+
+##
+## ``ignore_regexps`` is a line of regexps
+##
+## Any commit having its full commit message matching any regexp listed here
+## will be ignored and won't be reported in the changelog.
+##
+ignore_regexps = [
+    r'@minor', r'!minor',
+    r'@cosmetic', r'!cosmetic',
+    r'@refactor', r'!refactor',
+    r'@wip', r'!wip',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
+    r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
+    r'^$',  ## ignore commits with empty messages
+]
+
+
+## ``section_regexps`` is a list of 2-tuples associating a string label and a
+## list of regexp
+##
+## Commit messages will be classified in sections thanks to this. Section
+## titles are the label, and a commit is classified under this section if any
+## of the regexps associated is matching.
+##
+## Please note that ``section_regexps`` will only classify commits and won't
+## make any changes to the contents. So you'll probably want to go check
+## ``subject_process`` (or ``body_process``) to do some changes to the subject,
+## whenever you are tweaking this variable.
+##
+section_regexps = [
+    ('**New features:**', [
+        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[nN]ew?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+    ('**Fixes:**', [
+        r'^(?![mM]erge\s*)'
+    ]
+    ),
+
+]
+
+
+## ``body_process`` is a callable
+##
+## This callable will be given the original body and result will
+## be used in the changelog.
+##
+## Available constructs are:
+##
+##   - any python callable that take one txt argument and return txt argument.
+##
+##   - ReSub(pattern, replacement): will apply regexp substitution.
+##
+##   - Indent(chars="  "): will indent the text with the prefix
+##     Please remember that template engines gets also to modify the text and
+##     will usually indent themselves the text if needed.
+##
+##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
+##
+##   - noop: do nothing
+##
+##   - ucfirst: ensure the first letter is uppercase.
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - final_dot: ensure text finishes with a dot
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - strip: remove any spaces before or after the content of the string
+##
+##   - SetIfEmpty(msg="No commit message."): will set the text to
+##     whatever given ``msg`` if the current text is empty.
+##
+## Additionally, you can `pipe` the provided filters, for instance:
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
+#body_process = noop
+body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
+
+
+## ``subject_process`` is a callable
+##
+## This callable will be given the original subject and result will
+## be used in the changelog.
+## subject_process = (strip |
+##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
+##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
+##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
+##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
+##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
+##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+## Available constructs are those listed in ``body_process`` doc.
+subject_process = (strip |
+    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'#(\d{3,4})', r'Issue #\1') |
+    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+
+## ``tag_filter_regexp`` is a regexp
+##
+## Tags that will be used for the changelog must match this regexp.
+##
+tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]+$'
+
+
+## ``unreleased_version_label`` is a string or a callable that outputs a string
+##
+## This label will be used as the changelog Title of the last set of changes
+## between last valid tag and HEAD if any.
+unreleased_version_label = "(unreleased)"
+
+
+## ``output_engine`` is a callable
+##
+## This will change the output format of the generated changelog file
+##
+## Available choices are:
+##
+##   - rest_py
+##
+##        Legacy pure python engine, outputs ReSTructured text.
+##        This is the default.
+##
+##   - mustache(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mustache/*.tpl``.
+##        Requires python package ``pystache``.
+##        Examples:
+##           - mustache("markdown")
+##           - mustache("restructuredtext")
+##
+##   - makotemplate(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mako/*.tpl``.
+##        Requires python package ``mako``.
+##        Examples:
+##           - makotemplate("restructuredtext")
+##
+#output_engine = rest_py
+#output_engine = mustache("restructuredtext")
+output_engine = mustache("changelog_release.tpl")
+#output_engine = makotemplate("restructuredtext")
+
+
+## ``include_merge`` is a boolean
+##
+## This option tells git-log whether to include merge commits in the log.
+## The default is to include them.
+include_merge = False
+
+
+## ``log_encoding`` is a string identifier
+##
+## This option tells gitchangelog what encoding is outputed by ``git log``.
+## The default is to be clever about it: it checks ``git config`` for
+## ``i18n.logOutputEncoding``, and if not found will default to git's own
+## default: ``utf-8``.
+#log_encoding = 'utf-8'
+
+
+## ``publish`` is a callable
+##
+## Sets what ``gitchangelog`` should do with the output generated by
+## the output engine. ``publish`` is a callable taking one argument
+## that is an interator on lines from the output engine.
+##
+## Some helper callable are provided:
+##
+## Available choices are:
+##
+##   - stdout
+##
+##        Outputs directly to standard output
+##        (This is the default)
+##
+##   - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
+##
+##        Creates a callable that will parse given file for the given
+##        regex pattern and will insert the output in the file.
+##        ``idx`` is a callable that receive the matching object and
+##        must return a integer index point where to insert the
+##        the output in the file. Default is to return the position of
+##        the start of the matched string.
+##
+##   - FileRegexSubst(file, pattern, replace, flags)
+##
+##        Apply a replace inplace in the given file. Your regex pattern must
+##        take care of everything and might be more complex. Check the README
+##        for a complete copy-pastable example.
+##
+# publish = FileInsertIntoFirstRegexMatch(
+#     "CHANGELOG.rst",
+#     r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
+#     idx=lambda m: m.start(1)
+# )
+publish = stdout
+
+#def write_to_file(content):
+#  with open("CHANGELOG.md", "w+") as f:
+#    for chunk in content:
+#      f.write(chunk)
+
+#publish = write_to_file
+
+
+## ``revs`` is a list of callable or a list of string
+##
+## callable will be called to resolve as strings and allow dynamical
+## computation of these. The result will be used as revisions for
+## gitchangelog (as if directly stated on the command line). This allows
+## to filter exaclty which commits will be read by gitchangelog.
+##
+## To get a full documentation on the format of these strings, please
+## refer to the ``git rev-list`` arguments. There are many examples.
+##
+## Using callables is especially useful, for instance, if you
+## are using gitchangelog to generate incrementally your changelog.
+##
+## Some helpers are provided, you can use them::
+##
+##   - FileFirstRegexMatch(file, pattern): will return a callable that will
+##     return the first string match for the given pattern in the given file.
+##     If you use named sub-patterns in your regex pattern, it'll output only
+##     the string matching the regex pattern named "rev".
+##
+##   - Caret(rev): will return the rev prefixed by a "^", which is a
+##     way to remove the given revision and all its ancestor.
+##
+## Please note that if you provide a rev-list on the command line, it'll
+## replace this value (which will then be ignored).
+##
+## If empty, then ``gitchangelog`` will act as it had to generate a full
+## changelog.
+##
+## The default is to use all commits to make the changelog.
+#revs = ["^1.0.3", ]
+#revs = [
+#    Caret(
+#        FileFirstRegexMatch(
+#            "CHANGELOG.rst",
+#            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
+#    "HEAD"
+#]
+# Gets the latest annoted tag and uses that as a base for new changes.
+
+import subprocess
+
+proc = subprocess.Popen(["git", "describe", "--abbrev=0", "--tags"], stdout=subprocess.PIPE)
+out = str(proc.communicate()[0].strip(), "utf-8")
+revs = [out+"..."]

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,22 @@
+**Description:**
+
+<!-- Check first that your problem is not listed in our wiki section:
+* https://github.com/Radarr/Radarr/wiki/Common-Problems
+* https://github.com/Radarr/Radarr/wiki/FAQ
+
+**Just because you receive an exception in your logs, doesn't mean it's a bug and should be reported here. Often it's something else, such as a permission error. If you are unsure ask on the Discord or Subreddit first.**
+
+Visit our [Discord server](https://discord.gg/NWYch8M) or [Subreddit](https://reddit.com/r/radarr) for support or longer discussions. Support questions posed on here will be closed immediately.
+
+Provide a description of the feature request or bug here, the more details the better. 
+Please also include the following if you are reporting a bug. If you do not include it, the issue will probably be closed as we cannot help you. -->
+
+**Radarr Version:**
+
+**Mono Version:**
+
+**Debug Logs:**
+
+# Do not remove anything from your logs and post the full logs! If not everything fits in here use a service like https://pastebin.com to upload them.
+
+<!-- Please use the search bar (make sure to include closed issues as well) and make sure you are not submitting an already submitted issue. -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,7 @@
 ---
-name: Bug Report
-about: Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug!
+name: Bug report
+about: Support requests will be closed immediately, if you are unsure go to our Discord
+  or Subreddit first. Exceptions do not mean you found a bug!
 title: ''
 labels: bug
 assignees: ''
@@ -24,12 +25,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Platform Information (please complete the following information):**
- - OS: [e.g. Windows 10 2004 / Ubuntu 20.10]
- - Docker: [Yes/No]
- - Mono or.NET Core Version: [e.g. Mono 5.8 or .Net Core 3.1.10] (found under System -> Status)
- - Browser and Version [e.g. chrome 86.0.4240.198] (Only needed for UI issues)
+ - OS: [e.g. Windows]
+ - Mono Version: [e.g. Mono 5.8] (Only needed under Linux and Mac, found under System -> Status)
+ - Browser and Version [e.g. chrome, safari] (Only needed for UI issues)
  - Radarr Version [e.g. 3.0.0.2956]
- - Radarr Branch [e.g. master]
 
-**Trace Logs**
-Turn on Trace logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
+**Debug Logs**
+Turn on debug logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site and link it). Issues will be closed, if they do not include this!**

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Support via Discord
-    url: https://discord.gg/r5wJPt9
+    url: https://discord.gg/AD3UP37
     about: Chat with users and devs on support and setup related topics.
   - name: Support via Reddit
     url: https://reddit.com/r/radarr

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,13 +3,11 @@ YES | NO
 
 #### Description
 
-#### Screenshot (if UI related)
 
 #### Todos
 - [ ] Tests
 - [ ] Translation Keys
-- [ ] Wiki Updates
 
 #### Issues Fixed or Closed by this PR
 
-* Fixes #XXXX
+* #

.github/stale.yml

@@ -7,10 +7,7 @@ exemptLabels:
   - feature request
   - parser
   - confirmed
-  - sonarr-pull
-  - lidarr-pull
-  - readarr-pull
-  - v3
+  - aphrodite
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

.github/support.yml

@@ -6,7 +6,7 @@ supportLabel: support
 # to a support page, or set to `false` to disable
 supportComment: >
   We use the issue tracker exclusively for bug reports and feature requests.
-  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/r5wJPt9) or [Subreddit](https://reddit.com/r/radarr)
+  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/ZDmT7qb) or [Subreddit](https://reddit.com/r/radarr)
 # Whether to close issues marked as support requests
 close: true
 # Whether to lock issues marked as support requests

.github/workflows/lock.yml

@@ -1,21 +0,0 @@
-name: 'Lock threads'
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          issue-lock-inactive-days: '90'
-          issue-exclude-created-before: ''
-          issue-exclude-labels: ''
-          issue-lock-labels: ''
-          issue-lock-comment: ''
-          issue-lock-reason: 'resolved'
-          process-only: ''

CONTRIBUTING.md

@@ -3,38 +3,22 @@
 We're always looking for people to help make Radarr even better, there are a number of ways to contribute.
 
 ## Documentation ##
-Setup guides, FAQ, the more information we have on the [wiki](https://wiki.servarr.com/Radarr) the better.
+Setup guides, FAQ, the more information we have on the wiki the better.
 
 ## Development ##
 
-### Tools required ###
-- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (https://www.visualstudio.com/downloads/).
-- HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc)
-- [Git](https://git-scm.com/downloads)
-- [NodeJS](https://nodejs.org/en/download/) (Node 10.X.X or higher)
-- [Yarn](https://yarnpkg.com/)
-- .NET Core 3.1. 
-
-### Getting started ###
-
-1. Fork Radarr
-2. Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
-3. Install the required Node Packages `yarn install`
-4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
-5. Build the project in Visual Studio, Setting startup project to `Radarr.Console` and framework to `netcoreapp31`
-6. Debug the project in Visual Studio
-7. Open http://localhost:7878
+See the readme for information on setting up your development environment.
 
 ### Contributing Code ###
 - If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Radarr/Radarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
 - Rebase from Radarr's develop branch, don't merge
 - Make meaningful commits, or squash them
 - Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
-- Reach out to us on the discord if you have any questions
+- Reach out to us on the forums or on IRC if you have any questions
 - Add tests (unit/integration)
 - Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
 - One feature/bug fix per pull request to keep things clean and easy to understand
-- Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
+- Use 4 spaces instead of tabs, this is the default for VS 2012 and WebStorm (to my knowledge)
 
 ### Pull Requesting ###
 - Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it

README.md

@@ -2,14 +2,62 @@
 
 [![Build Status](https://dev.azure.com/Radarr/Radarr/_apis/build/status/Radarr.Radarr?branchName=develop)](https://dev.azure.com/Radarr/Radarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/radarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/Radarr_Installation#Docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://github.com/Radarr/Radarr/wiki/Docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg)
-[![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers) 
-[![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)
+[![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)
 
-Radarr is a movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them. It can also be configured to automatically upgrade the quality of existing files in the library when a better quality format becomes available.
+Radarr is an __independent__ fork of [Sonarr](https://github.com/Sonarr/Sonarr) reworked for automatically downloading movies via Usenet and BitTorrent.
 
-## Major Features Include:
+The project was inspired by other Usenet/BitTorrent movie downloaders such as CouchPotato.
+
+## Getting Started
+
+[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Installation)
+[![Docker](https://img.shields.io/badge/wiki-docker-1488C6.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Docker) 
+[![Setup Guide](https://img.shields.io/badge/wiki-setup_guide-orange.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Setup-Guide)
+[![FAQ](https://img.shields.io/badge/wiki-FAQ-BF55EC.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/FAQ)
+
+
+If you are using Docker please ensure your Docker paths are setup correctly using [this guide to facilitate](https://old.reddit.com/r/usenet/wiki/docker) hardlinks and minimize permissions issues. 
+
+* [Install Radarr for your desired OS](https://github.com/Radarr/Radarr/wiki/Installation) *or* use [Docker](https://github.com/Radarr/Radarr/wiki/Docker)
+* *For Linux users*, run `radarr` and *optionally* have [Radarr start automatically](https://github.com/Radarr/Radarr/wiki/Autostart-on-Linux)
+* Connect to the UI through <http://localhost:7878> or <http://your-ip:7878> in your web browser
+* See the [Setup Guide](https://github.com/Radarr/Radarr/wiki/Setup-Guide) for further configuration
+
+## Downloads
+Please note that v0.2 will only have critical bugs resolved as of August 2020. Any additional development or features will be soley in V3.
+
+| Release Type    | Branch: develop (stable)                                                                                                                                                     | Branch: nightly (semi-unstable)                                                                                                                                                                | Branch: aphrodite (very-unstable)                                                                                                                                              |
+|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Binary Releases | [![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)                 | [![AppVeyor Builds](https://img.shields.io/badge/downloads-nightly-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/branch/develop/artifacts)    |                                                                                                                                                                                |
+| Docker - lsio   | [![Docker release](https://img.shields.io/badge/linuxserver-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)  | [![Docker nightly](https://img.shields.io/badge/linuxserver-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)                   | [![Docker aphrodite](https://img.shields.io/badge/linuxserver-radarr:preview-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr) |
+| Docker - hotio  | [![Docker release](https://img.shields.io/badge/hotio-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)              | [![Docker nightly](https://img.shields.io/badge/hotio-radarr:unstable-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)                              | [![Docker aphrodite](https://img.shields.io/badge/hotio-radarr:aphrodite-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)           |
+
+## Support
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
+[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki)
+
+## Status
+
+[![GitHub issues](https://img.shields.io/github/issues/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/pulls)
+[![GNU GPL v3](https://img.shields.io/badge/license-GNU%20GPL%20v3-blue.svg?maxAge=60&style=flat-square)](http://www.gnu.org/licenses/gpl.html)
+[![Copyright 2010-2020](https://img.shields.io/badge/copyright-2020-blue.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr)
+[![Github Releases](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr/)
+[![Changelog](https://img.shields.io/github/commit-activity/w/radarr/radarr.svg?style=flat-square)](/CHANGELOG.md#unreleased)
+
+### [Site and API Status](https://status.radarr.video)
+
+Radarr is currently undergoing rapid development and pull requests are actively added into the repository.
+
+## Features
+
+### Current Features
 
 * Adding new movies with lots of information, such as trailers, ratings, etc.
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
@@ -21,57 +69,78 @@ Radarr is a movie collection manager for Usenet and BitTorrent users. It can mon
 * Automatically importing downloaded movies
 * Recognizing Special Editions, Director's Cut, etc.
 * Identifying releases with hardcoded subs
-* QBittorrent, Deluge, rTorrent, Transmission, uTorrent, and other download clients are supported 
+* All indexers supported by Sonarr also supported
+* New PassThePopcorn Indexer
+* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
+* New TorrentPotato Indexer
+* Torznab Indexer now supports Movies (Works well with [Jackett](https://github.com/Jackett/Jackett))
+* Scanning PreDB to know when a new release is available
+* Importing movies from various online sources, such as IMDb Watchlists or Trakt (v3) (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
 * Full integration with Kodi, Plex (notification, library update)
-* A beautiful UI
+* And a new beautiful UI (v3)
 * Importing Metadata such as trailers or subtitles
 * Adding metadata such as posters and information for Kodi and others to use
 * Advanced customization for profiles, such that Radarr will always download the copy you want
 
-## Support
-Note: GitHub Issues are for Bugs and Feature Requests Only
+#### [Feature Requests](https://github.com/Radarr/Radarr/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=)
 
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/r5wJPt9)
-[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Radarr)
-[![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Radarr/Radarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Radarr)
+## Configuring the Development Environment
 
-## Feature Requests
+### Requirements
 
-[Feature Requests](https://github.com/Radarr/Radarr/issues/new?assignees=&labels=Type%3A+Enhancement&template=feature_request.md&title=)
+* [Visual Studio Community 2019](https://www.visualstudio.com/vs/community/) or [Rider](http://www.jetbrains.com/rider/)
+* [Git](https://git-scm.com/downloads)
+* [Node.js](https://nodejs.org/en/download/)
+* [Yarn](https://yarnpkg.com/)
 
-## Contributors & Developers
-[API Documentation](https://radarr.video/docs/api/)
+### Setup
 
-This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
-<a href="https://github.com/Radarr/Radarr/graphs/contributors"><img src="https://opencollective.com/Radarr/contributors.svg?width=890&button=false" /></a>
+* Make sure all the required software mentioned above are installed
+* Clone the repository into your development machine ([*info*](https://help.github.com/desktop/guides/contributing/working-with-your-remote-repository-on-github-or-github-enterprise))
+* Install the required Node Packages `yarn install`
+* Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
 
+> **Notice**  
+> Gulp must be running at all times while you are working with Radarr client source files.
 
-## Backers
+### Build
 
-Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Radarr#backer)
+* To build run `sh build.sh`
 
-<img src="https://opencollective.com/Radarr/backers.svg?width=890"></a>
+**Note:** Windows users must have bash available to do this. If you installed git, you should have a git bash utility that works.
 
-## Sponsors
+### Development
 
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor](https://opencollective.com/Radarr#sponsor)
+* Open `Radarr.sln` in Visual Studio 2019 or run the build.sh script, if Mono is installed. Alternatively you can use Jetbrains Rider, since it works on all Platforms.
+* Make sure `NzbDrone.Console` is set as the startup project
+* Run `build.sh` before running, or build in VS
 
-<img src="https://opencollective.com/Radarr/sponsors.svg?width=890"></a>
+## Supporters
 
-## Mega Sponsors
+This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/radarr) to help us out!
 
-<img src="https://opencollective.com/Radarr/tiers/mega-sponsor.svg?width=890"></a>
+### Sponsors
 
-## JetBrains
-Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools.
+[![Sponsors](https://opencollective.com/radarr/tiers/sponsor.svg)](https://opencollective.com/radarr/order/3851)
+
+### Flexible Sponsors
+
+[![Flexible Sponsors](https://opencollective.com/radarr/tiers/flexible-sponsor.svg?avatarHeight=54)](https://opencollective.com/radarr/order/3856)
+
+### Backers
+
+[![Backers](https://opencollective.com/radarr/tiers/backer.svg?avatarHeight=48)](https://opencollective.com/radarr/order/3850)
+
+### JetBrains
+
+Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
 
 * [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
-* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)	
-* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)	
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
 * [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
-### License
+## License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2021
+* Copyright 2010-2020

azure-pipelines.yml

@@ -7,23 +7,24 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '3.0.2'
+  majorVersion: '3.0.0'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '3.1.404'
+  dotnetVersion: '3.1.401'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
   branches:
     include:
     - develop
-    - master
+    - aphrodite
 
 pr:
 - develop
+- aphrodite
 
 stages:
   - stage: Setup
@@ -39,7 +40,7 @@ stages:
         displayName: Set Build Name
       - bash: |
           if [[ $BUILD_REASON == "PullRequest" ]]; then
-          git diff origin/develop...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
+          git diff origin/aphrodite...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
           echo $? > not_backend_update
           else
           echo 0 > not_backend_update
@@ -184,11 +185,7 @@ stages:
       - bash: ./build.sh --packages
         displayName: Create Packages
       - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x86
-          cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
-        displayName: Create .NET Core Windows installer
-      - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x64
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1
           cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
         displayName: Create .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
@@ -231,14 +228,7 @@ stages:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/netcoreapp3.1
-      - task: ArchiveFiles@2
-        displayName: Create Windows x86 Core zip
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x86.zip'
-          archiveType: 'zip'
-          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x86/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/windows/netcoreapp3.1
       - task: ArchiveFiles@2
         displayName: Create MacOS Core app
         inputs:
@@ -312,22 +302,14 @@ stages:
           sentry-cli releases new --finalize -p radarr -p radarr-ui -p radarr-update "${RELEASENAME}"
           sentry-cli releases -p radarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
           sentry-cli releases set-commits --auto "${RELEASENAME}"
-          if [[ ${BUILD_SOURCEBRANCH} == "refs/heads/develop" ]]; then
-          sentry-cli releases deploys "${RELEASENAME}" new -e nightly
-          else
-          sentry-cli releases deploys "${RELEASENAME}" new -e production
-          fi
+          sentry-cli releases deploys "${RELEASENAME}" new -e aphrodite
           if [ $? -gt 0 ]; then
             echo "##vso[task.logissue type=warning]Error uploading source maps."
           fi
           exit 0
         displayName: Publish Sentry Source Maps
-        condition: |
-          or
-          (
-            and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')),
-            and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-          )
+        continueOnError: true
+        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/aphrodite'))
         env:
           SENTRY_AUTH_TOKEN: $(sentryAuthTokenServarr)
           SENTRY_ORG: $(sentryOrg)
@@ -397,6 +379,11 @@ stages:
       - powershell: Set-Service SCardSvr -StartupType Manual
         displayName: Enable Windows Test Service
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - bash: |
+          wget https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz
+          sudo tar xf chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz --strip-components=1 --directory /usr/bin
+        displayName: Install fpcalc
+        condition: and(succeeded(), eq(variables['osName'], 'Linux'))
       - bash: |
           SYMLINK=6_6_0
           MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
@@ -699,21 +686,24 @@ stages:
           mkdir -p ./bin/
           cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
         displayName: Move Package Contents
+      - bash: |
+          if [[ $OSNAME == "Mac" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-macos.tar.gz
+          elif [[ $OSNAME == "Linux" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz
+          else
+          echo "Unhandled OS"
+          exit 1
+          fi
+          curl -s -L "$url" | tar -xz
+          chmod +x geckodriver
+          mv geckodriver _tests
+        displayName: Install Gecko Driver
+        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
       - bash: |
           chmod a+x ${TESTSFOLDER}/test.sh
           ${TESTSFOLDER}/test.sh ${OSNAME} Automation Test
         displayName: Run Automation Tests
-      - task: CopyFiles@2
-        displayName: 'Copy Screenshot to: $(Build.ArtifactStagingDirectory)'
-        inputs:
-          SourceFolder: '$(Build.SourcesDirectory)'
-          Contents: |
-            **/*_test_screenshot.png
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/screenshots'
-      - publish: $(Build.ArtifactStagingDirectory)/screenshots
-        artifact: '$(osName)AutomationScreenshots'
-        displayName: Publish Screenshot Bundle
-        condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: 'NUnit'
@@ -862,15 +852,8 @@ stages:
     - job:
       displayName: Discord Notification
       pool:
-        vmImage: 'windows-2019'
+        vmImage: 'ubuntu-18.04'
       steps:
-        - task: DownloadPipelineArtifact@2
-          continueOnError: true
-          displayName: Download Screenshot Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'WindowsAutomationScreenshots'
-            targetPath: $(Build.SourcesDirectory)
         - checkout: none
         - powershell: |
             iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))

build.sh

@@ -183,13 +183,12 @@ PackageMacOSApp()
 PackageWindows()
 {
     local framework="$1"
-    local runtime="$2"
     
     ProgressStart "Creating Windows Package for $framework"
 
-    local folder=$artifactsFolder/$runtime/$framework/Radarr
+    local folder=$artifactsFolder/windows/$framework/Radarr
     
-    PackageFiles "$folder" "$framework" "$runtime"
+    PackageFiles "$folder" "$framework" "win-x64"
 
     echo "Removing Radarr.Mono"
     rm -f $folder/Radarr.Mono.*
@@ -215,7 +214,7 @@ Package()
             PackageLinux "$framework" "$runtime"
             ;;
         win)
-            PackageWindows "$framework" "$runtime"
+            PackageWindows "$framework"
             ;;
         osx)
             PackageMacOS "$framework"
@@ -233,6 +232,14 @@ PackageTests()
 
     rm -f $testPackageFolder/$framework/$runtime/*.log.config
 
+    # geckodriver.exe isn't copied by dotnet publish
+    if [ "$runtime" = "win-x64" ];
+    then
+        curl -Lso gecko.zip "https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-win64.zip"
+        unzip -o gecko.zip
+        cp geckodriver.exe "$testPackageFolder/$framework/win-x64/publish"
+    fi
+
     ProgressEnd 'Creating Test Package'
 }
 
@@ -311,7 +318,6 @@ then
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
         PackageTests "netcoreapp3.1" "win-x64"
-        PackageTests "netcoreapp3.1" "win-x86"
         PackageTests "netcoreapp3.1" "linux-x64"
         PackageTests "netcoreapp3.1" "linux-musl-x64"
         PackageTests "netcoreapp3.1" "osx-x64"
@@ -344,7 +350,6 @@ then
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
         Package "netcoreapp3.1" "win-x64"
-        Package "netcoreapp3.1" "win-x86"
         Package "netcoreapp3.1" "linux-x64"
         Package "netcoreapp3.1" "linux-musl-x64"
         Package "netcoreapp3.1" "linux-arm64"

changelog.tpl

@@ -0,0 +1,14 @@
+# Changelog
+
+{{#versions}}
+## {{{label}}}
+
+{{#sections}}
+### {{{label}}}
+{{#commits}}
+- {{{subject}}} [<a href="https://github.com/{{{author}}}">{{{author}}}</a>]
+{{/commits}}
+
+{{/sections}}
+
+{{/versions}}

changelog_release.tpl

@@ -0,0 +1,15 @@
+**To receive further Pre-Release updates, please change the branch to develop. (Settings -> General (Show Advanced Settings) -> Updates -> Branch)**
+
+{{#versions}}
+
+{{#sections}}
+{{{label}}}
+{{#commits}}
+- {{{subject}}} [{{{author}}}]
+{{/commits}}
+
+{{/sections}}
+
+{{/versions}}
+
+**Note**: The OSX version does not automatically launch the browser. You have to go to http://localhost:7878 by yourself in a browser of your choice.

frontend/.stylelintrc

@@ -75,7 +75,7 @@
     "function-parentheses-newline-inside": "never-multi-line",
     "function-parentheses-space-inside": "never",
     "function-url-quotes": "always",
-    "function-url-scheme-disallowed-list": [
+    "function-url-scheme-blacklist": [
       "data"
     ],
     "function-whitespace-after": "always",

frontend/gulp/build.js

@@ -10,8 +10,7 @@ gulp.task('build',
       'webpack',
       'copyHtml',
       'copyFonts',
-      'copyImages',
-      'copyRobots'
+      'copyImages'
     )
   )
 );

frontend/gulp/copy.js

@@ -32,11 +32,3 @@ gulp.task('copyImages', () => {
     .pipe(gulp.dest(paths.dest.root))
     .pipe(livereload());
 });
-
-gulp.task('copyRobots', () => {
-  return gulp.src(paths.src.robots, { base: paths.src.root })
-    .pipe(cache('copyRobots'))
-    .pipe(print())
-    .pipe(gulp.dest(paths.dest.root))
-    .pipe(livereload());
-});

frontend/gulp/helpers/paths.js

@@ -8,7 +8,6 @@ const paths = {
     content: `${root}/Content/`,
     fonts: `${root}/Content/Fonts/`,
     images: `${root}/Content/Images/`,
-    robots: `${root}/Content/robots.txt`,
     exclude: {
       libs: `!${root}/JsLibraries/**`
     }

frontend/gulp/watch.js

@@ -13,7 +13,6 @@ function watch() {
   gulpWatch(paths.src.html, gulp.series('copyHtml'));
   gulpWatch(`${paths.src.fonts}**/*.*`, gulp.series('copyFonts'));
   gulpWatch(`${paths.src.images}**/*.*`, gulp.series('copyImages'));
-  gulpWatch(paths.src.robots, gulp.series('copyRobots'));
 }
 
 gulp.task('watch', gulp.series('build', watch));

frontend/gulp/webpack.js

@@ -7,7 +7,6 @@ const errorHandler = require('./helpers/errorHandler');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const HtmlWebpackPluginHtmlTags = require('html-webpack-plugin/lib/html-tags');
 const TerserPlugin = require('terser-webpack-plugin');
 
 const uiFolder = 'UI';
@@ -15,7 +14,7 @@ const frontendFolder = path.join(__dirname, '..');
 const srcFolder = path.join(frontendFolder, 'src');
 const isProduction = process.argv.indexOf('--production') > -1;
 const isProfiling = isProduction && process.argv.indexOf('--profile') > -1;
-const inlineWebWorkers = 'no-fallback';
+const inlineWebWorkers = true;
 
 const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
 
@@ -33,19 +32,14 @@ const cssVarsFiles = [
 ].map(require.resolve);
 
 // Override the way HtmlWebpackPlugin injects the scripts
-// TODO: Find a better way to get these paths without
 HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets, assetTags) {
-  const head = assetTags.headTags.map((v) => {
-    const href = v.attributes.href
-      .replace('\\', '/')
-      .replace('%5C', '/');
-
-    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${href}` };
-    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+  const head = assetTags.head.map((v) => {
+    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${v.attributes.href.replace('\\', '/')}` };
+    return this.createHtmlTag(v);
   });
-  const body = assetTags.bodyTags.map((v) => {
+  const body = assetTags.body.map((v) => {
     v.attributes = { src: `/${v.attributes.src}` };
-    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+    return this.createHtmlTag(v);
   });
 
   return html
@@ -131,8 +125,9 @@ const config = {
         use: {
           loader: 'worker-loader',
           options: {
-            filename: '[name].js',
-            inline: inlineWebWorkers
+            name: '[name].js',
+            inline: inlineWebWorkers,
+            fallback: !inlineWebWorkers
           }
         }
       },

frontend/src/Activity/Blacklist/Blacklist.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -11,84 +10,12 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
-import getRemovedItems from 'Utilities/Object/getRemovedItems';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import { align, icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import getSelectedIds from 'Utilities/Table/getSelectedIds';
-import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
-import selectAll from 'Utilities/Table/selectAll';
-import toggleSelected from 'Utilities/Table/toggleSelected';
 import BlacklistRowConnector from './BlacklistRowConnector';
 
 class Blacklist extends Component {
 
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      allSelected: false,
-      allUnselected: false,
-      lastToggled: null,
-      selectedState: {},
-      isConfirmRemoveModalOpen: false,
-      items: props.items
-    };
-  }
-
-  componentDidUpdate(prevProps) {
-    const {
-      items
-    } = this.props;
-
-    if (hasDifferentItems(prevProps.items, items)) {
-      this.setState((state) => {
-        return {
-          ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
-          items
-        };
-      });
-
-      return;
-    }
-  }
-
-  //
-  // Control
-
-  getSelectedIds = () => {
-    return getSelectedIds(this.state.selectedState);
-  }
-
-  //
-  // Listeners
-
-  onSelectAllChange = ({ value }) => {
-    this.setState(selectAll(this.state.selectedState, value));
-  }
-
-  onSelectedChange = ({ id, value, shiftKey = false }) => {
-    this.setState((state) => {
-      return toggleSelected(state, this.props.items, id, value, shiftKey);
-    });
-  }
-
-  onRemoveSelectedPress = () => {
-    this.setState({ isConfirmRemoveModalOpen: true });
-  }
-
-  onRemoveSelectedConfirmed = () => {
-    this.props.onRemoveSelected(this.getSelectedIds());
-    this.setState({ isConfirmRemoveModalOpen: false });
-  }
-
-  onConfirmRemoveModalClose = () => {
-    this.setState({ isConfirmRemoveModalOpen: false });
-  }
-
   //
   // Render
 
@@ -100,33 +27,15 @@ class Blacklist extends Component {
       items,
       columns,
       totalRecords,
-      isRemoving,
       isClearingBlacklistExecuting,
       onClearBlacklistPress,
       ...otherProps
     } = this.props;
 
-    const {
-      allSelected,
-      allUnselected,
-      selectedState,
-      isConfirmRemoveModalOpen
-    } = this.state;
-
-    const selectedIds = this.getSelectedIds();
-
     return (
       <PageContent title={translate('Blacklist')}>
         <PageToolbar>
           <PageToolbarSection>
-            <PageToolbarButton
-              label="Remove Selected"
-              iconName={icons.REMOVE}
-              isDisabled={!selectedIds.length}
-              isSpinning={isRemoving}
-              onPress={this.onRemoveSelectedPress}
-            />
-
             <PageToolbarButton
               label={translate('Clear')}
               iconName={icons.CLEAR}
@@ -172,12 +81,8 @@ class Blacklist extends Component {
             isPopulated && !error && !!items.length &&
               <div>
                 <Table
-                  selectAll={true}
-                  allSelected={allSelected}
-                  allUnselected={allUnselected}
                   columns={columns}
                   {...otherProps}
-                  onSelectAllChange={this.onSelectAllChange}
                 >
                   <TableBody>
                     {
@@ -185,10 +90,8 @@ class Blacklist extends Component {
                         return (
                           <BlacklistRowConnector
                             key={item.id}
-                            isSelected={selectedState[item.id] || false}
                             columns={columns}
                             {...item}
-                            onSelectedChange={this.onSelectedChange}
                           />
                         );
                       })
@@ -204,16 +107,6 @@ class Blacklist extends Component {
               </div>
           }
         </PageContentBody>
-
-        <ConfirmModal
-          isOpen={isConfirmRemoveModalOpen}
-          kind={kinds.DANGER}
-          title={translate('RemoveSelected')}
-          message={translate('AreYouSureYouWantToRemoveTheSelectedItemsFromBlacklist')}
-          confirmLabel={translate('RemoveSelected')}
-          onConfirm={this.onRemoveSelectedConfirmed}
-          onCancel={this.onConfirmRemoveModalClose}
-        />
       </PageContent>
     );
   }
@@ -226,9 +119,7 @@ Blacklist.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
-  isRemoving: PropTypes.bool.isRequired,
   isClearingBlacklistExecuting: PropTypes.bool.isRequired,
-  onRemoveSelected: PropTypes.func.isRequired,
   onClearBlacklistPress: PropTypes.func.isRequired
 };
 

frontend/src/Activity/Blacklist/BlacklistConnector.js

@@ -89,10 +89,6 @@ class BlacklistConnector extends Component {
     this.props.gotoBlacklistPage({ page });
   }
 
-  onRemoveSelected = (ids) => {
-    this.props.removeBlacklistItems({ ids });
-  }
-
   onSortPress = (sortKey) => {
     this.props.setBlacklistSort({ sortKey });
   }
@@ -128,7 +124,6 @@ class BlacklistConnector extends Component {
         onNextPagePress={this.onNextPagePress}
         onLastPagePress={this.onLastPagePress}
         onPageSelect={this.onPageSelect}
-        onRemoveSelected={this.onRemoveSelected}
         onSortPress={this.onSortPress}
         onTableOptionChange={this.onTableOptionChange}
         onClearBlacklistPress={this.onClearBlacklistPress}
@@ -148,7 +143,6 @@ BlacklistConnector.propTypes = {
   gotoBlacklistNextPage: PropTypes.func.isRequired,
   gotoBlacklistLastPage: PropTypes.func.isRequired,
   gotoBlacklistPage: PropTypes.func.isRequired,
-  removeBlacklistItems: PropTypes.func.isRequired,
   setBlacklistSort: PropTypes.func.isRequired,
   setBlacklistTableOption: PropTypes.func.isRequired,
   clearBlacklist: PropTypes.func.isRequired,

frontend/src/Activity/Blacklist/BlacklistRow.js

@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
@@ -43,7 +42,6 @@ class BlacklistRow extends Component {
 
   render() {
     const {
-      id,
       movie,
       sourceTitle,
       quality,
@@ -53,9 +51,7 @@ class BlacklistRow extends Component {
       protocol,
       indexer,
       message,
-      isSelected,
       columns,
-      onSelectedChange,
       onRemovePress
     } = this.props;
 
@@ -65,12 +61,6 @@ class BlacklistRow extends Component {
 
     return (
       <TableRow>
-        <TableSelectCell
-          id={id}
-          isSelected={isSelected}
-          onSelectedChange={onSelectedChange}
-        />
-
         {
           columns.map((column) => {
             const {
@@ -204,9 +194,7 @@ BlacklistRow.propTypes = {
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   message: PropTypes.string,
-  isSelected: PropTypes.bool.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onSelectedChange: PropTypes.func.isRequired,
   onRemovePress: PropTypes.func.isRequired
 };
 

frontend/src/Activity/Blacklist/BlacklistRowConnector.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { removeBlacklistItem } from 'Store/Actions/blacklistActions';
+import { removeFromBlacklist } from 'Store/Actions/blacklistActions';
 import createMovieSelector from 'Store/Selectors/createMovieSelector';
 import BlacklistRow from './BlacklistRow';
 
@@ -18,7 +18,7 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
   return {
     onRemovePress() {
-      dispatch(removeBlacklistItem({ id: props.id }));
+      dispatch(removeFromBlacklist({ id: props.id }));
     }
   };
 }

frontend/src/Activity/History/Details/HistoryDetails.js

@@ -173,13 +173,13 @@ function HistoryDetails(props) {
 
     switch (reason) {
       case 'Manual':
-        reasonMessage = translate('FileWasDeletedByViaUI');
+        reasonMessage = 'File was deleted by via UI';
         break;
       case 'MissingFromDisk':
-        reasonMessage = translate('MissingFromDisk');
+        reasonMessage = 'Radarr was unable to find the file on disk so it was removed';
         break;
       case 'Upgrade':
-        reasonMessage = translate('FileWasDeletedByUpgrade');
+        reasonMessage = 'File was deleted to import an upgrade';
         break;
       default:
         reasonMessage = '';

frontend/src/Activity/History/Details/HistoryDetailsConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,10 +8,10 @@ function createMapStateToProps() {
   return createSelector(
     createUISettingsSelector(),
     (uiSettings) => {
-      return {
-        shortDateFormat: uiSettings.shortDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
+      return _.pick(uiSettings, [
+        'shortDateFormat',
+        'timeFormat'
+      ]);
     }
   );
 }

frontend/src/Activity/History/History.js

@@ -94,7 +94,7 @@ class History extends Component {
 
             isPopulated && !hasError && !items.length &&
               <div>
-                {translate('NoHistory')}
+                No history found
               </div>
           }
 

frontend/src/Activity/Queue/Queue.js

@@ -203,14 +203,14 @@ class Queue extends Component {
           {
             !isRefreshing && hasError &&
               <div>
-                {translate('FailedToLoadQueue')}
+                Failed to load Queue
               </div>
           }
 
           {
             isPopulated && !hasError && !items.length &&
               <div>
-                {translate('QueueIsEmpty')}
+                Queue is empty
               </div>
           }
 

frontend/src/Activity/Queue/QueueDetails.js

@@ -11,14 +11,14 @@ function QueueDetails(props) {
     size,
     sizeleft,
     estimatedCompletionTime,
-    status,
-    trackedDownloadState,
-    trackedDownloadStatus,
+    status: queueStatus,
     errorMessage,
     progressBar
   } = props;
 
-  const progress = size ? (100 - sizeleft / size * 100) : 0;
+  const status = queueStatus.toLowerCase();
+
+  const progress = (100 - sizeleft / size * 100);
 
   if (status === 'pending') {
     return (
@@ -40,35 +40,7 @@ function QueueDetails(props) {
       );
     }
 
-    if (trackedDownloadStatus === 'warning') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.WARNING}
-          title={translate('UnableToImportCheckLogs')}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('WaitingToImport')}`}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importing') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('Importing')}`}
-        />
-      );
-    }
+    // TODO: show an icon when download is complete, but not imported yet?
   }
 
   if (errorMessage) {
@@ -119,8 +91,6 @@ QueueDetails.propTypes = {
   sizeleft: PropTypes.number.isRequired,
   estimatedCompletionTime: PropTypes.string,
   status: PropTypes.string.isRequired,
-  trackedDownloadState: PropTypes.string.isRequired,
-  trackedDownloadStatus: PropTypes.string.isRequired,
   errorMessage: PropTypes.string,
   progressBar: PropTypes.node.isRequired
 };

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -81,12 +81,12 @@ class RemoveQueueItemModal extends Component {
           onModalClose={this.onModalClose}
         >
           <ModalHeader>
-            {translate('Remove')} - {sourceTitle}
+            Remove - {sourceTitle}
           </ModalHeader>
 
           <ModalBody>
             <div>
-              {translate('RemoveFromQueueText', [sourceTitle])}
+              Are you sure you want to remove '{sourceTitle}' from the queue?
             </div>
 
             <FormGroup>

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -87,7 +87,7 @@ class RemoveQueueItemsModal extends Component {
 
           <ModalBody>
             <div className={styles.message}>
-              {translate('AreYouSureYouWantToRemoveSelectedItemsFromQueue', [selectedCount, selectedCount > 1 ? 's' : ''])}
+              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
             </div>
 
             <FormGroup>

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -159,7 +159,7 @@ class AddNewMovie extends Component {
                   {translate('YouCanAlsoSearch')}
                 </div>
                 <div>
-                  <Link to="https://wiki.servarr.com/Radarr_FAQ#Why_cant_I_add_a_new_movie_to_Radarr">
+                  <Link to="https://github.com/Radarr/Radarr/wiki/FAQ#why-cant-i-add-a-new-movie-when-i-know-the-tmdb-id">
                     {translate('CantFindMovie')}
                   </Link>
                 </div>

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js

@@ -17,15 +17,30 @@ import styles from './AddNewMovieModalContent.css';
 
 class AddNewMovieModalContent extends Component {
 
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      searchForMovie: false
+    };
+  }
+
   //
   // Listeners
 
+  onSearchForMissingMovieChange = ({ value }) => {
+    this.setState({ searchForMovie: value });
+  }
+
   onQualityProfileIdChange = ({ value }) => {
     this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
   }
 
   onAddMoviePress = () => {
-    this.props.onAddMoviePress();
+    this.props.onAddMoviePress(this.state.searchForMovie);
   }
 
   //
@@ -42,7 +57,6 @@ class AddNewMovieModalContent extends Component {
       monitor,
       qualityProfileId,
       minimumAvailability,
-      searchForMovie,
       folder,
       tags,
       isSmallScreen,
@@ -103,7 +117,7 @@ class AddNewMovieModalContent extends Component {
 
                 <FormGroup>
                   <FormLabel>
-                    {translate('Monitor')}
+                    Monitor
                   </FormLabel>
 
                   <FormInputGroup
@@ -154,15 +168,15 @@ class AddNewMovieModalContent extends Component {
         <ModalFooter className={styles.modalFooter}>
           <label className={styles.searchForMissingMovieLabelContainer}>
             <span className={styles.searchForMissingMovieLabel}>
-              {translate('StartSearchForMissingMovie')}
+              Start search for missing movie
             </span>
 
             <CheckInput
               containerClassName={styles.searchForMissingMovieContainer}
               className={styles.searchForMissingMovieInput}
               name="searchForMovie"
-              onChange={onInputChange}
-              {...searchForMovie}
+              value={this.state.searchForMovie}
+              onChange={this.onSearchForMissingMovieChange}
             />
           </label>
 
@@ -172,7 +186,7 @@ class AddNewMovieModalContent extends Component {
             isSpinning={isAdding}
             onPress={this.onAddMoviePress}
           >
-            {translate('AddMovie')}
+            Add {title}
           </SpinnerButton>
         </ModalFooter>
       </ModalContent>
@@ -191,7 +205,6 @@ AddNewMovieModalContent.propTypes = {
   monitor: PropTypes.object.isRequired,
   qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
-  searchForMovie: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,
   tags: PropTypes.object.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js

@@ -53,14 +53,13 @@ class AddNewMovieModalContentConnector extends Component {
     this.props.setAddMovieDefault({ [name]: value });
   }
 
-  onAddMoviePress = () => {
+  onAddMoviePress = (searchForMovie) => {
     const {
       tmdbId,
       rootFolderPath,
       monitor,
       qualityProfileId,
       minimumAvailability,
-      searchForMovie,
       tags
     } = this.props;
 
@@ -70,8 +69,8 @@ class AddNewMovieModalContentConnector extends Component {
       monitor: monitor.value,
       qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
-      searchForMovie: searchForMovie.value,
-      tags: tags.value
+      tags: tags.value,
+      searchForMovie
     });
   }
 
@@ -95,7 +94,6 @@ AddNewMovieModalContentConnector.propTypes = {
   monitor: PropTypes.object.isRequired,
   qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
-  searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,
   onModalClose: PropTypes.func.isRequired,
   setAddMovieDefault: PropTypes.func.isRequired,

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -170,7 +170,6 @@ class AddNewMovieSearchResult extends Component {
                     imdbId={imdbId}
                   />
                 }
-                canFlip={true}
                 kind={kinds.INVERSE}
                 position={tooltipPositions.BOTTOM}
               />

frontend/src/AddMovie/ImportMovie/Import/ImportMovie.js

@@ -116,7 +116,7 @@ class ImportMovie extends Component {
             rootFoldersPopulated &&
             !unmappedFolders.length ?
               <div>
-                {translate('AllMoviesInPathHaveBeenImported', [path])}
+                All movies in {path} have been imported
               </div> :
               null
           }

frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js

@@ -10,7 +10,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContentFooter from 'Components/Page/PageContentFooter';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieFooter.css';
 
 const MIXED = 'mixed';
@@ -113,7 +112,7 @@ class ImportMovieFooter extends Component {
       <PageContentFooter>
         <div className={styles.inputContainer}>
           <div className={styles.label}>
-            {translate('Monitor')}
+            Monitor
           </div>
 
           <FormInputGroup
@@ -128,7 +127,7 @@ class ImportMovieFooter extends Component {
 
         <div className={styles.inputContainer}>
           <div className={styles.label}>
-            {translate('MinimumAvailability')}
+            Minimum Availability
           </div>
 
           <FormInputGroup
@@ -143,7 +142,7 @@ class ImportMovieFooter extends Component {
 
         <div className={styles.inputContainer}>
           <div className={styles.label}>
-            {translate('QualityProfile')}
+            Quality Profile
           </div>
 
           <FormInputGroup
@@ -169,7 +168,7 @@ class ImportMovieFooter extends Component {
               isDisabled={!selectedCount || isLookingUpMovie}
               onPress={onImportPress}
             >
-              {translate('Import')} {selectedCount} {selectedCount > 1 ? translate('Movies') : translate('Movie')}
+              Import {selectedCount} {selectedCount > 1 ? 'Movies' : 'Movie'}
             </SpinnerButton>
 
             {
@@ -179,7 +178,7 @@ class ImportMovieFooter extends Component {
                   kind={kinds.WARNING}
                   onPress={onCancelLookupPress}
                 >
-                  {translate('CancelProcessing')}
+                  Cancel Processing
                 </Button> :
                 null
             }
@@ -191,7 +190,7 @@ class ImportMovieFooter extends Component {
                   kind={kinds.SUCCESS}
                   onPress={onLookupPress}
                 >
-                  {translate('StartProcessing')}
+                  Start Processing
                 </Button> :
                 null
             }
@@ -207,7 +206,7 @@ class ImportMovieFooter extends Component {
 
             {
               isLookingUpMovie ?
-                translate('ProcessingFolders') :
+                'Processing Folders' :
                 null
             }
 
@@ -221,7 +220,7 @@ class ImportMovieFooter extends Component {
                       kind={kinds.WARNING}
                     />
                   }
-                  title={translate('ImportErrors')}
+                  title="Import Errors"
                   body={
                     <ul>
                       {

frontend/src/AddMovie/ImportMovie/Import/ImportMovieHeader.js

@@ -3,7 +3,6 @@ import React from 'react';
 import VirtualTableHeader from 'Components/Table/VirtualTableHeader';
 import VirtualTableHeaderCell from 'Components/Table/VirtualTableHeaderCell';
 import VirtualTableSelectAllHeaderCell from 'Components/Table/VirtualTableSelectAllHeaderCell';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieHeader.css';
 
 function ImportMovieHeader(props) {
@@ -25,35 +24,35 @@ function ImportMovieHeader(props) {
         className={styles.folder}
         name="folder"
       >
-        {translate('Folder')}
-      </VirtualTableHeaderCell>
-
-      <VirtualTableHeaderCell
-        className={styles.movie}
-        name="movie"
-      >
-        {translate('Movie')}
+        Folder
       </VirtualTableHeaderCell>
 
       <VirtualTableHeaderCell
         className={styles.monitor}
         name="monitor"
       >
-        {translate('Monitor')}
+        Monitor
       </VirtualTableHeaderCell>
 
       <VirtualTableHeaderCell
         className={styles.minimumAvailability}
         name="minimumAvailability"
       >
-        {translate('MinAvailability')}
+        Min Availability
       </VirtualTableHeaderCell>
 
       <VirtualTableHeaderCell
         className={styles.qualityProfile}
         name="qualityProfileId"
       >
-        {translate('QualityProfile')}
+        Quality Profile
+      </VirtualTableHeaderCell>
+
+      <VirtualTableHeaderCell
+        className={styles.movie}
+        name="movie"
+      >
+        Movie
       </VirtualTableHeaderCell>
     </VirtualTableHeader>
   );

frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js

@@ -34,13 +34,6 @@ function ImportMovieRow(props) {
         {id}
       </VirtualTableRowCell>
 
-      <VirtualTableRowCell className={styles.movie}>
-        <ImportMovieSelectMovieConnector
-          id={id}
-          isExistingMovie={isExistingMovie}
-        />
-      </VirtualTableRowCell>
-
       <VirtualTableRowCell className={styles.monitor}>
         <FormInputGroup
           type={inputTypes.MOVIE_MONITORED_SELECT}
@@ -67,6 +60,13 @@ function ImportMovieRow(props) {
           onChange={onInputChange}
         />
       </VirtualTableRowCell>
+
+      <VirtualTableRowCell className={styles.movie}>
+        <ImportMovieSelectMovieConnector
+          id={id}
+          isExistingMovie={isExistingMovie}
+        />
+      </VirtualTableRowCell>
     </>
   );
 }

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js

@@ -9,7 +9,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Portal from 'Components/Portal';
 import { icons, kinds } from 'Helpers/Props';
 import getUniqueElememtId from 'Utilities/getUniqueElementId';
-import translate from 'Utilities/String/translate';
 import ImportMovieSearchResultConnector from './ImportMovieSearchResultConnector';
 import ImportMovieTitle from './ImportMovieTitle';
 import styles from './ImportMovieSelectMovie.css';
@@ -175,7 +174,7 @@ class ImportMovieSelectMovie extends Component {
                         kind={kinds.WARNING}
                       />
 
-                      {translate('NoMatchFound')}
+                      No match found!
                     </div> :
                     null
                 }
@@ -190,7 +189,7 @@ class ImportMovieSelectMovie extends Component {
                         kind={kinds.WARNING}
                       />
 
-                      {translate('SearchFailedPleaseTryAgainLater')}
+                      Search failed, please try again later.
                     </div> :
                     null
                 }

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieTitle.css';
 
 function ImportMovieTitle(props) {
@@ -34,7 +33,7 @@ function ImportMovieTitle(props) {
           <Label
             kind={kinds.WARNING}
           >
-            {translate('Existing')}
+            Existing
           </Label>
       }
     </div>

frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js

@@ -101,9 +101,12 @@ class ImportMovieSelectFolder extends Component {
                 <div className={styles.tips}>
                   {translate('ImportTipsMessage')}
                   <ul>
-                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportIncludeQuality', ['<code>movie.2008.bluray.mkv</code>']) }} />
-                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportRootPath', [`<code>${isWindows ? 'C:\\movies' : '/movies'}</code>`, `<code>${isWindows ? 'C:\\movies\\the matrix' : '/movies/the matrix'}</code>`]) }} />
-                    <li className={styles.tip}>{translate('ImportNotForDownloads')}</li>
+                    <li className={styles.tip}>
+                      Make sure that your files include the quality in their filenames. eg. <span className={styles.code}>movie.2008.bluray.mkv</span>
+                    </li>
+                    <li className={styles.tip}>
+                      Point Radarr to the folder containing all of your movies, not a specific one. eg. <span className={styles.code}>"{isWindows ? 'C:\\movies' : '/movies'}"</span> and not <span className={styles.code}>"{isWindows ? 'C:\\movies\\the matrix' : '/movies/the matrix'}"</span>
+                    </li>
                   </ul>
                 </div>
 
@@ -155,7 +158,7 @@ class ImportMovieSelectFolder extends Component {
                           className={styles.importButtonIcon}
                           name={icons.DRIVE}
                         />
-                        {translate('StartImport')}
+                        Start Import
                       </Button>
                     </div>
                 }

frontend/src/App/AppUpdatedModalContent.js

@@ -26,27 +26,27 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('RadarrUpdated')}
+        Radarr Updated
       </ModalHeader>
 
       <ModalBody>
-        <div dangerouslySetInnerHTML={{ __html: translate('VersionUpdateText', [`<span className=${styles.version}>${version}</span>`]) }} />
+        <div>
+          Version <span className={styles.version}>{version}</span> of Radarr has been installed, in order to get the latest changes you'll need to reload Radarr.
+        </div>
 
         {
           isPopulated && !error && !!update &&
             <div>
               {
                 !update.changes &&
-                  <div className={styles.maintenance}>
-                    {translate('MaintenanceRelease')}
-                  </div>
+                  <div className={styles.maintenance}>Maintenance release</div>
               }
 
               {
                 !!update.changes &&
                   <div>
                     <div className={styles.changes}>
-                      {translate('WhatsNew')}
+                      What's new?
                     </div>
 
                     <UpdateChanges
@@ -73,14 +73,14 @@ function AppUpdatedModalContent(props) {
         <Button
           onPress={onSeeChangesPress}
         >
-          {translate('RecentChanges')}
+          Recent Changes
         </Button>
 
         <Button
           kind={kinds.PRIMARY}
           onPress={onModalClose}
         >
-          {translate('Reload')}
+          Reload
         </Button>
       </ModalFooter>
     </ModalContent>

frontend/src/Calendar/Agenda/Agenda.js

@@ -6,38 +6,9 @@ import styles from './Agenda.css';
 
 function Agenda(props) {
   const {
-    items,
-    start,
-    end
+    items
   } = props;
 
-  const startDateParsed = Date.parse(start);
-  const endDateParsed = Date.parse(end);
-
-  items.forEach((item) => {
-    const cinemaDateParsed = Date.parse(item.inCinemas);
-    const digitalDateParsed = Date.parse(item.digitalRelease);
-    const physicalDateParsed = Date.parse(item.physicalRelease);
-    const dates = [];
-
-    if (cinemaDateParsed > 0 && cinemaDateParsed >= startDateParsed && cinemaDateParsed <= endDateParsed) {
-      dates.push(cinemaDateParsed);
-    }
-    if (digitalDateParsed > 0 && digitalDateParsed >= startDateParsed && digitalDateParsed <= endDateParsed) {
-      dates.push(digitalDateParsed);
-    }
-    if (physicalDateParsed > 0 && physicalDateParsed >= startDateParsed && physicalDateParsed <= endDateParsed) {
-      dates.push(physicalDateParsed);
-    }
-
-    item.sortDate = Math.min(...dates);
-    item.cinemaDateParsed = cinemaDateParsed;
-    item.digitalDateParsed = digitalDateParsed;
-    item.physicalDateParsed = physicalDateParsed;
-  });
-
-  items.sort((a, b) => ((a.sortDate > b.sortDate) ? 1 : -1));
-
   return (
     <div className={styles.agenda}>
       {
@@ -61,9 +32,7 @@ function Agenda(props) {
 }
 
 Agenda.propTypes = {
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  start: PropTypes.string.isRequired,
-  end: PropTypes.string.isRequired
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
 };
 
 export default Agenda;

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -92,5 +92,6 @@
 }
 
 .dateIcon {
-  width: 25px;
+  display: inline;
+  margin-right: 10px;
 }

frontend/src/Calendar/Agenda/AgendaEvent.js

@@ -55,26 +55,23 @@ class AgendaEvent extends Component {
       showCutoffUnmetIcon,
       longDateFormat,
       colorImpairedMode,
-      cinemaDateParsed,
-      digitalDateParsed,
-      physicalDateParsed,
-      sortDate
+      startDate,
+      endDate
     } = this.props;
 
-    let startTime = null;
-    let releaseIcon = null;
+    const agendaStart = Date.parse(startDate);
+    const agendaEnd = Date.parse(endDate);
+    const cinemaDate = Date.parse(inCinemas);
+    const digitalDate = Date.parse(digitalRelease);
+    let startTime = physicalRelease;
+    let releaseIcon = icons.DISC;
 
-    if (physicalDateParsed === sortDate) {
-      startTime = physicalRelease;
-      releaseIcon = icons.DISC;
-    }
-
-    if (digitalDateParsed === sortDate) {
+    if (digitalDate >= agendaStart && digitalDate <= agendaEnd) {
       startTime = digitalRelease;
       releaseIcon = icons.MOVIE_FILE;
     }
 
-    if (cinemaDateParsed === sortDate) {
+    if (cinemaDate >= agendaStart && cinemaDate <= agendaEnd) {
       startTime = inCinemas;
       releaseIcon = icons.IN_CINEMAS;
     }
@@ -95,14 +92,13 @@ class AgendaEvent extends Component {
           )}
           to={link}
         >
-          <div className={styles.dateIcon}>
-            <Icon
-              name={releaseIcon}
-              kind={kinds.DEFAULT}
-            />
-          </div>
-
           <div className={styles.date}>
+            <div className={styles.dateIcon}>
+              <Icon
+                name={releaseIcon}
+                kind={kinds.DEFAULT}
+              />
+            </div>
             {(showDate) ? startTime.format(longDateFormat) : null}
           </div>
 
@@ -180,10 +176,8 @@ AgendaEvent.propTypes = {
   timeFormat: PropTypes.string.isRequired,
   longDateFormat: PropTypes.string.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired,
-  cinemaDateParsed: PropTypes.number,
-  digitalDateParsed: PropTypes.number,
-  physicalDateParsed: PropTypes.number,
-  sortDate: PropTypes.number
+  startDate: PropTypes.date,
+  endDate: PropTypes.date
 };
 
 AgendaEvent.defaultProps = {

frontend/src/Calendar/Agenda/AgendaEventConnector.js

@@ -13,7 +13,9 @@ function createMapStateToProps() {
     createMovieFileSelector(),
     createQueueItemSelector(),
     createUISettingsSelector(),
-    (calendarOptions, movie, movieFile, queueItem, uiSettings) => {
+    (state) => state.calendar.start,
+    (state) => state.calendar.end,
+    (calendarOptions, movie, movieFile, queueItem, uiSettings, startDate, endDate) => {
       return {
         movie,
         movieFile,
@@ -21,7 +23,9 @@ function createMapStateToProps() {
         ...calendarOptions,
         timeFormat: uiSettings.timeFormat,
         longDateFormat: uiSettings.longDateFormat,
-        colorImpairedMode: uiSettings.enableColorImpairedMode
+        colorImpairedMode: uiSettings.enableColorImpairedMode,
+        startDate,
+        endDate
       };
     }
   );

frontend/src/Calendar/Events/CalendarEventQueueDetails.js

@@ -12,12 +12,10 @@ function CalendarEventQueueDetails(props) {
     sizeleft,
     estimatedCompletionTime,
     status,
-    trackedDownloadState,
-    trackedDownloadStatus,
     errorMessage
   } = props;
 
-  const progress = size ? (100 - sizeleft / size * 100) : 0;
+  const progress = (100 - sizeleft / size * 100);
 
   return (
     <QueueDetails
@@ -26,8 +24,6 @@ function CalendarEventQueueDetails(props) {
       sizeleft={sizeleft}
       estimatedCompletionTime={estimatedCompletionTime}
       status={status}
-      trackedDownloadState={trackedDownloadState}
-      trackedDownloadStatus={trackedDownloadStatus}
       errorMessage={errorMessage}
       progressBar={
         <div title={translate('MovieIsDownloadingInterp', [progress.toFixed(1), title])}>
@@ -49,8 +45,6 @@ CalendarEventQueueDetails.propTypes = {
   sizeleft: PropTypes.number.isRequired,
   estimatedCompletionTime: PropTypes.string,
   status: PropTypes.string.isRequired,
-  trackedDownloadState: PropTypes.string.isRequired,
-  trackedDownloadStatus: PropTypes.string.isRequired,
   errorMessage: PropTypes.string
 };
 

frontend/src/Calendar/Header/CalendarHeader.js

@@ -24,7 +24,7 @@ function getTitle(time, start, end, view, longDateFormat) {
   } else if (view === 'month') {
     return timeMoment.format('MMMM YYYY');
   } else if (view === 'agenda') {
-    return `Agenda: ${startMoment.format('MMM D')} - ${endMoment.format('MMM D')}`;
+    return 'Agenda';
   }
 
   let startFormat = 'MMM D YYYY';
@@ -168,7 +168,7 @@ class CalendarHeader extends Component {
                           selectedView={view}
                           onPress={this.onViewChange}
                         >
-                          {translate('Month')}
+                          Month
                         </ViewMenuItem>
                     }
 
@@ -177,7 +177,7 @@ class CalendarHeader extends Component {
                       selectedView={view}
                       onPress={this.onViewChange}
                     >
-                      {translate('Week')}
+                      Week
                     </ViewMenuItem>
 
                     <ViewMenuItem
@@ -185,7 +185,7 @@ class CalendarHeader extends Component {
                       selectedView={view}
                       onPress={this.onViewChange}
                     >
-                      {translate('Forecast')}
+                      Forecast
                     </ViewMenuItem>
 
                     <ViewMenuItem

frontend/src/Calendar/Header/CalendarHeaderConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -13,16 +14,19 @@ function createMapStateToProps() {
     createDimensionsSelector(),
     createUISettingsSelector(),
     (calendar, dimensions, uiSettings) => {
-      return {
-        isFetching: calendar.isFetching,
-        view: calendar.view,
-        time: calendar.time,
-        start: calendar.start,
-        end: calendar.end,
-        isSmallScreen: dimensions.isSmallScreen,
-        collapseViewButtons: dimensions.isLargeScreen,
-        longDateFormat: uiSettings.longDateFormat
-      };
+      const result = _.pick(calendar, [
+        'isFetching',
+        'view',
+        'time',
+        'start',
+        'end'
+      ]);
+
+      result.isSmallScreen = dimensions.isSmallScreen;
+      result.collapseViewButtons = dimensions.isLargeScreen;
+      result.longDateFormat = uiSettings.longDateFormat;
+
+      return result;
     }
   );
 }

frontend/src/Calendar/Legend/Legend.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { icons, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import LegendIconItem from './LegendIconItem';
 import LegendItem from './LegendItem';
 import styles from './Legend.css';
@@ -17,10 +16,10 @@ function Legend(props) {
   if (showCutoffUnmetIcon) {
     iconsToShow.push(
       <LegendIconItem
-        name={translate('CutoffUnmet')}
+        name="Cutoff Not Met"
         icon={icons.MOVIE_FILE}
         kind={kinds.WARNING}
-        tooltip={translate('QualityOrLangCutoffHasNotBeenMet')}
+        tooltip="Quality or language cutoff has not been met"
       />
     );
   }
@@ -29,45 +28,32 @@ function Legend(props) {
     <div className={styles.legend}>
       <div>
         <LegendItem
-          style='ended'
-          name={translate('DownloadedAndMonitored')}
+          status="unreleased"
+          tooltip="Movie hasn't released yet"
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
-          style='availNotMonitored'
-          name={translate('DownloadedButNotMonitored')}
+          status="unmonitored"
+          tooltip="Movie is unmonitored"
           colorImpairedMode={colorImpairedMode}
         />
       </div>
 
       <div>
         <LegendItem
-          style='missingMonitored'
-          name={translate('MissingMonitoredAndConsideredAvailable')}
+          status="downloading"
+          tooltip="Movie is currently downloading"
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
-          style='missingUnmonitored'
-          name={translate('MissingNotMonitored')}
+          status="downloaded"
+          tooltip="Movie was downloaded and sorted"
           colorImpairedMode={colorImpairedMode}
         />
       </div>
 
-      <div>
-        <LegendItem
-          style='queue'
-          name={translate('Queued')}
-          colorImpairedMode={colorImpairedMode}
-        />
-
-        <LegendItem
-          style='continuing'
-          name={translate('Unreleased')}
-          colorImpairedMode={colorImpairedMode}
-        />
-      </div>
       {
         iconsToShow.length > 0 &&
           <div>

frontend/src/Calendar/Legend/LegendIconItem.css

@@ -1,5 +1,8 @@
 .legendIconItem {
-  margin-left: 6px;
+  margin: 3px 0;
+  margin-right: 6px;
+  width: 150px;
+  cursor: default;
 }
 
 .icon {

frontend/src/Calendar/Legend/LegendItem.css

@@ -1,74 +1,33 @@
-.legendItemContainer {
-  margin-right: 5px;
-  width: 220px;
-}
-
 .legendItem {
-  display: inline-flex;
-  margin-top: -1px;
-  vertical-align: middle;
-  line-height: 16px;
+  margin: 3px 0;
+  margin-right: 6px;
+  padding-left: 5px;
+  width: 150px;
+  border-left-width: 4px;
+  border-left-style: solid;
+  cursor: default;
 }
 
-.legendItemColor {
-  margin-right: 8px;
-  width: 30px;
-  height: 16px;
-  border-radius: 4px;
+/*
+ * Status
+ */
+
+.downloaded {
+  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
 }
 
-.queue {
-  composes: legendItemColor;
-
-  background-color: $queueColor;
+.downloading {
+  composes: downloading from '~Calendar/Events/CalendarEvent.css';
 }
 
-.continuing {
-  composes: legendItemColor;
-
-  background-color: $primaryColor;
+.unmonitored {
+  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
 }
 
-.availNotMonitored {
-  composes: legendItemColor;
-
-  background-color: $darkGray;
+.missing {
+  composes: missing from '~Calendar/Events/CalendarEvent.css';
 }
 
-.ended {
-  composes: legendItemColor;
-
-  background-color: $successColor;
-}
-
-.missingMonitored {
-  composes: legendItemColor;
-
-  background-color: $dangerColor;
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
-  }
-}
-
-.missingUnmonitored {
-  composes: legendItemColor;
-
-  background-color: $warningColor;
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
-  }
-}
-
-.missingMonitoredColorImpaired {
-  background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-}
-
-.missingUnmonitoredColorImpaired {
-  background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-}
-
-.legendItemText {
-  display: inline-block;
+.unreleased {
+  composes: unreleased from '~Calendar/Events/CalendarEvent.css';
 }

frontend/src/Calendar/Legend/LegendItem.js

@@ -1,34 +1,35 @@
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+import titleCase from 'Utilities/String/titleCase';
 import styles from './LegendItem.css';
 
 function LegendItem(props) {
   const {
     name,
-    style,
+    status,
+    tooltip,
     colorImpairedMode
   } = props;
 
   return (
-    <div className={styles.legendItemContainer}>
-      <div
-        className={classNames(
-          styles.legendItem,
-          styles[style],
-          colorImpairedMode && 'colorImpaired'
-        )}
-      />
-      <div className={classNames(styles.legendItemText, colorImpairedMode && styles[`${style}ColorImpaired`])}>
-        {name}
-      </div>
+    <div
+      className={classNames(
+        styles.legendItem,
+        styles[status],
+        colorImpairedMode && 'colorImpaired'
+      )}
+      title={tooltip}
+    >
+      {name ? name : titleCase(status)}
     </div>
   );
 }
 
 LegendItem.propTypes = {
-  name: PropTypes.string.isRequired,
-  style: PropTypes.string.isRequired,
+  name: PropTypes.string,
+  status: PropTypes.string.isRequired,
+  tooltip: PropTypes.string.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired
 };
 

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

@@ -107,7 +107,7 @@ class CalendarOptionsModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('CalendarOptions')}
+          Calendar Options
         </ModalHeader>
 
         <ModalBody>

frontend/src/Calendar/iCal/CalendarLinkModalContent.js

@@ -109,7 +109,7 @@ class CalendarLinkModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('RadarrCalendarFeed')}
+          Radarr Calendar Feed
         </ModalHeader>
 
         <ModalBody>

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -129,9 +129,7 @@ class FileBrowserModalContent extends Component {
                 className={styles.mappedDrivesWarning}
                 kind={kinds.WARNING}
               >
-                <Link to="https://wiki.servarr.com/Radarr_FAQ#Why_cant_Radarr_see_my_files_on_a_remote_server">
-                  {translate('MappedDrivesRunningAsService')}
-                </Link> .
+                Mapped network drives are not available when running as a Windows Service, see the <Link className={styles.faqLink} to="https://github.com/Radarr/Radarr/wiki/FAQ">FAQ</Link> for more information.
               </Alert>
           }
 

frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js

@@ -5,17 +5,16 @@ import SelectInput from 'Components/Form/SelectInput';
 import TextInput from 'Components/Form/TextInput';
 import { IN_LAST, IN_NEXT, NOT_IN_LAST, NOT_IN_NEXT } from 'Helpers/Props/filterTypes';
 import isString from 'Utilities/String/isString';
-import translate from 'Utilities/String/translate';
 import { NAME } from './FilterBuilderRowValue';
 import styles from './DateFilterBuilderRowValue.css';
 
 const timeOptions = [
-  { key: 'seconds', value: translate('Seconds') },
-  { key: 'minutes', value: translate('Minutes') },
-  { key: 'hours', value: translate('Hours') },
-  { key: 'days', value: translate('Days') },
-  { key: 'weeks', value: translate('Weeks') },
-  { key: 'months', value: translate('Months') }
+  { key: 'seconds', value: 'seconds' },
+  { key: 'minutes', value: 'minutes' },
+  { key: 'hours', value: 'hours' },
+  { key: 'days', value: 'days' },
+  { key: 'weeks', value: 'weeks' },
+  { key: 'months', value: 'months' }
 ];
 
 function isInFilter(filterType) {

frontend/src/Components/Filter/Builder/FilterBuilderRow.js

@@ -8,11 +8,10 @@ import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
 import ImportListFilterBuilderRowValueConnector from './ImportListFilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
-import MinimumAvailabilityFilterBuilderRowValue from './MinimumAvailabilityFilterBuilderRowValue';
+import MovieStatusFilterBuilderRowValue from './MovieStatusFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
 import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector';
-import ReleaseStatusFilterBuilderRowValue from './ReleaseStatusFilterBuilderRowValue';
 import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector';
 import styles from './FilterBuilderRow.css';
 
@@ -70,11 +69,8 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.QUALITY_PROFILE:
       return QualityProfileFilterBuilderRowValueConnector;
 
-    case filterBuilderValueTypes.RELEASE_STATUS:
-      return ReleaseStatusFilterBuilderRowValue;
-
-    case filterBuilderValueTypes.MINIMUM_AVAILABILITY:
-      return MinimumAvailabilityFilterBuilderRowValue;
+    case filterBuilderValueTypes.MOVIE_STATUS:
+      return MovieStatusFilterBuilderRowValue;
 
     case filterBuilderValueTypes.TAG:
       return TagFilterBuilderRowValueConnector;

frontend/src/Components/Filter/Builder/MinimumAvailabilityFilterBuilderRowValue.js

@@ -1,20 +0,0 @@
-import React from 'react';
-import translate from 'Utilities/String/translate';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const protocols = [
-  { id: 'announced', name: translate('Announced') },
-  { id: 'inCinemas', name: translate('InCinemas') },
-  { id: 'released', name: translate('Released') }
-];
-
-function MinimumAvailabilityFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={protocols}
-      {...props}
-    />
-  );
-}
-
-export default MinimumAvailabilityFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+
+const protocols = [
+  { id: 'tba', name: 'TBA' },
+  { id: 'announced', name: 'Announced' },
+  { id: 'inCinemas', name: 'In Cinemas' },
+  { id: 'released', name: 'Released' },
+  { id: 'deleted', name: 'Deleted' }
+];
+
+function MovieStatusFilterBuilderRowValue(props) {
+  return (
+    <FilterBuilderRowValue
+      tagList={protocols}
+      {...props}
+    />
+  );
+}
+
+export default MovieStatusFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/ReleaseStatusFilterBuilderRowValue.js

@@ -1,22 +0,0 @@
-import React from 'react';
-import translate from 'Utilities/String/translate';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const protocols = [
-  { id: 'tba', name: 'TBA' },
-  { id: 'announced', name: translate('Announced') },
-  { id: 'inCinemas', name: translate('InCinemas') },
-  { id: 'released', name: translate('Released') },
-  { id: 'deleted', name: translate('Deleted') }
-];
-
-function ReleaseStatusFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={protocols}
-      {...props}
-    />
-  );
-}
-
-export default ReleaseStatusFilterBuilderRowValue;

frontend/src/Components/Form/AvailabilitySelectInput.js

@@ -1,13 +1,12 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import translate from 'Utilities/String/translate';
 import SelectInput from './SelectInput';
 
 const availabilityOptions = [
-  { key: 'announced', value: translate('Announced') },
-  { key: 'inCinemas', value: translate('InCinemas') },
-  { key: 'released', value: translate('Released') },
-  { key: 'preDB', value: translate('PreDB') }
+  { key: 'announced', value: 'Announced' },
+  { key: 'inCinemas', value: 'In Cinemas' },
+  { key: 'released', value: 'Released' },
+  { key: 'preDB', value: 'PreDB' }
 ];
 
 function AvailabilitySelectInput(props) {

frontend/src/Components/Form/DeviceInputConnector.js

@@ -2,22 +2,34 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { clearOptions, defaultState, fetchOptions } from 'Store/Actions/providerOptionActions';
+import { clearOptions, fetchOptions } from 'Store/Actions/providerOptionActions';
 import DeviceInput from './DeviceInput';
 
 function createMapStateToProps() {
   return createSelector(
     (state, { value }) => value,
-    (state) => state.providerOptions.devices || defaultState,
-    (value, devices) => {
+    (state, { name }) => name,
+    (state) => state.providerOptions,
+    (value, name, devices) => {
+      const {
+        isFetching,
+        isPopulated,
+        error,
+        items
+      } = devices;
 
       return {
-        ...devices,
+        isFetching,
+        isPopulated,
+        error,
+        items: items[name] || [],
         selectedDevices: value.map((valueDevice) => {
+          const sectionItems = items[name] || [];
+
           // Disable equality ESLint rule so we don't need to worry about
           // a type mismatch between the value items and the device ID.
           // eslint-disable-next-line eqeqeq
-          const device = devices.items.find((d) => d.id == valueDevice);
+          const device = sectionItems.find((d) => d.id == valueDevice);
 
           if (device) {
             return {
@@ -51,7 +63,7 @@ class DeviceInputConnector extends Component {
   }
 
   componentWillUnmount = () => {
-    this.props.dispatchClearOptions({ section: 'devices' });
+    this.props.dispatchClearOptions();
   }
 
   //
@@ -61,12 +73,14 @@ class DeviceInputConnector extends Component {
     const {
       provider,
       providerData,
-      dispatchFetchOptions
+      dispatchFetchOptions,
+      requestAction,
+      name
     } = this.props;
 
     dispatchFetchOptions({
-      section: 'devices',
-      action: 'getDevices',
+      action: requestAction,
+      itemSection: name,
       provider,
       providerData
     });
@@ -95,6 +109,7 @@ class DeviceInputConnector extends Component {
 DeviceInputConnector.propTypes = {
   provider: PropTypes.string.isRequired,
   providerData: PropTypes.object.isRequired,
+  requestAction: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
   dispatchFetchOptions: PropTypes.func.isRequired,

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -5,10 +5,6 @@
   align-items: center;
 }
 
-.editableContainer {
-  width: 100%;
-}
-
 .hasError {
   composes: hasError from '~Components/Form/Input.css';
 }
@@ -26,16 +22,6 @@
   margin-left: 12px;
 }
 
-.dropdownArrowContainerEditable {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding-right: 17px;
-  width: 30%;
-  height: 35px;
-  text-align: right;
-}
-
 .dropdownArrowContainerDisabled {
   composes: dropdownArrowContainer;
 
@@ -80,8 +66,3 @@
   border-radius: 4px;
   background-color: $white;
 }
-
-.loading {
-  display: inline-block;
-  margin: 5px -5px 5px 0;
-}

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -5,7 +5,6 @@ import React, { Component } from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Measure from 'Components/Measure';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
@@ -17,7 +16,6 @@ import getUniqueElememtId from 'Utilities/getUniqueElementId';
 import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import HintedSelectInputOption from './HintedSelectInputOption';
 import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue';
-import TextInput from './TextInput';
 import styles from './EnhancedSelectInput.css';
 
 function isArrowKey(keyCode) {
@@ -60,30 +58,11 @@ function getSelectedIndex(props) {
     values
   } = props;
 
-  if (Array.isArray(value)) {
-    return values.findIndex((v) => {
-      return value.size && v.key === value[0];
-    });
-  }
-
   return values.findIndex((v) => {
     return v.key === value;
   });
 }
 
-function isSelectedItem(index, props) {
-  const {
-    value,
-    values
-  } = props;
-
-  if (Array.isArray(value)) {
-    return value.includes(values[index].key);
-  }
-
-  return values[index].key === value;
-}
-
 function getKey(selectedIndex, values) {
   return values[selectedIndex].key;
 }
@@ -113,7 +92,7 @@ class EnhancedSelectInput extends Component {
       this._scheduleUpdate();
     }
 
-    if (!Array.isArray(this.props.value) && prevProps.value !== this.props.value) {
+    if (prevProps.value !== this.props.value) {
       this.setState({
         selectedIndex: getSelectedIndex(this.props)
       });
@@ -155,7 +134,7 @@ class EnhancedSelectInput extends Component {
     const button = document.getElementById(this._buttonId);
     const options = document.getElementById(this._optionsId);
 
-    if (!button || !event.target.isConnected || this.state.isMobile) {
+    if (!button || this.state.isMobile) {
       return;
     }
 
@@ -170,21 +149,11 @@ class EnhancedSelectInput extends Component {
     }
   }
 
-  onFocus = () => {
-    if (this.state.isOpen) {
-      this._removeListener();
-      this.setState({ isOpen: false });
-    }
-  }
-
   onBlur = () => {
-    if (!this.props.isEditable) {
-      // Calling setState without this check prevents the click event from being properly handled on Chrome (it is on firefox)
-      const origIndex = getSelectedIndex(this.props);
-
-      if (origIndex !== this.state.selectedIndex) {
-        this.setState({ selectedIndex: origIndex });
-      }
+    // Calling setState without this check prevents the click event from being properly handled on Chrome (it is on firefox)
+    const origIndex = getSelectedIndex(this.props);
+    if (origIndex !== this.state.selectedIndex) {
+      this.setState({ selectedIndex: origIndex });
     }
   }
 
@@ -208,7 +177,7 @@ class EnhancedSelectInput extends Component {
       }
 
       if (
-        selectedIndex == null || selectedIndex === -1 ||
+        selectedIndex == null ||
         getSelectedOption(selectedIndex, values).isDisabled
       ) {
         if (keyCode === keyCodes.UP_ARROW) {
@@ -262,35 +231,16 @@ class EnhancedSelectInput extends Component {
       this._addListener();
     }
 
-    if (!this.state.isOpen && this.props.onOpen) {
-      this.props.onOpen();
-    }
-
     this.setState({ isOpen: !this.state.isOpen });
   }
 
   onSelect = (value) => {
-    if (Array.isArray(this.props.value)) {
-      let newValue = null;
-      const index = this.props.value.indexOf(value);
-      if (index === -1) {
-        newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v));
-      } else {
-        newValue = [...this.props.value];
-        newValue.splice(index, 1);
-      }
-      this.props.onChange({
-        name: this.props.name,
-        value: newValue
-      });
-    } else {
-      this.setState({ isOpen: false });
+    this.setState({ isOpen: false });
 
-      this.props.onChange({
-        name: this.props.name,
-        value
-      });
-    }
+    this.props.onChange({
+      name: this.props.name,
+      value
+    });
   }
 
   onMeasure = ({ width }) => {
@@ -308,19 +258,14 @@ class EnhancedSelectInput extends Component {
     const {
       className,
       disabledClassName,
-      name,
-      value,
       values,
       isDisabled,
-      isEditable,
-      isFetching,
       hasError,
       hasWarning,
       valueOptions,
       selectedValueOptions,
       selectedValueComponent: SelectedValueComponent,
-      optionComponent: OptionComponent,
-      onChange
+      optionComponent: OptionComponent
     } = this.props;
 
     const {
@@ -330,7 +275,6 @@ class EnhancedSelectInput extends Component {
       isMobile
     } = this.state;
 
-    const isMultiSelect = Array.isArray(value);
     const selectedOption = getSelectedOption(selectedIndex, values);
 
     return (
@@ -346,94 +290,37 @@ class EnhancedSelectInput extends Component {
                   whitelist={['width']}
                   onMeasure={this.onMeasure}
                 >
-                  {
-                    isEditable ?
-                      <div
-                        className={styles.editableContainer}
-                      >
-                        <TextInput
-                          className={className}
-                          name={name}
-                          value={value}
-                          readOnly={isDisabled}
-                          hasError={hasError}
-                          hasWarning={hasWarning}
-                          onFocus={this.onFocus}
-                          onBlur={this.onBlur}
-                          onChange={onChange}
-                        />
-                        <Link
-                          className={classNames(
-                            styles.dropdownArrowContainerEditable,
-                            isDisabled ?
-                              styles.dropdownArrowContainerDisabled :
-                              styles.dropdownArrowContainer)
-                          }
-                          onPress={this.onPress}
-                        >
-                          {
-                            isFetching &&
-                              <LoadingIndicator
-                                className={styles.loading}
-                                size={20}
-                              />
-                          }
+                  <Link
+                    className={classNames(
+                      className,
+                      hasError && styles.hasError,
+                      hasWarning && styles.hasWarning,
+                      isDisabled && disabledClassName
+                    )}
+                    isDisabled={isDisabled}
+                    onBlur={this.onBlur}
+                    onKeyDown={this.onKeyDown}
+                    onPress={this.onPress}
+                  >
+                    <SelectedValueComponent
+                      {...selectedValueOptions}
+                      {...selectedOption}
+                      isDisabled={isDisabled}
+                    >
+                      {selectedOption ? selectedOption.value : null}
+                    </SelectedValueComponent>
 
-                          {
-                            !isFetching &&
-                              <Icon
-                                name={icons.CARET_DOWN}
-                              />
-                          }
-                        </Link>
-                      </div> :
-                      <Link
-                        className={classNames(
-                          className,
-                          hasError && styles.hasError,
-                          hasWarning && styles.hasWarning,
-                          isDisabled && disabledClassName
-                        )}
-                        isDisabled={isDisabled}
-                        onBlur={this.onBlur}
-                        onKeyDown={this.onKeyDown}
-                        onPress={this.onPress}
-                      >
-                        <SelectedValueComponent
-                          value={value}
-                          values={values}
-                          {...selectedValueOptions}
-                          {...selectedOption}
-                          isDisabled={isDisabled}
-                          isMultiSelect={isMultiSelect}
-                        >
-                          {selectedOption ? selectedOption.value : null}
-                        </SelectedValueComponent>
-
-                        <div
-                          className={isDisabled ?
-                            styles.dropdownArrowContainerDisabled :
-                            styles.dropdownArrowContainer
-                          }
-                        >
-
-                          {
-                            isFetching &&
-                              <LoadingIndicator
-                                className={styles.loading}
-                                size={20}
-                              />
-                          }
-
-                          {
-                            !isFetching &&
-                              <Icon
-                                name={icons.CARET_DOWN}
-                              />
-                          }
-                        </div>
-                      </Link>
-                  }
+                    <div
+                      className={isDisabled ?
+                        styles.dropdownArrowContainerDisabled :
+                        styles.dropdownArrowContainer
+                      }
+                    >
+                      <Icon
+                        name={icons.CARET_DOWN}
+                      />
+                    </div>
+                  </Link>
                 </Measure>
               </div>
             )}
@@ -472,17 +359,11 @@ class EnhancedSelectInput extends Component {
                         >
                           {
                             values.map((v, index) => {
-                              const hasParent = v.parentKey !== undefined;
-                              const depth = hasParent ? 1 : 0;
-                              const parentSelected = hasParent && value.includes(v.parentKey);
                               return (
                                 <OptionComponent
                                   key={v.key}
                                   id={v.key}
-                                  depth={depth}
-                                  isSelected={isSelectedItem(index, this.props)}
-                                  isDisabled={parentSelected}
-                                  isMultiSelect={isMultiSelect}
+                                  isSelected={index === selectedIndex}
                                   {...valueOptions}
                                   {...v}
                                   isMobile={false}
@@ -520,17 +401,11 @@ class EnhancedSelectInput extends Component {
                 <Scroller className={styles.optionsModalScroller}>
                   {
                     values.map((v, index) => {
-                      const hasParent = v.parentKey !== undefined;
-                      const depth = hasParent ? 1 : 0;
-                      const parentSelected = hasParent && value.includes(v.parentKey);
                       return (
                         <OptionComponent
                           key={v.key}
                           id={v.key}
-                          depth={depth}
-                          isSelected={isSelectedItem(index, this.props)}
-                          isMultiSelect={isMultiSelect}
-                          isDisabled={parentSelected}
+                          isSelected={index === selectedIndex}
                           {...valueOptions}
                           {...v}
                           isMobile={true}
@@ -554,18 +429,15 @@ EnhancedSelectInput.propTypes = {
   className: PropTypes.string,
   disabledClassName: PropTypes.string,
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isEditable: PropTypes.bool.isRequired,
+  isDisabled: PropTypes.bool,
   hasError: PropTypes.bool,
   hasWarning: PropTypes.bool,
   valueOptions: PropTypes.object.isRequired,
   selectedValueOptions: PropTypes.object.isRequired,
   selectedValueComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   optionComponent: PropTypes.elementType,
-  onOpen: PropTypes.func,
   onChange: PropTypes.func.isRequired
 };
 
@@ -573,8 +445,6 @@ EnhancedSelectInput.defaultProps = {
   className: styles.enhancedSelect,
   disabledClassName: styles.isDisabled,
   isDisabled: false,
-  isFetching: false,
-  isEditable: false,
   valueOptions: {},
   selectedValueOptions: {},
   selectedValueComponent: HintedSelectInputSelectedValue,

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -1,159 +0,0 @@
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { clearOptions, defaultState, fetchOptions } from 'Store/Actions/providerOptionActions';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-const importantFieldNames = [
-  'baseUrl',
-  'apiPath',
-  'apiKey'
-];
-
-function getProviderDataKey(providerData) {
-  if (!providerData || !providerData.fields) {
-    return null;
-  }
-
-  const fields = providerData.fields
-    .filter((f) => importantFieldNames.includes(f.name))
-    .map((f) => f.value);
-
-  return fields;
-}
-
-function getSelectOptions(items) {
-  if (!items) {
-    return [];
-  }
-
-  return items.map((option) => {
-    return {
-      key: option.value,
-      value: option.name,
-      hint: option.hint,
-      parentKey: option.parentValue
-    };
-  });
-}
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { selectOptionsProviderAction }) => state.providerOptions[selectOptionsProviderAction] || defaultState,
-    (options) => {
-      if (options) {
-        return {
-          isFetching: options.isFetching,
-          values: getSelectOptions(options.items)
-        };
-      }
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchOptions: fetchOptions,
-  dispatchClearOptions: clearOptions
-};
-
-class EnhancedSelectInputConnector extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      refetchRequired: false
-    };
-  }
-
-  componentDidMount = () => {
-    this._populate();
-  }
-
-  componentDidUpdate = (prevProps) => {
-    const prevKey = getProviderDataKey(prevProps.providerData);
-    const nextKey = getProviderDataKey(this.props.providerData);
-
-    if (!_.isEqual(prevKey, nextKey)) {
-      this.setState({ refetchRequired: true });
-    }
-  }
-
-  componentWillUnmount = () => {
-    this._cleanup();
-  }
-
-  //
-  // Listeners
-
-  onOpen = () => {
-    if (this.state.refetchRequired) {
-      this._populate();
-    }
-  }
-
-  //
-  // Control
-
-  _populate() {
-    const {
-      provider,
-      providerData,
-      selectOptionsProviderAction,
-      dispatchFetchOptions
-    } = this.props;
-
-    if (selectOptionsProviderAction) {
-      this.setState({ refetchRequired: false });
-      dispatchFetchOptions({
-        section: selectOptionsProviderAction,
-        action: selectOptionsProviderAction,
-        provider,
-        providerData
-      });
-    }
-  }
-
-  _cleanup() {
-    const {
-      selectOptionsProviderAction,
-      dispatchClearOptions
-    } = this.props;
-
-    if (selectOptionsProviderAction) {
-      dispatchClearOptions({ section: selectOptionsProviderAction });
-    }
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onOpen={this.onOpen}
-      />
-    );
-  }
-}
-
-EnhancedSelectInputConnector.propTypes = {
-  provider: PropTypes.string.isRequired,
-  providerData: PropTypes.object.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectOptionsProviderAction: PropTypes.string,
-  onChange: PropTypes.func.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  dispatchFetchOptions: PropTypes.func.isRequired,
-  dispatchClearOptions: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(EnhancedSelectInputConnector);

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -11,18 +11,6 @@
   }
 }
 
-.optionCheck {
-  composes: container from '~./CheckInput.css';
-
-  flex: 0 0 0;
-}
-
-.optionCheckInput {
-  composes: input from '~./CheckInput.css';
-
-  margin-top: 0;
-}
-
 .isSelected {
   background-color: #e2e2e2;
 

frontend/src/Components/Form/EnhancedSelectInputOption.js

@@ -4,7 +4,6 @@ import React, { Component } from 'react';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
-import CheckInput from './CheckInput';
 import styles from './EnhancedSelectInputOption.css';
 
 class EnhancedSelectInputOption extends Component {
@@ -21,22 +20,15 @@ class EnhancedSelectInputOption extends Component {
     onSelect(id);
   }
 
-  onCheckPress = () => {
-    // CheckInput requires a handler. Swallow the change event because onPress will already handle it via event propagation.
-  }
-
   //
   // Render
 
   render() {
     const {
       className,
-      id,
-      depth,
       isSelected,
       isDisabled,
       isHidden,
-      isMultiSelect,
       isMobile,
       children
     } = this.props;
@@ -45,8 +37,8 @@ class EnhancedSelectInputOption extends Component {
       <Link
         className={classNames(
           className,
-          isSelected && !isMultiSelect && styles.isSelected,
-          isDisabled && !isMultiSelect && styles.isDisabled,
+          isSelected && styles.isSelected,
+          isDisabled && styles.isDisabled,
           isHidden && styles.isHidden,
           isMobile && styles.isMobile
         )}
@@ -54,24 +46,6 @@ class EnhancedSelectInputOption extends Component {
         isDisabled={isDisabled}
         onPress={this.onPress}
       >
-
-        {
-          depth !== 0 &&
-            <div style={{ width: `${depth * 20}px` }} />
-        }
-
-        {
-          isMultiSelect &&
-            <CheckInput
-              className={styles.optionCheckInput}
-              containerClassName={styles.optionCheck}
-              name={`select-${id}`}
-              value={isSelected}
-              isDisabled={isDisabled}
-              onChange={this.onCheckPress}
-            />
-        }
-
         {children}
 
         {
@@ -90,11 +64,9 @@ class EnhancedSelectInputOption extends Component {
 EnhancedSelectInputOption.propTypes = {
   className: PropTypes.string.isRequired,
   id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  depth: PropTypes.number.isRequired,
   isSelected: PropTypes.bool.isRequired,
   isDisabled: PropTypes.bool.isRequired,
   isHidden: PropTypes.bool.isRequired,
-  isMultiSelect: PropTypes.bool.isRequired,
   isMobile: PropTypes.bool.isRequired,
   children: PropTypes.node.isRequired,
   onSelect: PropTypes.func.isRequired
@@ -102,10 +74,8 @@ EnhancedSelectInputOption.propTypes = {
 
 EnhancedSelectInputOption.defaultProps = {
   className: styles.option,
-  depth: 0,
   isDisabled: false,
-  isHidden: false,
-  isMultiSelect: false
+  isHidden: false
 };
 
 export default EnhancedSelectInputOption;

frontend/src/Components/Form/FormInputGroup.js

@@ -9,9 +9,7 @@ import CaptchaInputConnector from './CaptchaInputConnector';
 import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
-import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
-import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
 import NumberInput from './NumberInput';
@@ -25,7 +23,6 @@ import TagSelectInputConnector from './TagSelectInputConnector';
 import TextArea from './TextArea';
 import TextInput from './TextInput';
 import TextTagInputConnector from './TextTagInputConnector';
-import UMaskInput from './UMaskInput';
 import styles from './FormInputGroup.css';
 
 function getComponent(type) {
@@ -69,14 +66,9 @@ function getComponent(type) {
     case inputTypes.ROOT_FOLDER_SELECT:
       return RootFolderSelectInputConnector;
 
-    case inputTypes.INDEXER_FLAGS_SELECT:
-      return IndexerFlagsSelectInputConnector;
-
     case inputTypes.SELECT:
       return EnhancedSelectInput;
 
-    case inputTypes.DYNAMIC_SELECT:
-      return EnhancedSelectInputConnector;
     case inputTypes.TAG:
       return TagInputConnector;
 
@@ -89,9 +81,6 @@ function getComponent(type) {
     case inputTypes.TAG_SELECT:
       return TagSelectInputConnector;
 
-    case inputTypes.UMASK:
-      return UMaskInput;
-
     default:
       return TextInput;
   }
@@ -199,7 +188,7 @@ function FormInputGroup(props) {
       }
 
       {
-        (!checkInput || helpText) && helpTextWarning &&
+        !checkInput && helpTextWarning &&
           <FormInputHelpText
             text={helpTextWarning}
             isWarning={true}

frontend/src/Components/Form/HintedSelectInputOption.js

@@ -6,25 +6,14 @@ import styles from './HintedSelectInputOption.css';
 
 function HintedSelectInputOption(props) {
   const {
-    id,
     value,
     hint,
-    depth,
-    isSelected,
-    isDisabled,
-    isMultiSelect,
     isMobile,
     ...otherProps
   } = props;
 
   return (
     <EnhancedSelectInputOption
-      id={id}
-      depth={depth}
-      isSelected={isSelected}
-      isDisabled={isDisabled}
-      isHidden={isDisabled}
-      isMultiSelect={isMultiSelect}
       isMobile={isMobile}
       {...otherProps}
     >
@@ -47,20 +36,9 @@ function HintedSelectInputOption(props) {
 }
 
 HintedSelectInputOption.propTypes = {
-  id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   value: PropTypes.string.isRequired,
   hint: PropTypes.node,
-  depth: PropTypes.number,
-  isSelected: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  isMultiSelect: PropTypes.bool.isRequired,
   isMobile: PropTypes.bool.isRequired
 };
 
-HintedSelectInputOption.defaultProps = {
-  isDisabled: false,
-  isHidden: false,
-  isMultiSelect: false
-};
-
 export default HintedSelectInputOption;

frontend/src/Components/Form/HintedSelectInputSelectedValue.js

@@ -1,43 +1,23 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
-import Label from 'Components/Label';
 import EnhancedSelectInputSelectedValue from './EnhancedSelectInputSelectedValue';
 import styles from './HintedSelectInputSelectedValue.css';
 
 function HintedSelectInputSelectedValue(props) {
   const {
     value,
-    values,
     hint,
-    isMultiSelect,
     includeHint,
     ...otherProps
   } = props;
 
-  const valuesMap = isMultiSelect && _.keyBy(values, 'key');
-
   return (
     <EnhancedSelectInputSelectedValue
       className={styles.selectedValue}
       {...otherProps}
     >
       <div className={styles.valueText}>
-        {
-          isMultiSelect &&
-            value.map((key, index) => {
-              const v = valuesMap[key];
-              return (
-                <Label key={key}>
-                  {v ? v.value : key}
-                </Label>
-              );
-            })
-        }
-
-        {
-          !isMultiSelect && value
-        }
+        {value}
       </div>
 
       {
@@ -51,15 +31,12 @@ function HintedSelectInputSelectedValue(props) {
 }
 
 HintedSelectInputSelectedValue.propTypes = {
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
+  value: PropTypes.string,
   hint: PropTypes.string,
-  isMultiSelect: PropTypes.bool.isRequired,
   includeHint: PropTypes.bool.isRequired
 };
 
 HintedSelectInputSelectedValue.defaultProps = {
-  isMultiSelect: false,
   includeHint: true
 };
 

frontend/src/Components/Form/IndexerFlagsSelectInputConnector.js

@@ -1,70 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { indexerFlags }) => indexerFlags,
-    (state) => state.settings.indexerFlags,
-    (selectedFlags, indexerFlags) => {
-      const value = [];
-
-      indexerFlags.items.forEach((item) => {
-        // eslint-disable-next-line no-bitwise
-        if ((selectedFlags & item.id) === item.id) {
-          value.push(item.id);
-        }
-      });
-
-      const values = indexerFlags.items.map(({ id, name }) => {
-        return {
-          key: id,
-          value: name
-        };
-      });
-
-      return {
-        value,
-        values
-      };
-    }
-  );
-}
-
-class IndexerFlagsSelectInputConnector extends Component {
-
-  onChange = ({ name, value }) => {
-    let indexerFlags = 0;
-
-    value.forEach((flagId) => {
-      indexerFlags += flagId;
-    });
-
-    this.props.onChange({ name, value: indexerFlags });
-  }
-
-  //
-  // Render
-
-  render() {
-
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.onChange}
-      />
-    );
-  }
-}
-
-IndexerFlagsSelectInputConnector.propTypes = {
-  name: PropTypes.string.isRequired,
-  indexerFlags: PropTypes.number.isRequired,
-  value: PropTypes.arrayOf(PropTypes.number).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps)(IndexerFlagsSelectInputConnector);

frontend/src/Components/Form/KeyValueListInput.js

@@ -98,9 +98,7 @@ class KeyValueListInput extends Component {
       className,
       value,
       keyPlaceholder,
-      valuePlaceholder,
-      hasError,
-      hasWarning
+      valuePlaceholder
     } = this.props;
 
     const { isFocused } = this.state;
@@ -108,9 +106,7 @@ class KeyValueListInput extends Component {
     return (
       <div className={classNames(
         className,
-        isFocused && styles.isFocused,
-        hasError && styles.hasError,
-        hasWarning && styles.hasWarning
+        isFocused && styles.isFocused
       )}
       >
         {

frontend/src/Components/Form/MovieMonitoredSelectInput.js

@@ -1,11 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import translate from 'Utilities/String/translate';
 import SelectInput from './SelectInput';
 
 const monitorTypesOptions = [
-  { key: 'true', value: translate('Yes') },
-  { key: 'false', value: translate('No') }
+  { key: 'true', value: 'True' },
+  { key: 'false', value: 'False' }
 ];
 
 function MovieMonitoredSelectInput(props) {

frontend/src/Components/Form/PasswordInput.js

@@ -3,17 +3,10 @@ import React from 'react';
 import TextInput from './TextInput';
 import styles from './PasswordInput.css';
 
-// Prevent a user from copying (or cutting) the password from the input
-function onCopy(e) {
-  e.preventDefault();
-  e.nativeEvent.stopImmediatePropagation();
-}
-
 function PasswordInput(props) {
   return (
     <TextInput
       {...props}
-      onCopy={onCopy}
     />
   );
 }

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -6,7 +6,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';
 
-function getType({ type, selectOptionsProviderAction }) {
+function getType(type) {
   switch (type) {
     case 'captcha':
       return inputTypes.CAPTCHA;
@@ -23,9 +23,6 @@ function getType({ type, selectOptionsProviderAction }) {
     case 'filePath':
       return inputTypes.PATH;
     case 'select':
-      if (selectOptionsProviderAction) {
-        return inputTypes.DYNAMIC_SELECT;
-      }
       return inputTypes.SELECT;
     case 'tag':
       return inputTypes.TEXT_TAG;
@@ -48,8 +45,7 @@ function getSelectValues(selectOptions) {
   return _.reduce(selectOptions, (result, option) => {
     result.push({
       key: option.value,
-      value: option.name,
-      hint: option.hint
+      value: option.name
     });
 
     return result;
@@ -66,6 +62,7 @@ function ProviderFieldFormGroup(props) {
     value,
     type,
     advanced,
+    requestAction,
     hidden,
     pending,
     errors,
@@ -90,7 +87,7 @@ function ProviderFieldFormGroup(props) {
       <FormLabel>{label}</FormLabel>
 
       <FormInputGroup
-        type={getType(props)}
+        type={getType(type)}
         name={name}
         label={label}
         helpText={helpText}
@@ -102,6 +99,7 @@ function ProviderFieldFormGroup(props) {
         pending={pending}
         includeFiles={type === 'filePath' ? true : undefined}
         onChange={onChange}
+        requestAction={requestAction}
         {...otherProps}
       />
     </FormGroup>
@@ -110,8 +108,7 @@ function ProviderFieldFormGroup(props) {
 
 const selectOptionsShape = {
   name: PropTypes.string.isRequired,
-  value: PropTypes.number.isRequired,
-  hint: PropTypes.string
+  value: PropTypes.number.isRequired
 };
 
 ProviderFieldFormGroup.propTypes = {
@@ -123,12 +120,12 @@ ProviderFieldFormGroup.propTypes = {
   value: PropTypes.any,
   type: PropTypes.string.isRequired,
   advanced: PropTypes.bool.isRequired,
+  requestAction: PropTypes.string,
   hidden: PropTypes.string,
   pending: PropTypes.bool.isRequired,
   errors: PropTypes.arrayOf(PropTypes.object).isRequired,
   warnings: PropTypes.arrayOf(PropTypes.object).isRequired,
   selectOptions: PropTypes.arrayOf(PropTypes.shape(selectOptionsShape)),
-  selectOptionsProviderAction: PropTypes.string,
   onChange: PropTypes.func.isRequired
 };
 

frontend/src/Components/Form/RootFolderSelectInputOption.css

@@ -15,12 +15,10 @@
 
 .value {
   display: flex;
-  max-width: 500px;
 }
 
 .movieFolder {
-  @add-mixin truncate;
-
+  flex: 0 0 auto;
   color: $disabledColor;
 }
 

frontend/src/Components/Form/TextInput.js

@@ -130,8 +130,7 @@ class TextInput extends Component {
       step,
       min,
       max,
-      onBlur,
-      onCopy
+      onBlur
     } = this.props;
 
     return (
@@ -156,8 +155,6 @@ class TextInput extends Component {
         onChange={this.onChange}
         onFocus={this.onFocus}
         onBlur={onBlur}
-        onCopy={onCopy}
-        onCut={onCopy}
         onKeyUp={this.onKeyUp}
         onMouseDown={this.onMouseDown}
         onMouseUp={this.onMouseUp}
@@ -183,7 +180,6 @@ TextInput.propTypes = {
   onChange: PropTypes.func.isRequired,
   onFocus: PropTypes.func,
   onBlur: PropTypes.func,
-  onCopy: PropTypes.func,
   onSelectionChange: PropTypes.func
 };
 

frontend/src/Components/Form/UMaskInput.css

@@ -1,53 +0,0 @@
-.inputWrapper {
-  display: flex;
-}
-
-.inputFolder {
-  composes: input from '~Components/Form/Input.css';
-
-  max-width: 100px;
-}
-
-.inputUnitWrapper {
-  position: relative;
-  width: 100%;
-}
-
-.inputUnit {
-  composes: inputUnit from '~Components/Form/FormInputGroup.css';
-
-  right: 40px;
-  font-family: $monoSpaceFontFamily;
-}
-
-.unit {
-  font-family: $monoSpaceFontFamily;
-}
-
-.details {
-  margin-top: 5px;
-  margin-left: 17px;
-  line-height: 20px;
-
-  > div {
-    display: flex;
-
-    label {
-      flex: 0 0 50px;
-    }
-
-    .value {
-      width: 50px;
-      text-align: right;
-    }
-
-    .unit {
-      width: 90px;
-      text-align: right;
-    }
-  }
-}
-
-.readOnly {
-  background-color: #eee;
-}

frontend/src/Components/Form/UMaskInput.js

@@ -1,133 +0,0 @@
-/* eslint-disable no-bitwise */
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import EnhancedSelectInput from './EnhancedSelectInput';
-import styles from './UMaskInput.css';
-
-const umaskOptions = [
-  {
-    key: '755',
-    value: '755 - Owner write, Everyone else read',
-    hint: 'drwxr-xr-x'
-  },
-  {
-    key: '775',
-    value: '775 - Owner & Group write, Other read',
-    hint: 'drwxrwxr-x'
-  },
-  {
-    key: '770',
-    value: '770 - Owner & Group write',
-    hint: 'drwxrwx---'
-  },
-  {
-    key: '750',
-    value: '750 - Owner write, Group read',
-    hint: 'drwxr-x---'
-  },
-  {
-    key: '777',
-    value: '777 - Everyone write',
-    hint: 'drwxrwxrwx'
-  }
-];
-
-function formatPermissions(permissions) {
-
-  const hasSticky = permissions & 0o1000;
-  const hasSetGID = permissions & 0o2000;
-  const hasSetUID = permissions & 0o4000;
-
-  let result = '';
-
-  for (let i = 0; i < 9; i++) {
-    const bit = (permissions & (1 << i)) !== 0;
-    let digit = bit ? 'xwr'[i % 3] : '-';
-    if (i === 6 && hasSetUID) {
-      digit = bit ? 's' : 'S';
-    } else if (i === 3 && hasSetGID) {
-      digit = bit ? 's' : 'S';
-    } else if (i === 0 && hasSticky) {
-      digit = bit ? 't' : 'T';
-    }
-    result = digit + result;
-  }
-
-  return result;
-}
-
-class UMaskInput extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      name,
-      value,
-      onChange
-    } = this.props;
-
-    const valueNum = parseInt(value, 8);
-    const umaskNum = 0o777 & ~valueNum;
-    const umask = umaskNum.toString(8).padStart(4, '0');
-    const folderNum = 0o777 & ~umaskNum;
-    const folder = folderNum.toString(8).padStart(3, '0');
-    const fileNum = 0o666 & ~umaskNum;
-    const file = fileNum.toString(8).padStart(3, '0');
-
-    const unit = formatPermissions(folderNum);
-
-    const values = umaskOptions.map((v) => {
-      return { ...v, hint: <span className={styles.unit}>{v.hint}</span> };
-    });
-
-    return (
-      <div>
-        <div className={styles.inputWrapper}>
-          <div className={styles.inputUnitWrapper}>
-            <EnhancedSelectInput
-              name={name}
-              value={value}
-              values={values}
-              isEditable={true}
-              onChange={onChange}
-            />
-
-            <div className={styles.inputUnit}>
-              d{unit}
-            </div>
-          </div>
-        </div>
-        <div className={styles.details}>
-          <div>
-            <label>UMask</label>
-            <div className={styles.value}>{umask}</div>
-          </div>
-          <div>
-            <label>Folder</label>
-            <div className={styles.value}>{folder}</div>
-            <div className={styles.unit}>d{formatPermissions(folderNum)}</div>
-          </div>
-          <div>
-            <label>File</label>
-            <div className={styles.value}>{file}</div>
-            <div className={styles.unit}>{formatPermissions(fileNum)}</div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-UMaskInput.propTypes = {
-  name: PropTypes.string.isRequired,
-  value: PropTypes.string.isRequired,
-  hasError: PropTypes.bool,
-  hasWarning: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func
-};
-
-export default UMaskInput;

frontend/src/Components/Link/Link.js

@@ -47,6 +47,10 @@ class Link extends Component {
         el = 'a';
         linkProps.href = to;
         linkProps.target = target || '_self';
+      } else if (to.startsWith(`${window.Radarr.urlBase}/`)) {
+        el = RouterLink;
+        linkProps.to = to;
+        linkProps.target = target;
       } else {
         el = RouterLink;
         linkProps.to = `${window.Radarr.urlBase}/${to.replace(/^\//, '')}`;

frontend/src/Components/Loading/LoadingMessage.js

@@ -2,24 +2,8 @@ import React from 'react';
 import styles from './LoadingMessage.css';
 
 const messages = [
-  'Downloading more RAM',
-  'Now in Technicolor',
-  'Previously on Radarr...',
-  'Bleep Bloop.',
-  'Locating the required gigapixels to render...',
-  'Spinning up the hamster wheel...',
-  'At least you\'re not on hold',
-  'Hum something loud while others stare',
-  'Loading humorous message... Please Wait',
-  'I could\'ve been faster in Python',
-  'Don\'t forget to rewind your tracks',
-  'Congratulations! you are the 1000th visitor.',
-  'HELP! I\'m being held hostage and forced to write these stupid lines!',
-  'RE-calibrating the internet...',
-  'I\'ll be here all week',
-  'Don\'t forget to tip your waitress',
-  'Apply directly to the forehead',
-  'Loading Battlestation'
+  'Welcome to Radarr Aphrodite Preview. Enjoy'
+  // TODO Add some messages here
 ];
 
 let message = null;

frontend/src/Components/Page/Header/PageHeader.js

@@ -53,7 +53,7 @@ class PageHeader extends Component {
     return (
       <div className={styles.header}>
         <div className={styles.logoContainer}>
-          <Link to={'/'}>
+          <Link to={`${window.Radarr.urlBase}/`}>
             <img
               className={isSmallScreen ? styles.logo : styles.logoFull}
               src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}

frontend/src/Components/Page/PageConnector.js

@@ -6,7 +6,7 @@ import { createSelector } from 'reselect';
 import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
 import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
 import { fetchMovies } from 'Store/Actions/movieActions';
-import { fetchImportLists, fetchIndexerFlags, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
+import { fetchImportLists, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
 import { fetchStatus } from 'Store/Actions/systemActions';
 import { fetchTags } from 'Store/Actions/tagActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
@@ -48,7 +48,6 @@ const selectIsPopulated = createSelector(
   (state) => state.settings.ui.isPopulated,
   (state) => state.settings.qualityProfiles.isPopulated,
   (state) => state.settings.languages.isPopulated,
-  (state) => state.settings.indexerFlags.isPopulated,
   (state) => state.settings.importLists.isPopulated,
   (state) => state.system.status.isPopulated,
   (
@@ -57,7 +56,6 @@ const selectIsPopulated = createSelector(
     uiSettingsIsPopulated,
     qualityProfilesIsPopulated,
     languagesIsPopulated,
-    indexerFlagsIsPopulated,
     importListsIsPopulated,
     systemStatusIsPopulated
   ) => {
@@ -67,7 +65,6 @@ const selectIsPopulated = createSelector(
       uiSettingsIsPopulated &&
       qualityProfilesIsPopulated &&
       languagesIsPopulated &&
-      indexerFlagsIsPopulated &&
       importListsIsPopulated &&
       systemStatusIsPopulated
     );
@@ -80,7 +77,6 @@ const selectErrors = createSelector(
   (state) => state.settings.ui.error,
   (state) => state.settings.qualityProfiles.error,
   (state) => state.settings.languages.error,
-  (state) => state.settings.indexerFlags.error,
   (state) => state.settings.importLists.error,
   (state) => state.system.status.error,
   (
@@ -89,7 +85,6 @@ const selectErrors = createSelector(
     uiSettingsError,
     qualityProfilesError,
     languagesError,
-    indexerFlagsError,
     importListsError,
     systemStatusError
   ) => {
@@ -99,7 +94,6 @@ const selectErrors = createSelector(
       uiSettingsError ||
       qualityProfilesError ||
       languagesError ||
-      indexerFlagsError ||
       importListsError ||
       systemStatusError
     );
@@ -111,7 +105,6 @@ const selectErrors = createSelector(
       uiSettingsError,
       qualityProfilesError,
       languagesError,
-      indexerFlagsError,
       importListsError,
       systemStatusError
     };
@@ -160,9 +153,6 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchFetchLanguages() {
       dispatch(fetchLanguages());
     },
-    dispatchFetchIndexerFlags() {
-      dispatch(fetchIndexerFlags());
-    },
     dispatchFetchImportLists() {
       dispatch(fetchImportLists());
     },
@@ -201,7 +191,6 @@ class PageConnector extends Component {
       this.props.dispatchFetchTags();
       this.props.dispatchFetchQualityProfiles();
       this.props.dispatchFetchLanguages();
-      this.props.dispatchFetchIndexerFlags();
       this.props.dispatchFetchImportLists();
       this.props.dispatchFetchUISettings();
       this.props.dispatchFetchStatus();
@@ -226,7 +215,6 @@ class PageConnector extends Component {
       dispatchFetchTags,
       dispatchFetchQualityProfiles,
       dispatchFetchLanguages,
-      dispatchFetchIndexerFlags,
       dispatchFetchImportLists,
       dispatchFetchUISettings,
       dispatchFetchStatus,
@@ -266,7 +254,6 @@ PageConnector.propTypes = {
   dispatchFetchTags: PropTypes.func.isRequired,
   dispatchFetchQualityProfiles: PropTypes.func.isRequired,
   dispatchFetchLanguages: PropTypes.func.isRequired,
-  dispatchFetchIndexerFlags: PropTypes.func.isRequired,
   dispatchFetchImportLists: PropTypes.func.isRequired,
   dispatchFetchUISettings: PropTypes.func.isRequired,
   dispatchFetchStatus: PropTypes.func.isRequired,

frontend/src/Components/Page/Sidebar/PageSidebar.js

@@ -30,7 +30,7 @@ const links = [
         to: '/add/new'
       },
       {
-        title: translate('ImportLibrary'),
+        title: translate('Import'),
         to: '/add/import'
       },
       {

frontend/src/Components/Table/Cells/RelativeDateCellConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,12 +8,12 @@ function createMapStateToProps() {
   return createSelector(
     createUISettingsSelector(),
     (uiSettings) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
+      return _.pick(uiSettings, [
+        'showRelativeDates',
+        'shortDateFormat',
+        'longDateFormat',
+        'timeFormat'
+      ]);
     }
   );
 }

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
+import HTML5Backend from 'react-dnd-html5-backend';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';

frontend/src/Components/Tooltip/Tooltip.css

@@ -156,35 +156,3 @@
 .body {
   padding: 5px;
 }
-
-.verticalContainer {
-  max-height: 300px;
-}
-
-.horizontalContainer {
-  max-width: calc($breakpointExtraSmall - 20px);
-}
-
-@media only screen and (min-width: $breakpointExtraSmall) {
-  .horizontalContainer {
-    max-width: calc($breakpointSmall * 0.8);
-  }
-}
-
-@media only screen and (min-width: $breakpointSmall) {
-  .horizontalContainer {
-    max-width: calc($breakpointMedium * 0.8);
-  }
-}
-
-@media only screen and (min-width: $breakpointMedium) {
-  .horizontalContainer {
-    max-width: calc($breakpointLarge * 0.8);
-  }
-}
-
-/* @media only screen and (max-width: $breakpointLarge) {
-  .horizontalContainer {
-    max-width: calc($breakpointLarge * 0.8);
-  }
-} */

frontend/src/Components/Tooltip/Tooltip.js

@@ -4,28 +4,9 @@ import React, { Component } from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import Portal from 'Components/Portal';
 import { kinds, tooltipPositions } from 'Helpers/Props';
-import dimensions from 'Styles/Variables/dimensions';
 import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import styles from './Tooltip.css';
 
-let maxWidth = null;
-
-function getMaxWidth() {
-  const windowWidth = window.innerWidth;
-
-  if (windowWidth >= parseInt(dimensions.breakpointLarge)) {
-    maxWidth = 800;
-  } else if (windowWidth >= parseInt(dimensions.breakpointMedium)) {
-    maxWidth = 650;
-  } else if (windowWidth >= parseInt(dimensions.breakpointSmall)) {
-    maxWidth = 500;
-  } else {
-    maxWidth = 450;
-  }
-
-  return maxWidth;
-}
-
 class Tooltip extends Component {
 
   //
@@ -36,7 +17,6 @@ class Tooltip extends Component {
 
     this._scheduleUpdate = null;
     this._closeTimeout = null;
-    this._maxWidth = maxWidth || getMaxWidth();
 
     this.state = {
       isOpen: false
@@ -74,11 +54,9 @@ class Tooltip extends Component {
     } else if ((/^bottom/).test(data.placement)) {
       data.styles.maxHeight = windowHeight - bottom - 20;
     } else if ((/^right/).test(data.placement)) {
-      data.styles.maxWidth = Math.min(this._maxWidth, windowWidth - right - 20);
-      data.styles.maxHeight = top - 20;
+      data.styles.maxWidth = windowWidth - right - 50;
     } else {
-      data.styles.maxWidth = Math.min(this._maxWidth, left - 20);
-      data.styles.maxHeight = top - 20;
+      data.styles.maxWidth = left - 35;
     }
 
     return data;
@@ -166,16 +144,10 @@ class Tooltip extends Component {
             {({ ref, style, placement, arrowProps, scheduleUpdate }) => {
               this._scheduleUpdate = scheduleUpdate;
 
-              const popperPlacement = placement ? placement.split('-')[0] : position;
-              const vertical = popperPlacement === 'top' || popperPlacement === 'bottom';
-
               return (
                 <div
                   ref={ref}
-                  className={classNames(
-                    styles.tooltipContainer,
-                    vertical ? styles.verticalContainer : styles.horizontalContainer
-                  )}
+                  className={styles.tooltipContainer}
                   style={style}
                   onMouseEnter={this.onMouseEnter}
                   onMouseLeave={this.onMouseLeave}
@@ -184,7 +156,7 @@ class Tooltip extends Component {
                     className={this.state.isOpen ? classNames(
                       styles.arrow,
                       styles[kind],
-                      styles[popperPlacement]
+                      styles[placement.split('-')[0]]
                     ) : styles.arrowDisabled}
                     ref={arrowProps.ref}
                     style={arrowProps.style}
@@ -229,7 +201,7 @@ Tooltip.defaultProps = {
   bodyClassName: styles.body,
   kind: kinds.DEFAULT,
   position: tooltipPositions.TOP,
-  canFlip: false
+  canFlip: true
 };
 
 export default Tooltip;

frontend/src/Content/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /

frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js

@@ -53,14 +53,13 @@ class AddNewDiscoverMovieModalContentConnector extends Component {
     this.props.setAddMovieDefault({ [name]: value });
   }
 
-  onAddMoviePress = () => {
+  onAddMoviePress = (searchForMovie) => {
     const {
       tmdbId,
       rootFolderPath,
       monitor,
       qualityProfileId,
       minimumAvailability,
-      searchForMovie,
       tags
     } = this.props;
 
@@ -70,8 +69,8 @@ class AddNewDiscoverMovieModalContentConnector extends Component {
       monitor: monitor.value,
       qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
-      searchForMovie: searchForMovie.value,
-      tags: tags.value
+      tags: tags.value,
+      searchForMovie
     });
 
     this.props.onModalClose(true);
@@ -97,7 +96,6 @@ AddNewDiscoverMovieModalContentConnector.propTypes = {
   monitor: PropTypes.object.isRequired,
   qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
-  searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,
   onModalClose: PropTypes.func.isRequired,
   setAddMovieDefault: PropTypes.func.isRequired,

frontend/src/DiscoverMovie/DiscoverMovie.js

@@ -279,7 +279,7 @@ class DiscoverMovie extends Component {
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('RefreshLists')}
+              label='Refresh Lists'
               iconName={icons.REFRESH}
               isSpinning={isSyncingLists}
               isDisabled={hasNoMovie}

frontend/src/DiscoverMovie/DiscoverMovieFooter.js

@@ -138,8 +138,8 @@ class DiscoverMovieFooter extends Component {
     } = this.state;
 
     const monitoredOptions = [
-      { key: true, value: translate('Monitored') },
-      { key: false, value: translate('Unmonitored') }
+      { key: true, value: 'Monitored' },
+      { key: false, value: 'Unmonitored' }
     ];
 
     return (

frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContent.js

@@ -38,7 +38,7 @@ class ExcludeMovieModalContent extends Component {
 
         <ModalBody>
           <div className={styles.pathContainer}>
-            {translate('ExcludeTitle', [title])}
+            Exclude {title}? This will prevent Radarr from adding automatically via list sync.
           </div>
 
         </ModalBody>

frontend/src/DiscoverMovie/Menus/DiscoverMovieSortMenu.js

@@ -4,7 +4,6 @@ import MenuContent from 'Components/Menu/MenuContent';
 import SortMenu from 'Components/Menu/SortMenu';
 import SortMenuItem from 'Components/Menu/SortMenuItem';
 import { align, sortDirections } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 
 function DiscoverMovieSortMenu(props) {
   const {
@@ -26,7 +25,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Status')}
+          Status
         </SortMenuItem>
 
         <SortMenuItem
@@ -35,7 +34,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Title')}
+          Title
         </SortMenuItem>
 
         <SortMenuItem
@@ -44,7 +43,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Studio')}
+          Studio
         </SortMenuItem>
 
         <SortMenuItem
@@ -53,7 +52,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('InCinemas')}
+          In Cinemas
         </SortMenuItem>
 
         <SortMenuItem
@@ -62,7 +61,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('PhysicalRelease')}
+          Physical Release
         </SortMenuItem>
 
         <SortMenuItem
@@ -71,7 +70,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('DigitalRelease')}
+          Digital Release
         </SortMenuItem>
 
         <SortMenuItem
@@ -80,7 +79,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Runtime')}
+          Runtime
         </SortMenuItem>
 
         <SortMenuItem
@@ -89,7 +88,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Rating')}
+          Rating
         </SortMenuItem>
 
         <SortMenuItem
@@ -98,7 +97,7 @@ function DiscoverMovieSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Certification')}
+          Certification
         </SortMenuItem>
       </MenuContent>
     </SortMenu>