Add 0.2.1 changelog (#607)

Merge 0.2 to master

.gitattributes

@@ -1,2 +1,6 @@
 go.mod text eol=lf
-go.sum text eol=lf
+go.sum text eol=lf
+*.go text eol=lf
+vendor/** -text
+ui/v2.5/**/*.ts* text eol=lf
+ui/v2.5/**/*.scss text eol=lf

.github/FUNDING.yml

@@ -6,7 +6,7 @@ open_collective: stashapp
 # ko_fi: # Replace with a single Ko-fi username
 # tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 # community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: StashApp
+# liberapay: StashApp
 # issuehunt: # Replace with a single IssueHunt username
 # otechie: # Replace with a single Otechie username
 # custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,6 +23,8 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem please ensure that your screenshots are SFW or at least appropriately censored.
 
+**Stash Version: (from Settings -> About):**
+
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]

.github/PULL_REQUEST_TEMPLATE/BugFix.md

@@ -0,0 +1,18 @@
+---
+name: Bug Fix
+about: Add a bug fix this project!
+title: "[Bug Fix] Short Form Title (50 chars or less.)"
+labels: bug
+assignees: 'WithoutPants, bnkai, Leopere'
+
+---
+<!-- Please make sure to read https://github.com/stashapp/stash/docs/CONTRIBUTING.md and check that you understand and have followed it as best as possible -->
+<!-- Explain what your bugfix seeks to remedy in a short paragraph. -->
+# Scope
+
+<!-- Declare any issues by typing `fixes #1` or `closes #1` for example so that the automation can kick in when this is merged -->
+## Closes/Fixes Issues
+
+<!-- What have you tested specifically and what possible impacts/areas there are that may need retesting by others. -->
+## Other testing QA Notes
+

.github/PULL_REQUEST_TEMPLATE/Feature.md

@@ -0,0 +1,17 @@
+---
+name: Feature Addition
+about: Add a feature to this project!
+title: "[Feature] Short Form Title (50 chars or less.)"
+labels: enhancement
+assignees: 'WithoutPants, bnkai, Leopere'
+
+---
+<!-- Please make sure to read https://github.com/stashapp/stash/docs/CONTRIBUTING.md and check that you understand and have followed it as best as possible
+Explain what your feature does in a short paragraph. -->
+# Scope
+
+<!-- Declare any issues by typing `fixes #1` or `closes #1` for example so that the automation can kick in when this is merged -->
+## Closes/Fixes Issues
+
+<!-- What have you tested specifically and what possible impacts/areas there are that may need retesting by others. -->
+## Other testing QA Notes

.gitignore

@@ -21,6 +21,7 @@
 # GraphQL generated output
 pkg/models/generated_*.go
 ui/v2/src/core/generated-*.tsx
+ui/v2.5/src/core/generated-*.tsx
 
 # packr generated files
 *-packr.go

.idea/go.iml

@@ -4,11 +4,10 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/certs" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/v1/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/v2/build" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/v2/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/ui/v2.5/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ui/v2.5/node_modules" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

.travis.yml

@@ -1,4 +1,8 @@
+if: tag != latest_develop # dont build for the latest_develop tagged version
+
 dist: xenial
+git:
+  depth: false
 language: go
 go:
 - 1.11.x
@@ -9,42 +13,64 @@ env:
   - GO111MODULE=on
 before_install:
 - echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
-- travis_retry yarn --cwd ui/v2 install
+- nvm install 12
+- travis_retry yarn --cwd ui/v2.5 install --frozen-lockfile
 - make generate
-- CI=false yarn --cwd ui/v2 build # TODO: Fix warnings
+- CI=false yarn --cwd ui/v2.5 build-ci
 #- go get -v github.com/mgechev/revive
 script:
+# left lint off to avoid getting extra dependency
 #- make lint
-#- make vet
-- make it
+- make fmt-check vet it
 after_success:
-- if [ "$TRAVIS_BRANCH" = "develop" ]; then export TAG_SUFFIX="_dev"; elif [ "$TRAVIS_BRANCH" != "master" ]; then export TAG_SUFFIX="_$TRAVIS_BRANCH"; fi
-- export STASH_VERSION="v0.0.0-alpha${TAG_SUFFIX}"
 - docker pull stashapp/compiler:develop
-- sh ./scripts/cross-compile.sh ${STASH_VERSION}
+- sh ./scripts/cross-compile.sh
 - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
 before_deploy:
-- if [ "$TRAVIS_BRANCH" = "develop" ]; then export TAG_SUFFIX="_dev"; fi
-- git tag -f ${STASH_VERSION}
-- git push -f --tags
+# push the latest tag when on the develop branch
+- if [ "$TRAVIS_BRANCH" = "develop" ]; then git tag -f latest_develop; git push -f --tags; fi
 - export RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')
+- export STASH_VERSION=$(git describe --tags --exclude latest_develop)
+# set TRAVIS_TAG explcitly to the version so that it doesn't pick up latest_develop
+- if [ "$TRAVIS_BRANCH" = "master"]; then export TRAVIS_TAG=${STASH_VERSION}; fi
 deploy:
-  provider: releases
-  api_key:
-    secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
-  file:
-  - dist/stash-osx
-  - dist/stash-win.exe
-  - dist/stash-linux
-  - dist/stash-pi
-  skip_cleanup: true
-  overwrite: true
-  body: ${RELEASE_DATE}
-  on:
-    repo: stashapp/stash
-    all_branches: true
-    condition: $TRAVIS_BRANCH =~ ^(master|develop)$
-branches:
-  only:
-    - master
-    - develop
+  # latest develop release
+  - provider: releases
+    # use the v2 release provider for proper release note setting
+    edge: true
+    api_key:
+      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
+    file:
+    - dist/stash-osx
+    - dist/stash-win.exe
+    - dist/stash-linux
+    - dist/stash-pi
+    skip_cleanup: true
+    overwrite: true
+    name: "${STASH_VERSION}: Latest development build"
+    release_notes: "**${RELEASE_DATE}**\n This is always the latest committed version on the develop branch. Use as your own risk!"
+    prerelease: true
+    on:
+      repo: stashapp/stash
+      branch: develop
+  # official master release - only build when tagged
+  - provider: releases
+    api_key:
+      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
+    file:
+    - dist/stash-osx
+    - dist/stash-win.exe
+    - dist/stash-linux
+    - dist/stash-pi
+    # make the release a draft so the maintainers can confirm before releasing
+    draft: true
+    skip_cleanup: true
+    overwrite: true
+    # don't write the body. To be done manually for now. In future we might 
+    # want to generate the changelog or get it from a file
+    name: ${STASH_VERSION}
+    on:
+      repo: stashapp/stash
+      tags: true
+      # make sure we don't release using the latest_develop tag
+      condition: $TRAVIS_TAG != latest_develop

LICENSE

@@ -1,21 +1,661 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2019 StashApp
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Makefile

@@ -8,7 +8,8 @@ release: generate ui build
 build:
 	$(eval DATE := $(shell go run scripts/getDate.go))
 	$(eval GITHASH := $(shell git rev-parse --short HEAD))
-	$(SET) CGO_ENABLED=1 $(SEPARATOR) go build -mod=vendor -v -ldflags "-X 'github.com/stashapp/stash/pkg/api.buildstamp=$(DATE)' -X 'github.com/stashapp/stash/pkg/api.githash=$(GITHASH)'"
+	$(eval STASH_VERSION := $(shell git describe --tags --exclude latest_develop))
+	$(SET) CGO_ENABLED=1 $(SEPARATOR) go build -mod=vendor -v -ldflags "-X 'github.com/stashapp/stash/pkg/api.version=$(STASH_VERSION)' -X 'github.com/stashapp/stash/pkg/api.buildstamp=$(DATE)' -X 'github.com/stashapp/stash/pkg/api.githash=$(GITHASH)'"
 
 install:
 	packr2 install
@@ -20,13 +21,18 @@ clean:
 .PHONY: generate
 generate:
 	go generate -mod=vendor
-	cd ui/v2 && yarn run gqlgen
+	cd ui/v2.5 && yarn run gqlgen
 
 # Runs gofmt -w on the project's source code, modifying any files that do not match its style.
 .PHONY: fmt
 fmt:
 	go fmt ./...
 
+# Ensures that changed files have had gofmt run on them
+.PHONY: fmt-check
+fmt-check:
+	sh ./scripts/check-gofmt.sh
+
 # Runs go vet on the project's source code.
 .PHONY: vet
 vet:
@@ -46,7 +52,31 @@ test:
 it:
 	go test -mod=vendor -tags=integration ./...
 
+# installs UI dependencies. Run when first cloning repository, or if UI 
+# dependencies have changed
+.PHONY: pre-ui
+pre-ui:
+	cd ui/v2.5 && yarn install --frozen-lockfile
+
 .PHONY: ui
 ui:
-	cd ui/v2 && yarn build
+	cd ui/v2.5 && yarn build
 	packr2
+
+fmt-ui:
+	cd ui/v2.5 && yarn format
+
+# runs tests and checks on the UI and builds it
+.PHONY: ui-validate
+ui-validate:
+	cd ui/v2.5 && yarn run validate
+
+# just repacks the packr files - use when updating migrations and packed files without 
+# rebuilding the UI
+.PHONY: packr
+packr:
+	packr2
+
+# runs all of the tests and checks required for a PR to be accepted
+.PHONY: validate
+validate: ui-validate fmt-check vet lint it

README.md

@@ -16,7 +16,7 @@ Follow [this README.md in the docker directory.](docker/production/README.md)
 
 Stash supports macOS, Windows, and Linux.  Download the [latest release here](https://github.com/stashapp/stash/releases).
 
-Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9998 to get started.
+Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9999 to get started.
 
 *Note for Windows users:* Running the app might present a security prompt since the binary isn't signed yet.  Just click more info and then the "run anyway" button.
 
@@ -69,7 +69,7 @@ Join the [Discord server](https://discord.gg/2TsNFKt).
     * Go Install: `go get github.com/gobuffalo/packr/v2/packr2@v2.0.2`
     * [Binary Download](https://github.com/gobuffalo/packr/releases)
 * [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
-    * Run `yarn install` in the `stash/ui/v2` folder (before running make generate for first time).
+    * Run `yarn install --frozen-lockfile` in the `stash/ui/v2.5` folder (before running make generate for first time).
 
 NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
 
@@ -92,11 +92,18 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
 
 ## Commands
 
-* `make generate` - Generate Go GraphQL and packr2 files
+* `make generate` - Generate Go and UI GraphQL files
 * `make build` - Builds the binary (make sure to build the UI as well... see below)
-* `make ui` - Builds the frontend
+* `make pre-ui` - Installs the UI dependencies. Only needs to be run once before building the UI for the first time, or if the dependencies are updated
+* `make fmt-ui` - Formats the UI source code.
+* `make ui` - Builds the frontend and the packr2 files
+* `make packr` - Generate packr2 files (sub-target of `ui`. Use to regenerate packr2 files without rebuilding UI)
 * `make vet` - Run `go vet`
 * `make lint` - Run the linter
+* `make fmt` - Run `go fmt`
+* `make fmt-check` - Ensure changed files are formatted correctly
+* `make it` - Run the unit and integration tests
+* `make validate` - Run all of the tests and checks required to submit a PR
 
 ## Building a release
 
@@ -111,3 +118,10 @@ where the app can be cross-compiled.  This process is kicked off by CI via the `
 command to open a bash shell to the container to poke around:
 
 `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -i -t stashappdev/compiler:latest /bin/bash`
+
+## Customization
+
+You can make Stash interface fit your desired style with  [Custom CSS snippets](https://github.com/stashapp/stash/wiki/Custom-CSS-snippets) and [CSS Tweaks](https://github.com/stashapp/stash/wiki/CSS-Tweaks).
+
+[Stash Plex Theme](https://github.com/stashapp/stash/wiki/Stash-Plex-Theme) is a community created theme inspired by popular Plex Interface.
+

docker/build/x86_64/Dockerfile

@@ -0,0 +1,55 @@
+# this dockerfile must be built from the top-level stash directory
+# ie from top=level stash:
+# docker build -t stash/build -f docker/build/x86_64/Dockerfile .
+
+FROM golang:1.11.13 as compiler
+
+RUN apt-get update && apt-get install -y apt-transport-https
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+RUN apt-get update && \
+    apt-get install -y nodejs yarn xz-utils --no-install-recommends || exit 1; \
+	rm -rf /var/lib/apt/lists/*;
+	
+ENV PACKR2_VERSION=2.0.2
+ENV PACKR2_SHA=f95ff4c96d7a28813220df030ad91700b8464fe292ab3e1dc9582305c2a338d2
+ENV PACKR2_DOWNLOAD_FILE=packr_${PACKR2_VERSION}_linux_amd64.tar.gz
+ENV PACKR2_DOWNLOAD_URL=https://github.com/gobuffalo/packr/releases/download/v${PACKR2_VERSION}/${PACKR2_DOWNLOAD_FILE}
+
+WORKDIR /
+RUN wget ${PACKR2_DOWNLOAD_URL}; \
+	echo "$PACKR2_SHA $PACKR2_DOWNLOAD_FILE" | sha256sum -c - || exit 1; \
+	tar -xzf $PACKR2_DOWNLOAD_FILE -C /usr/bin/ packr2; \
+	rm $PACKR2_DOWNLOAD_FILE;
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN wget -O /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar xf /ffmpeg.tar.xz && \
+    rm ffmpeg.tar.xz && \
+    mv /ffmpeg*/ /ffmpeg/
+
+# copy the ui yarn stuff so that it doesn't get rebuilt every time
+COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+
+WORKDIR /stash
+RUN yarn --cwd ui/v2.5 install --frozen-lockfile
+
+COPY . /stash/
+ENV GO111MODULE=on
+
+RUN make generate 
+RUN make ui 
+RUN make build
+
+FROM ubuntu:19.10 as app
+
+RUN apt-get update && apt-get -y install ca-certificates
+COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+
+EXPOSE 9999
+CMD ["stash"]
+
+

docker/build/x86_64/README.md

@@ -0,0 +1,67 @@
+# Introduction
+
+This dockerfile is used to build a stash docker container using the current source code.
+
+# Building the docker container
+
+From the top-level directory (should contain `main.go` file):
+
+```
+docker build -t stash/build -f ./docker/build/x86_64/Dockerfile .
+
+```
+
+# Running the docker container
+
+## Using docker-compose
+
+See the `README.md` file in `docker/production` for instructions on how to get docker-compose if needed.
+
+The `stash/build` container can be run with the `docker-compose.yml` file in `docker/production` by changing the `image` value to be `stash/build`. See the instructions in `docker/production` for how to run docker-compose.
+
+## Using `docker run`
+
+After building the container:
+
+```
+docker run \
+ -e STASH_STASH=/data/ \
+ -e STASH_METADATA=/metadata/ \
+ -e STASH_CACHE=/cache/ \
+ -e STASH_GENERATED=/generated/ \
+ -v <path to config dir>:/root/.stash \
+ -v <path to media>:/data \
+ -v <path to metadata>:/metadata \
+ -v <path to cache>:/cache \
+ -v <path to generated>:/generated \
+ -p 9999:9999 \
+ stash/build:latest 
+```
+
+Change the `<xxx>` to the appropriate paths. Note that the `<path to media>` directory should be separate from the cache, generated and metadata directories. It is recommended to have the cache, generated and metadata directories in the same parent directory, for example:
+
+```
+/stash
+  /config
+  /metadata
+  /generated
+  /cache
+/media
+```
+
+Using this example directory structure, the above command would be:
+
+```
+docker run \
+ -e STASH_STASH=/data/ \
+ -e STASH_METADATA=/metadata/ \
+ -e STASH_CACHE=/cache/ \
+ -e STASH_GENERATED=/generated/ \
+ -v /stash/config:/root/.stash \
+ -v /media:/data \
+ -v /stash/metadata:/metadata \
+ -v /stash/cache:/cache \
+ -v /stash/generated:/generated \
+ -p 9999:9999 \
+ stash/build:latest 
+```

docker/develop/x86_64/Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:18.04 as prep
+LABEL MAINTAINER="https://discord.gg/Uz29ny"
+
+RUN apt-get update && \
+    apt-get -y install curl xz-utils && \
+    apt-get autoclean -y && \
+    rm -rf /var/lib/apt/lists/*
+WORKDIR /
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases/tags/latest_develop | awk '/browser_download_url/ && /stash-linux/' | sed -e 's/.*: "\(.*\)"/\1/') && \
+    chmod +x /stash && \
+    curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar xf /ffmpeg.tar.xz && \
+    rm ffmpeg.tar.xz && \
+    mv /ffmpeg*/ /ffmpeg/
+
+FROM ubuntu:18.04 as app
+RUN apt-get update && apt-get -y install ca-certificates
+COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+EXPOSE 9999
+CMD ["stash"]

docker/production/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       driver: "json-file"
       options:
         max-file: "10"
-        max-size: "200k"
+        max-size: "2m"
     environment:
       - STASH_STASH=/data/
       - STASH_GENERATED=/generated/
@@ -19,13 +19,16 @@ services:
       - STASH_CACHE=/cache/
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      ## Adjust below paths (the left part) to your liking.
+      ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
+      
       ## Keep configs here.
       - ./config:/root/.stash
       ## Point this at your collection.
       - ./data:/data
-      ## This is where pre-generated transcodes live.
-      - ./transcodes:/transcodes
       ## This is where your stash's metadata lives
       - ./metadata:/metadata
       ## Any other cache content.
       - ./cache:/cache
+      ## Where to store generated content (screenshots,previews,transcodes,sprites)
+      - ./generated:/generated

docker/production/x86_64/Dockerfile

@@ -7,17 +7,15 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 WORKDIR /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases | grep -F 'stash-linux' | grep download | head -n 1 | cut -d'"' -f4) && \
+RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases/latest | awk '/browser_download_url/ && /stash-linux/' | sed -e 's/.*: "\(.*\)"/\1/') && \
     chmod +x /stash && \
-    curl -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
     tar xf /ffmpeg.tar.xz && \
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
 FROM ubuntu:18.04 as app
-RUN apt-get update && \
-    apt-get -y install ca-certificates && \
-    adduser stash --gecos GECOS --shell /bin/bash --disabled-password --home /home/stash
+RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
 EXPOSE 9999
 CMD ["stash"]

docs/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+
+## Technical Debt
+Please be sure to consider how heavily your contribution impacts the maintainability of the project long term, sometimes less is more.  We don't want to merge collossal pull requests with hundreds of dependencies by a driveby contributor.
+
+## Contributor Checklist
+Please make sure that you've considered the following before you submit your Pull Requests as ready for merging.
+* I've run Code linters and [gofmt](https://golang.org/cmd/gofmt/) to make sure that my code is readable.
+* I have read through formerly submitted [pull requests](https://github.com/stashapp/stash/pulls) and [git issues](https://github.com/stashapp/stash/issues) to make sure that this contribution is required and isn't a duplicate. Also, so that I can manage to close any git Issues needing closed relating to this feature submission.
+* I  commented adequately on my code with the expectation in mind that anyone else should be able to look at this code I've submitted and know exactly what's happening and what the expectations are.
+
+### Legal Agreements
+* I acknowledge that if applicable to me, submitting and subsequent acceptance of this Pull Request I, the code contributor of this Pull Request, agree and acknowledge my understanding that the new code license has now been updated to [AGPL](/LICENSE.md). I agree that all code before this Pull Request, which I've previously submitted, is now to be re-licensed under the new license AGPL and no longer the former MIT license.
+
+**In case you were unable to follow any of the above include an explanation as to why not in your Pull Request.**

go.mod

@@ -2,29 +2,33 @@ module github.com/stashapp/stash
 
 require (
 	github.com/99designs/gqlgen v0.9.0
-	github.com/PuerkitoBio/goquery v1.5.0
-	github.com/antchfx/htmlquery v1.2.0
-	github.com/antchfx/xpath v1.1.2 // indirect
-	github.com/bmatcuk/doublestar v1.1.5
+	github.com/antchfx/htmlquery v1.2.3
+	github.com/bmatcuk/doublestar v1.3.1
 	github.com/disintegration/imaging v1.6.0
 	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/gobuffalo/packr/v2 v2.0.2
 	github.com/golang-migrate/migrate/v4 v4.3.1
+	github.com/gorilla/sessions v1.2.0
 	github.com/gorilla/websocket v1.4.0
 	github.com/h2non/filetype v1.0.8
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/json-iterator/go v1.1.9
+	github.com/mattn/go-sqlite3 v1.13.0
 	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
+	github.com/stretchr/testify v1.5.1
 	github.com/vektah/gqlparser v1.1.2
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/image v0.0.0-20190118043309-183bebdce1b2 // indirect
-	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
+	golang.org/x/image v0.0.0-20190118043309-183bebdce1b2
+	golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
 	gopkg.in/yaml.v2 v2.2.2
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
+
+go 1.11

go.sum

@@ -16,8 +16,6 @@ github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
-github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+sxIXdQ=
@@ -27,13 +25,11 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
-github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/antchfx/htmlquery v1.2.0 h1:oKShnsGlnOHX6t4uj5OHgLKkABcJoqnXpqnscoi9Lpw=
-github.com/antchfx/htmlquery v1.2.0/go.mod h1:MS9yksVSQXls00iXkiMqXr0J+umL/AmxXKuP28SUJM8=
-github.com/antchfx/xpath v1.1.2 h1:YziPrtM0gEJBnhdUGxYcIVYXZ8FXbtbovxOi+UW/yWQ=
-github.com/antchfx/xpath v1.1.2/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
+github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M=
+github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0=
+github.com/antchfx/xpath v1.1.6 h1:6sVh6hB5T6phw1pFpHRQ+C4bd8sNI+O58flqtg7h0R0=
+github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
 github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -41,8 +37,8 @@ github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/bmatcuk/doublestar v1.1.5 h1:2bNwBOmhyFEFcoB3tGvTD5xanq+4kyOZlB8wFYbMjkk=
-github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
+github.com/bmatcuk/doublestar v1.3.1 h1:rT8rxDPsavp9G+4ZULzqhhUSaI/OPsTZNG88Z3i0xvY=
+github.com/bmatcuk/doublestar v1.3.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -81,6 +77,7 @@ github.com/docker/docker v0.7.3-0.20190108045446-77df18c24acf/go.mod h1:eEKB0N0r
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
@@ -258,6 +255,7 @@ github.com/gobuffalo/packr v1.15.0/go.mod h1:t5gXzEhIviQwVlNx/+3SfS07GS+cZ2hn76W
 github.com/gobuffalo/packr v1.15.1/go.mod h1:IeqicJ7jm8182yrVmNbM6PR4g79SjN9tZLH8KduZZwE=
 github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
 github.com/gobuffalo/packr v1.20.0/go.mod h1:JDytk1t2gP+my1ig7iI4NcVaXr886+N0ecUga6884zw=
+github.com/gobuffalo/packr v1.21.0 h1:p2ujcDJQp2QTiYWcI0ByHbr/gMoCouok6M0vXs/yTYQ=
 github.com/gobuffalo/packr v1.21.0/go.mod h1:H00jGfj1qFKxscFJSw8wcL4hpQtPe1PfU2wa6sg/SR0=
 github.com/gobuffalo/packr/v2 v2.0.0-rc.8/go.mod h1:y60QCdzwuMwO2R49fdQhsjCPv7tLQFR0ayzxxla9zes=
 github.com/gobuffalo/packr/v2 v2.0.0-rc.9/go.mod h1:fQqADRfZpEsgkc7c/K7aMew3n4aF1Kji7+lIZeR98Fc=
@@ -324,6 +322,8 @@ github.com/golang-migrate/migrate/v4 v4.3.1/go.mod h1:mJ89KBgbXmM3P49BqOxRL3riNF
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -339,6 +339,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
@@ -351,9 +352,12 @@ github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.2/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ=
+github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ=
 github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
@@ -382,6 +386,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
@@ -390,6 +396,8 @@ github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
@@ -444,6 +452,8 @@ github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
+github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
@@ -452,6 +462,10 @@ github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:F
 github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mongodb/mongo-go-driver v0.3.0/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU=
 github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -573,6 +587,8 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -632,7 +648,6 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -659,6 +674,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
+golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -702,6 +719,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190426135247-a129542de9ae h1:mQLHiymj/JXKnnjc62tb7nD5pZLs940/sXJu+Xp3DBA=
 golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

gqlgen.yml

@@ -26,6 +26,8 @@ models:
     model: github.com/stashapp/stash/pkg/models.ScrapedItem
   Studio:
     model: github.com/stashapp/stash/pkg/models.Studio
+  Movie:
+    model: github.com/stashapp/stash/pkg/models.Movie
   Tag:
     model: github.com/stashapp/stash/pkg/models.Tag
   ScrapedPerformer:
@@ -36,6 +38,8 @@ models:
     model: github.com/stashapp/stash/pkg/models.ScrapedScenePerformer
   ScrapedSceneStudio:
     model: github.com/stashapp/stash/pkg/models.ScrapedSceneStudio
+  ScrapedSceneMovie:
+    model: github.com/stashapp/stash/pkg/models.ScrapedSceneMovie  
   ScrapedSceneTag:
     model: github.com/stashapp/stash/pkg/models.ScrapedSceneTag
   SceneFileType:

graphql/documents/data/config.graphql

@@ -2,25 +2,32 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   stashes
   databasePath
   generatedPath
+  cachePath
   maxTranscodeSize
   maxStreamingTranscodeSize
+  forceMkv
+  forceHevc
   username
   password
+  maxSessionAge
   logFile
   logOut
   logLevel
   logAccess
   excludes
+  scraperUserAgent
 }
 
 fragment ConfigInterfaceData on ConfigInterfaceResult {
   soundOnPreview
   wallShowTitle
+  wallPlayback
   maximumLoopDuration
   autostartVideo
   showStudioAsText
   css
   cssEnabled
+  language
 }
 
 fragment ConfigData on ConfigResult {

graphql/documents/data/movie-slim.graphql

@@ -0,0 +1,5 @@
+fragment SlimMovieData on Movie {
+  id
+  name
+  front_image_path
+}

graphql/documents/data/movie.graphql

@@ -0,0 +1,20 @@
+fragment MovieData on Movie {
+  id
+  checksum
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+
+  studio {
+    ...StudioData
+  }
+  
+  synopsis
+  url
+  front_image_path
+  back_image_path
+  scene_count
+}

graphql/documents/data/performer-slim.graphql

@@ -1,5 +1,6 @@
 fragment SlimPerformerData on Performer {
   id
   name
+  gender
   image_path
 }

graphql/documents/data/performer.graphql

@@ -3,6 +3,7 @@ fragment PerformerData on Performer {
   checksum
   name
   url
+  gender
   twitter
   instagram
   birthdate

graphql/documents/data/scene-slim.graphql

@@ -6,6 +6,7 @@ fragment SlimSceneData on Scene {
   url
   date
   rating
+  o_counter
   path
 
   file {
@@ -46,6 +47,15 @@ fragment SlimSceneData on Scene {
     image_path
   }
 
+  movies {
+    movie {
+      id
+      name
+      front_image_path
+    }
+    scene_index
+  }
+
   tags {
     id
     name

graphql/documents/data/scene.graphql

@@ -6,6 +6,7 @@ fragment SceneData on Scene {
   url
   date
   rating
+  o_counter
   path
 
   file {
@@ -41,6 +42,13 @@ fragment SceneData on Scene {
   studio {
     ...StudioData
   }
+  
+  movies {
+    movie {
+      ...MovieData
+    }
+    scene_index
+  }
 
   tags {
     ...TagData

graphql/documents/data/scrapers.graphql

@@ -1,22 +1,6 @@
 fragment ScrapedPerformerData on ScrapedPerformer {
   name
-  url
-  birthdate
-  ethnicity
-  country
-  eye_color
-  height
-  measurements
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  aliases
-}
-
-fragment ScrapedScenePerformerData on ScrapedScenePerformer {
-  id
-  name
+  gender
   url
   twitter
   instagram
@@ -31,6 +15,50 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
   tattoos
   piercings
   aliases
+  image
+}
+
+fragment ScrapedScenePerformerData on ScrapedScenePerformer {
+  id
+  name
+  gender
+  url
+  twitter
+  instagram
+  birthdate
+  ethnicity
+  country
+  eye_color
+  height
+  measurements
+  fake_tits
+  career_length
+  tattoos
+  piercings
+  aliases
+}
+
+fragment ScrapedMovieData on ScrapedMovie {
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+  url
+  synopsis
+}
+
+fragment ScrapedSceneMovieData on ScrapedSceneMovie {
+  id
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+  url
+  synopsis
 }
 
 fragment ScrapedSceneStudioData on ScrapedSceneStudio {
@@ -49,6 +77,7 @@ fragment ScrapedSceneData on ScrapedScene {
   details
   url
   date
+  image
 
   file {
     size
@@ -72,4 +101,8 @@ fragment ScrapedSceneData on ScrapedScene {
   performers {
     ...ScrapedScenePerformerData
   }
+
+  movies {
+    ...ScrapedSceneMovieData
+  }
 }

graphql/documents/mutations/metadata.graphql

@@ -0,0 +1,27 @@
+mutation MetadataImport {
+  metadataImport
+}
+
+mutation MetadataExport {
+  metadataExport
+}
+
+mutation MetadataScan($input: ScanMetadataInput!) {
+  metadataScan(input: $input)
+}
+
+mutation MetadataGenerate($input: GenerateMetadataInput!) {
+  metadataGenerate(input: $input)
+}
+
+mutation MetadataAutoTag($input: AutoTagMetadataInput!) {
+  metadataAutoTag(input: $input)
+}
+
+mutation MetadataClean {
+  metadataClean
+}
+
+mutation StopJob {
+  stopJob
+}

graphql/documents/mutations/movie.graphql

@@ -0,0 +1,40 @@
+mutation MovieCreate(
+  $name: String!,
+  $aliases: String,
+  $duration: Int,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $director: String,
+  $synopsis: String,
+  $url: String,
+  $front_image: String,
+  $back_image: String) {
+
+  movieCreate(input: { name: $name, aliases: $aliases, duration: $duration, date: $date, rating: $rating, studio_id: $studio_id, director: $director, synopsis: $synopsis, url: $url, front_image: $front_image, back_image: $back_image }) {
+    ...MovieData
+  }
+}
+
+mutation MovieUpdate(
+  $id: ID!
+  $name: String,
+  $aliases: String,
+  $duration: Int,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $director: String,
+  $synopsis: String,
+  $url: String,
+  $front_image: String,
+  $back_image: String) {
+
+  movieUpdate(input: { id: $id, name: $name, aliases: $aliases, duration: $duration, date: $date, rating: $rating, studio_id: $studio_id, director: $director, synopsis: $synopsis, url: $url, front_image: $front_image, back_image: $back_image }) {
+    ...MovieData
+  }
+}
+
+mutation MovieDestroy($id: ID!) {
+  movieDestroy(input: { id: $id })
+}

graphql/documents/mutations/performer.graphql

@@ -1,6 +1,7 @@
 mutation PerformerCreate(
   $name: String,
   $url: String,
+  $gender: GenderEnum,
   $birthdate: String,
   $ethnicity: String,
   $country: String,
@@ -20,6 +21,7 @@ mutation PerformerCreate(
   performerCreate(input: {
                             name: $name,
                             url: $url,
+                            gender: $gender,
                             birthdate: $birthdate,
                             ethnicity: $ethnicity,
                             country: $country,
@@ -44,6 +46,7 @@ mutation PerformerUpdate(
   $id: ID!,
   $name: String,
   $url: String,
+  $gender: GenderEnum,
   $birthdate: String,
   $ethnicity: String,
   $country: String,
@@ -64,6 +67,7 @@ mutation PerformerUpdate(
                             id: $id,
                             name: $name,
                             url: $url,
+                            gender: $gender,
                             birthdate: $birthdate,
                             ethnicity: $ethnicity,
                             country: $country,

graphql/documents/mutations/scene.graphql

@@ -8,6 +8,7 @@ mutation SceneUpdate(
   $studio_id: ID,
   $gallery_id: ID,
   $performer_ids: [ID!] = [],
+  $movies: [SceneMovieInput!] = [],
   $tag_ids: [ID!] = [],
   $cover_image: String) {
 
@@ -21,6 +22,7 @@ mutation SceneUpdate(
                         studio_id: $studio_id,
                         gallery_id: $gallery_id,
                         performer_ids: $performer_ids,
+                        movies: $movies,
                         tag_ids: $tag_ids,
                         cover_image: $cover_image
                       }) {
@@ -37,8 +39,8 @@ mutation BulkSceneUpdate(
   $rating: Int,
   $studio_id: ID,
   $gallery_id: ID,
-  $performer_ids: [ID!],
-  $tag_ids: [ID!]) {
+  $performer_ids: BulkUpdateIds,
+  $tag_ids: BulkUpdateIds) {
 
   bulkSceneUpdate(input: {
                         ids: $ids,
@@ -62,6 +64,22 @@ mutation ScenesUpdate($input : [SceneUpdateInput!]!) {
   }
 }
 
+mutation SceneIncrementO($id: ID!) {
+  sceneIncrementO(id: $id) 
+}
+
+mutation SceneDecrementO($id: ID!) {
+  sceneDecrementO(id: $id)
+}
+
+mutation SceneResetO($id: ID!) {
+  sceneResetO(id: $id)
+}
+
 mutation SceneDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
   sceneDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
+}
+
+mutation SceneGenerateScreenshot($id: ID!, $at: Float) {
+  sceneGenerateScreenshot(id: $id, at: $at)
+}

graphql/documents/queries/misc.graphql

@@ -19,19 +19,24 @@ query AllTags {
 }
 
 query AllPerformersForFilter {
-  allPerformers {
+  allPerformersSlim {
     ...SlimPerformerData
   }
 }
 
 query AllStudiosForFilter {
-  allStudios {
+  allStudiosSlim {
     ...SlimStudioData
   }
 }
+query AllMoviesForFilter {
+  allMoviesSlim {
+    ...SlimMovieData
+  }
+}
 
 query AllTagsForFilter {
-  allTags {
+  allTagsSlim {
     id
     name
   }
@@ -47,9 +52,11 @@ query ValidGalleriesForScene($scene_id: ID!) {
 query Stats {
   stats {
     scene_count,
+    scene_size_count,
     gallery_count,
     performer_count,
     studio_count,
+    movie_count,
     tag_count
   }
 }
@@ -66,3 +73,10 @@ query Version {
     build_time
   }
 }
+
+query LatestVersion {
+  latestversion {
+    shorthash
+    url
+  }
+}

graphql/documents/queries/movie.graphql

@@ -0,0 +1,14 @@
+query FindMovies($filter: FindFilterType, $movie_filter: MovieFilterType) {
+  findMovies(filter: $filter, movie_filter: $movie_filter) {
+    count
+    movies {
+      ...MovieData
+    }
+  }
+}
+
+query FindMovie($id: ID!) {
+  findMovie(id: $id) {
+    ...MovieData
+  }
+}

graphql/documents/queries/scene.graphql

@@ -46,6 +46,9 @@ query ParseSceneFilenames($filter: FindFilterType!, $config: SceneParserInput!)
       rating
       studio_id
       gallery_id
+      movies {
+        movie_id
+      }
       performer_ids
       tag_ids
     }

graphql/documents/queries/settings/config.graphql

@@ -4,6 +4,10 @@ query Configuration {
   }
 }
 
-query Directories($path: String) {
-  directories(path: $path)
-}
+query Directory($path: String) {
+  directory(path: $path) {
+      path
+      parent
+      directories
+  }
+}

graphql/documents/queries/settings/metadata.graphql

@@ -1,27 +1,3 @@
-query MetadataImport {
-  metadataImport
-}
-
-query MetadataExport {
-  metadataExport
-}
-
-query MetadataScan($input: ScanMetadataInput!) {
-  metadataScan(input: $input)
-}
-
-query MetadataGenerate($input: GenerateMetadataInput!) {
-  metadataGenerate(input: $input)
-}
-
-query MetadataAutoTag($input: AutoTagMetadataInput!) {
-  metadataAutoTag(input: $input)
-}
-
-query MetadataClean {
-  metadataClean
-}
-
 query JobStatus {
   jobStatus {
     progress
@@ -29,7 +5,3 @@ query JobStatus {
     message
   }
 }
-
-query StopJob {
-  stopJob
-}

graphql/schema/schema.graphql

@@ -22,6 +22,11 @@ type Query {
   """A function which queries Studio objects"""
   findStudios(filter: FindFilterType): FindStudiosResultType!
 
+   """Find a movie by ID"""
+  findMovie(id: ID!): Movie
+  """A function which queries Movie objects"""
+  findMovies(movie_filter: MovieFilterType, filter: FindFilterType): FindMoviesResultType!
+
   findGallery(id: ID!): Gallery
   findGalleries(filter: FindFilterType): FindGalleriesResultType!
 
@@ -68,10 +73,73 @@ type Query {
   """Returns the current, complete configuration"""
   configuration: ConfigResult!
   """Returns an array of paths for the given path"""
-  directories(path: String): [String!]!
+  directory(path: String): Directory!
 
   # Metadata
 
+  jobStatus: MetadataUpdateStatus!
+
+  # Get everything
+
+  allPerformers: [Performer!]!
+  allStudios: [Studio!]!
+  allMovies: [Movie!]!
+  allTags: [Tag!]!
+
+  # Get everything with minimal metadata
+
+  allPerformersSlim: [Performer!]!
+  allStudiosSlim: [Studio!]!
+  allMoviesSlim: [Movie!]!
+  allTagsSlim: [Tag!]!
+
+  # Version
+  version: Version!
+  
+  # LatestVersion
+  latestversion: ShortVersion!
+}
+
+type Mutation {
+  sceneUpdate(input: SceneUpdateInput!): Scene
+  bulkSceneUpdate(input: BulkSceneUpdateInput!): [Scene!]
+  sceneDestroy(input: SceneDestroyInput!): Boolean!
+  scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
+
+  """Increments the o-counter for a scene. Returns the new value"""
+  sceneIncrementO(id: ID!): Int!
+  """Decrements the o-counter for a scene. Returns the new value"""
+  sceneDecrementO(id: ID!): Int!
+  """Resets the o-counter for a scene to 0. Returns the new value"""
+  sceneResetO(id: ID!): Int!
+
+  """Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"""
+  sceneGenerateScreenshot(id: ID!, at: Float): String!
+
+  sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
+  sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
+  sceneMarkerDestroy(id: ID!): Boolean!
+
+  performerCreate(input: PerformerCreateInput!): Performer
+  performerUpdate(input: PerformerUpdateInput!): Performer
+  performerDestroy(input: PerformerDestroyInput!): Boolean!
+
+  studioCreate(input: StudioCreateInput!): Studio
+  studioUpdate(input: StudioUpdateInput!): Studio
+  studioDestroy(input: StudioDestroyInput!): Boolean!
+
+  movieCreate(input: MovieCreateInput!): Movie
+  movieUpdate(input: MovieUpdateInput!): Movie
+  movieDestroy(input: MovieDestroyInput!): Boolean!
+
+  tagCreate(input: TagCreateInput!): Tag
+  tagUpdate(input: TagUpdateInput!): Tag
+  tagDestroy(input: TagDestroyInput!): Boolean!
+
+  """Change general configuration options"""
+  configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
+  configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
+
   """Start an import. Returns the job ID"""
   metadataImport: String!
   """Start an export. Returns the job ID"""
@@ -85,44 +153,7 @@ type Query {
   """Clean metadata. Returns the job ID"""
   metadataClean: String!
 
-  jobStatus: MetadataUpdateStatus!
   stopJob: Boolean!
-
-  # Get everything
-
-  allPerformers: [Performer!]!
-  allStudios: [Studio!]!
-  allTags: [Tag!]!
-
-  # Version
-  version: Version!
-}
-
-type Mutation {
-  sceneUpdate(input: SceneUpdateInput!): Scene
-  bulkSceneUpdate(input: BulkSceneUpdateInput!): [Scene!]
-  sceneDestroy(input: SceneDestroyInput!): Boolean!
-  scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
-
-  sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
-  sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
-  sceneMarkerDestroy(id: ID!): Boolean!
-
-  performerCreate(input: PerformerCreateInput!): Performer
-  performerUpdate(input: PerformerUpdateInput!): Performer
-  performerDestroy(input: PerformerDestroyInput!): Boolean!
-
-  studioCreate(input: StudioCreateInput!): Studio
-  studioUpdate(input: StudioUpdateInput!): Studio
-  studioDestroy(input: StudioDestroyInput!): Boolean!
-
-  tagCreate(input: TagCreateInput!): Tag
-  tagUpdate(input: TagUpdateInput!): Tag
-  tagDestroy(input: TagDestroyInput!): Boolean!
-
-  """Change general configuration options"""
-  configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
-  configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
 }
 
 type Subscription {
@@ -136,4 +167,4 @@ schema {
   query: Query
   mutation: Mutation
   subscription: Subscription
-}
+}

graphql/schema/types/config.graphql

@@ -14,14 +14,22 @@ input ConfigGeneralInput {
   databasePath: String
   """Path to generated files"""
   generatedPath: String
+  """Path to cache"""
+  cachePath: String
   """Max generated transcode size"""
   maxTranscodeSize: StreamingResolutionEnum
   """Max streaming transcode size"""
   maxStreamingTranscodeSize: StreamingResolutionEnum
+  """Force MKV as supported format"""
+  forceMkv: Boolean!
+  """Force HEVC as a supported codec"""
+  forceHevc: Boolean!
   """Username"""
   username: String
   """Password"""
   password: String
+  """Maximum session cookie age"""
+  maxSessionAge: Int
   """Name of the log file"""
   logFile: String
   """Whether to also output to stderr"""
@@ -32,6 +40,8 @@ input ConfigGeneralInput {
   logAccess: Boolean!
   """Array of file regexp to exclude from Scan"""
   excludes: [String!]
+  """Scraper user agent string"""
+  scraperUserAgent: String
 }
 
 type ConfigGeneralResult {
@@ -41,14 +51,22 @@ type ConfigGeneralResult {
   databasePath: String!
   """Path to generated files"""
   generatedPath: String!
-    """Max generated transcode size"""
+  """Path to cache"""
+  cachePath: String!
+  """Max generated transcode size"""
   maxTranscodeSize: StreamingResolutionEnum
   """Max streaming transcode size"""
   maxStreamingTranscodeSize: StreamingResolutionEnum
+  """Force MKV as supported format"""
+  forceMkv: Boolean!
+  """Force HEVC as a supported codec"""
+  forceHevc: Boolean!
   """Username"""
   username: String!
   """Password"""
   password: String!
+  """Maximum session cookie age"""
+  maxSessionAge: Int!
   """Name of the log file"""
   logFile: String
   """Whether to also output to stderr"""
@@ -59,6 +77,8 @@ type ConfigGeneralResult {
   logAccess: Boolean!
   """Array of file regexp to exclude from Scan"""
   excludes: [String!]!
+  """Scraper user agent string"""
+  scraperUserAgent: String
 }
 
 input ConfigInterfaceInput {
@@ -66,6 +86,8 @@ input ConfigInterfaceInput {
   soundOnPreview: Boolean
   """Show title and tags in wall view"""
   wallShowTitle: Boolean
+  """Wall playback type"""
+  wallPlayback: String
   """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
   maximumLoopDuration: Int
   """If true, video will autostart on load in the scene player"""
@@ -75,6 +97,7 @@ input ConfigInterfaceInput {
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
+  language: String
 }
 
 type ConfigInterfaceResult {
@@ -82,6 +105,8 @@ type ConfigInterfaceResult {
   soundOnPreview: Boolean
   """Show title and tags in wall view"""
   wallShowTitle: Boolean
+  """Wall playback type"""
+  wallPlayback: String
   """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
   maximumLoopDuration: Int
   """If true, video will autostart on load in the scene player"""
@@ -91,6 +116,8 @@ type ConfigInterfaceResult {
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
+  """Interface language"""
+  language: String
 }
 
 """All configuration settings"""
@@ -98,3 +125,10 @@ type ConfigResult {
   general: ConfigGeneralResult!
   interface: ConfigInterfaceResult!
 }
+
+"""Directory structure of a path"""
+type Directory {
+    path: String!
+    parent: String
+    directories: [String!]!
+}

graphql/schema/types/filters.graphql

@@ -46,6 +46,10 @@ input PerformerFilterType {
   piercings: StringCriterionInput
   """Filter by aliases"""
   aliases: StringCriterionInput
+  """Filter by gender"""
+  gender: GenderCriterionInput
+  """Filter to only include performers missing this property"""
+  is_missing: String
 }
 
 input SceneMarkerFilterType {
@@ -62,20 +66,31 @@ input SceneMarkerFilterType {
 input SceneFilterType {
   """Filter by rating"""
   rating: IntCriterionInput
+  """Filter by o-counter"""
+  o_counter: IntCriterionInput
   """Filter by resolution"""
   resolution: ResolutionEnum
+  """Filter by duration (in seconds)"""
+  duration: IntCriterionInput
   """Filter to only include scenes which have markers. `true` or `false`"""
   has_markers: String
   """Filter to only include scenes missing this property"""
   is_missing: String
   """Filter to only include scenes with this studio"""
   studios: MultiCriterionInput
+  """Filter to only include scenes with this movie"""
+  movies: MultiCriterionInput
   """Filter to only include scenes with these tags"""
   tags: MultiCriterionInput
   """Filter to only include scenes with these performers"""
   performers: MultiCriterionInput
 }
 
+input MovieFilterType {
+  """Filter to only include movies with this studio"""
+  studios: MultiCriterionInput
+}
+
 enum CriterionModifier {
   """="""
   EQUALS,
@@ -108,4 +123,9 @@ input IntCriterionInput {
 input MultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
+}
+
+input GenderCriterionInput {
+  value: GenderEnum
+  modifier: CriterionModifier!
 }

graphql/schema/types/metadata.graphql

@@ -1,8 +1,12 @@
 input GenerateMetadataInput {
   sprites: Boolean!
   previews: Boolean!
+  previewPreset: PreviewPreset
+  imagePreviews: Boolean!
   markers: Boolean!
   transcodes: Boolean!
+  """gallery thumbnails for cache usage"""
+  thumbnails: Boolean!
 }
 
 input ScanMetadataInput {
@@ -20,6 +24,16 @@ input AutoTagMetadataInput {
 
 type MetadataUpdateStatus {
   progress: Float!
-	status: String!
+  status: String!
   message: String!
-}
+}
+
+enum PreviewPreset {
+  "X264_ULTRAFAST", ultrafast
+  "X264_VERYFAST", veryfast
+  "X264_FAST", fast
+  "X264_MEDIUM", medium
+  "X264_SLOW", slow
+  "X264_SLOWER", slower
+  "X264_VERYSLOW", veryslow
+}

graphql/schema/types/movie.graphql

@@ -0,0 +1,59 @@
+type Movie {
+  id: ID!
+  checksum: String!
+  name: String!
+  aliases: String
+  """Duration in seconds"""
+  duration: Int
+  date: String
+  rating: Int
+  studio: Studio
+  director: String
+  synopsis: String
+  url: String
+
+  front_image_path: String # Resolver
+  back_image_path: String # Resolver
+  scene_count: Int # Resolver
+}
+
+input MovieCreateInput {
+  name: String!
+  aliases: String
+  """Duration in seconds"""
+  duration: Int
+  date: String
+  rating: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  url: String
+  """This should be base64 encoded"""
+  front_image: String
+  back_image: String
+}
+
+input MovieUpdateInput {
+  id: ID!
+  name: String
+  aliases: String
+  duration: Int
+  date: String
+  rating: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  url: String
+  """This should be base64 encoded"""
+  front_image: String
+  back_image: String
+}
+
+input MovieDestroyInput {
+  id: ID!
+}
+
+type FindMoviesResultType {
+  count: Int!
+  movies: [Movie!]!
+}

graphql/schema/types/performer.graphql

@@ -1,8 +1,17 @@
+enum GenderEnum {
+  MALE
+  FEMALE
+  TRANSGENDER_MALE
+  TRANSGENDER_FEMALE
+  INTERSEX
+}
+
 type Performer {
   id: ID!
   checksum: String!
   name: String
   url: String
+  gender: GenderEnum
   twitter: String
   instagram: String
   birthdate: String
@@ -26,6 +35,7 @@ type Performer {
 input PerformerCreateInput {
   name: String
   url: String
+  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
@@ -48,6 +58,7 @@ input PerformerUpdateInput {
   id: ID!
   name: String
   url: String
+  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String

graphql/schema/types/scene.graphql

@@ -18,6 +18,11 @@ type ScenePathsType {
   chapters_vtt: String # Resolver
 }
 
+type SceneMovie {
+  movie: Movie!
+  scene_index: Int
+}
+
 type Scene {
   id: ID!
   checksum: String!
@@ -26,6 +31,7 @@ type Scene {
   url: String
   date: String
   rating: Int
+  o_counter: Int
   path: String!
 
   file: SceneFileType! # Resolver
@@ -35,10 +41,16 @@ type Scene {
   scene_markers: [SceneMarker!]!
   gallery: Gallery
   studio: Studio
+  movies: [SceneMovie!]!
   tags: [Tag!]!
   performers: [Performer!]!
 }
 
+input SceneMovieInput {
+  movie_id: ID!
+  scene_index: Int
+}
+
 input SceneUpdateInput {
   clientMutationId: String
   id: ID!
@@ -50,11 +62,23 @@ input SceneUpdateInput {
   studio_id: ID
   gallery_id: ID
   performer_ids: [ID!]
+  movies: [SceneMovieInput!]
   tag_ids: [ID!]
   """This should be base64 encoded"""
   cover_image: String
 }
 
+enum BulkUpdateIdMode {
+  SET
+  ADD
+  REMOVE
+}
+
+input BulkUpdateIds {
+  ids: [ID!]
+  mode: BulkUpdateIdMode!
+}
+
 input BulkSceneUpdateInput {
   clientMutationId: String
   ids: [ID!]
@@ -65,8 +89,8 @@ input BulkSceneUpdateInput {
   rating: Int
   studio_id: ID
   gallery_id: ID
-  performer_ids: [ID!]
-  tag_ids: [ID!]
+  performer_ids: BulkUpdateIds
+  tag_ids: BulkUpdateIds
 }
 
 input SceneDestroyInput {
@@ -86,6 +110,11 @@ input SceneParserInput {
   capitalizeTitle: Boolean
 }
 
+type SceneMovieID {
+  movie_id: ID!
+  scene_index: String
+}
+
 type SceneParserResult {
   scene: Scene!
   title: String
@@ -96,6 +125,7 @@ type SceneParserResult {
   studio_id: ID
   gallery_id: ID
   performer_ids: [ID!]
+  movies: [SceneMovieID!]
   tag_ids: [ID!]
 }
 

graphql/schema/types/scraped-movie.graphql

@@ -0,0 +1,22 @@
+"""A movie from a scraping operation..."""
+type ScrapedMovie {
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  url: String
+  synopsis: String
+}
+
+input ScrapedMovieInput {
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  url: String
+  synopsis: String
+}

graphql/schema/types/scraped-performer.graphql

@@ -1,6 +1,7 @@
 """A performer from a scraping operation..."""
 type ScrapedPerformer {
   name: String
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -15,10 +16,14 @@ type ScrapedPerformer {
   tattoos: String
   piercings: String
   aliases: String
+
+  """This should be base64 encoded"""
+  image: String
 }
 
 input ScrapedPerformerInput {
   name: String
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -33,4 +38,6 @@ input ScrapedPerformerInput {
   tattoos: String
   piercings: String
   aliases: String
+
+  # not including image for the input
 }

graphql/schema/types/scraper.graphql

@@ -27,6 +27,7 @@ type ScrapedScenePerformer {
   """Set if performer matched"""
   id: ID
   name: String!
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -43,6 +44,19 @@ type ScrapedScenePerformer {
   aliases: String
 }
 
+type ScrapedSceneMovie {
+  """Set if movie matched"""
+  id: ID
+  name: String!
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  synopsis: String
+  url: String
+}
+
 type ScrapedSceneStudio {
   """Set if studio matched"""
   id: ID
@@ -62,9 +76,13 @@ type ScrapedScene {
   url: String
   date: String
 
+  """This should be base64 encoded"""
+  image: String
+
   file: SceneFileType # Resolver
 
   studio: ScrapedSceneStudio
   tags: [ScrapedSceneTag!]
   performers: [ScrapedScenePerformer!]
+  movies: [ScrapedSceneMovie!]
 }

graphql/schema/types/stats.graphql

@@ -1,7 +1,9 @@
 type StatsResultType {
   scene_count: Int!
+  scene_size_count: String!
   gallery_count: Int!
   performer_count: Int!
   studio_count: Int!
+  movie_count: Int!
   tag_count: Int!
-}
+}

graphql/schema/types/version.graphql

@@ -2,4 +2,9 @@ type Version {
   version: String
   hash: String!
   build_time: String!
-}
+}
+
+type ShortVersion {
+  shorthash: String!
+  url: String!
+}

pkg/api/cache_thumbs.go

@@ -0,0 +1,72 @@
+package api
+
+import (
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/paths"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+	"io/ioutil"
+)
+
+type thumbBuffer struct {
+	path string
+	dir  string
+	data []byte
+}
+
+func newCacheThumb(dir string, path string, data []byte) *thumbBuffer {
+	t := thumbBuffer{dir: dir, path: path, data: data}
+	return &t
+}
+
+var writeChan chan *thumbBuffer
+var touchChan chan *string
+
+func startThumbCache() { // TODO add extra wait, close chan code if/when stash gets a stop mode
+
+	writeChan = make(chan *thumbBuffer, 20)
+	go thumbnailCacheWriter()
+}
+
+//serialize file writes to avoid race conditions
+func thumbnailCacheWriter() {
+
+	for thumb := range writeChan {
+		exists, _ := utils.FileExists(thumb.path)
+		if !exists {
+			err := utils.WriteFile(thumb.path, thumb.data)
+			if err != nil {
+				logger.Errorf("Write error for thumbnail %s: %s ", thumb.path, err)
+			}
+		}
+	}
+
+}
+
+// get thumbnail from cache, otherwise create it and store to cache
+func cacheGthumb(gallery *models.Gallery, index int, width int) []byte {
+	thumbPath := paths.GetGthumbPath(gallery.Checksum, index, width)
+	exists, _ := utils.FileExists(thumbPath)
+	if exists { // if thumbnail exists in cache return that
+		content, err := ioutil.ReadFile(thumbPath)
+		if err == nil {
+			return content
+		} else {
+			logger.Errorf("Read Error for file %s : %s", thumbPath, err)
+		}
+
+	}
+	data := gallery.GetThumbnail(index, width)
+	thumbDir := paths.GetGthumbDir(gallery.Checksum)
+	t := newCacheThumb(thumbDir, thumbPath, data)
+	writeChan <- t // write the file to cache
+	return data
+}
+
+// create all thumbs for a given gallery
+func CreateGthumbs(gallery *models.Gallery) {
+	count := gallery.ImageCount()
+	for i := 0; i < count; i++ {
+		cacheGthumb(gallery, i, models.DefaultGthumbWidth)
+	}
+}

pkg/api/check_version.go

@@ -0,0 +1,247 @@
+package api
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"regexp"
+	"runtime"
+	"time"
+
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+//we use the github REST V3 API as no login is required
+const apiReleases string = "https://api.github.com/repos/stashapp/stash/releases"
+const apiTags string = "https://api.github.com/repos/stashapp/stash/tags"
+const apiAcceptHeader string = "application/vnd.github.v3+json"
+const developmentTag string = "latest_develop"
+
+// ErrNoVersion indicates that no version information has been embedded in the
+// stash binary
+var ErrNoVersion = errors.New("no stash version")
+
+var stashReleases = func() map[string]string {
+	return map[string]string{
+		"windows/amd64": "stash-win.exe",
+		"linux/amd64":   "stash-linux",
+		"darwin/amd64":  "stash-osx",
+		"linux/arm":     "stash-pi",
+	}
+}
+
+type githubReleasesResponse struct {
+	Url              string
+	Assets_url       string
+	Upload_url       string
+	Html_url         string
+	Id               int64
+	Node_id          string
+	Tag_name         string
+	Target_commitish string
+	Name             string
+	Draft            bool
+	Author           githubAuthor
+	Prerelease       bool
+	Created_at       string
+	Published_at     string
+	Assets           []githubAsset
+	Tarball_url      string
+	Zipball_url      string
+	Body             string
+}
+
+type githubAuthor struct {
+	Login               string
+	Id                  int64
+	Node_id             string
+	Avatar_url          string
+	Gravatar_id         string
+	Url                 string
+	Html_url            string
+	Followers_url       string
+	Following_url       string
+	Gists_url           string
+	Starred_url         string
+	Subscriptions_url   string
+	Organizations_url   string
+	Repos_url           string
+	Events_url          string
+	Received_events_url string
+	Type                string
+	Site_admin          bool
+}
+
+type githubAsset struct {
+	Url                  string
+	Id                   int64
+	Node_id              string
+	Name                 string
+	Label                string
+	Uploader             githubAuthor
+	Content_type         string
+	State                string
+	Size                 int64
+	Download_count       int64
+	Created_at           string
+	Updated_at           string
+	Browser_download_url string
+}
+
+type githubTagResponse struct {
+	Name        string
+	Zipball_url string
+	Tarball_url string
+	Commit      struct {
+		Sha string
+		Url string
+	}
+	Node_id string
+}
+
+func makeGithubRequest(url string, output interface{}) error {
+	client := &http.Client{
+		Timeout: 3 * time.Second,
+	}
+
+	req, _ := http.NewRequest("GET", url, nil)
+
+	req.Header.Add("Accept", apiAcceptHeader) // gh api recommendation , send header with api version
+	response, err := client.Do(req)
+
+	if err != nil {
+		return fmt.Errorf("Github API request failed: %s", err)
+	}
+
+	if response.StatusCode != http.StatusOK {
+		return fmt.Errorf("Github API request failed: %s", response.Status)
+	}
+
+	defer response.Body.Close()
+
+	data, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		return fmt.Errorf("Github API read response failed: %s", err)
+	}
+
+	err = json.Unmarshal(data, output)
+	if err != nil {
+		return fmt.Errorf("Unmarshalling Github API response failed: %s", err)
+	}
+
+	return nil
+}
+
+// GetLatestVersion gets latest version (git commit hash) from github API
+// If running a build from the "master" branch, then the latest full release
+// is used, otherwise it uses the release that is tagged with "latest_develop"
+// which is the latest pre-release build.
+func GetLatestVersion(shortHash bool) (latestVersion string, latestRelease string, err error) {
+
+	platform := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
+	wantedRelease := stashReleases()[platform]
+
+	version, _, _ := GetVersion()
+	if version == "" {
+		return "", "", ErrNoVersion
+	}
+
+	// if the version is suffixed with -x-xxxx, then we are running a development build
+	usePreRelease := false
+	re := regexp.MustCompile(`-\d+-g\w+$`)
+	if re.MatchString(version) {
+		usePreRelease = true
+	}
+
+	url := apiReleases
+	if !usePreRelease {
+		// just get the latest full release
+		url += "/latest"
+	} else {
+		// get the release tagged with the development tag
+		url += "/tags/" + developmentTag
+	}
+
+	release := githubReleasesResponse{}
+	err = makeGithubRequest(url, &release)
+
+	if err != nil {
+		return "", "", err
+	}
+
+	if release.Prerelease == usePreRelease {
+		latestVersion = getReleaseHash(release, shortHash, usePreRelease)
+
+		if wantedRelease != "" {
+			for _, asset := range release.Assets {
+				if asset.Name == wantedRelease {
+					latestRelease = asset.Browser_download_url
+					break
+				}
+			}
+		}
+	}
+
+	if latestVersion == "" {
+		return "", "", fmt.Errorf("No version found for \"%s\"", version)
+	}
+	return latestVersion, latestRelease, nil
+}
+
+func getReleaseHash(release githubReleasesResponse, shortHash bool, usePreRelease bool) string {
+	// the /latest API call doesn't return the hash in target_commitish
+	// also add sanity check in case Target_commitish is not 40 characters
+	if !usePreRelease || len(release.Target_commitish) != 40 {
+		return getShaFromTags(shortHash, release.Tag_name)
+	}
+
+	if shortHash {
+		return release.Target_commitish[0:7] //shorthash is first 7 digits of git commit hash
+	}
+
+	return release.Target_commitish
+}
+
+func printLatestVersion() {
+	_, githash, _ = GetVersion()
+	latest, _, err := GetLatestVersion(true)
+	if err != nil {
+		logger.Errorf("Couldn't find latest version: %s", err)
+	} else {
+		if githash == latest {
+			logger.Infof("Version: (%s) is already the latest released.", latest)
+		} else {
+			logger.Infof("New version: (%s) available.", latest)
+		}
+	}
+}
+
+// get sha from the github api tags endpoint
+// returns the sha1 hash/shorthash or "" if something's wrong
+func getShaFromTags(shortHash bool, name string) string {
+	url := apiTags
+	tags := []githubTagResponse{}
+	err := makeGithubRequest(url, &tags)
+
+	if err != nil {
+		logger.Errorf("Github Tags Api %v", err)
+		return ""
+	}
+
+	for _, tag := range tags {
+		if tag.Name == name {
+			if len(tag.Commit.Sha) != 40 {
+				return ""
+			}
+			if shortHash {
+				return tag.Commit.Sha[0:7] //shorthash is first 7 digits of git commit hash
+			}
+
+			return tag.Commit.Sha
+		}
+	}
+
+	return ""
+}

pkg/api/context_keys.go

@@ -9,4 +9,6 @@ const (
 	performerKey key = 1
 	sceneKey     key = 2
 	studioKey    key = 3
+	movieKey     key = 4
+	ContextUser  key = 5
 )

pkg/api/images.go

@@ -2,18 +2,31 @@ package api
 
 import (
 	"math/rand"
+	"strings"
 
 	"github.com/gobuffalo/packr/v2"
 )
 
 var performerBox *packr.Box
+var performerBoxMale *packr.Box
 
 func initialiseImages() {
 	performerBox = packr.New("Performer Box", "../../static/performer")
+	performerBoxMale = packr.New("Male Performer Box", "../../static/performer_male")
 }
 
-func getRandomPerformerImage() ([]byte, error) {
-	imageFiles := performerBox.List()
+func getRandomPerformerImage(gender string) ([]byte, error) {
+	var box *packr.Box
+	switch strings.ToUpper(gender) {
+	case "FEMALE":
+		box = performerBox
+	case "MALE":
+		box = performerBoxMale
+	default:
+		box = performerBox
+
+	}
+	imageFiles := box.List()
 	index := rand.Intn(len(imageFiles))
-	return performerBox.Find(imageFiles[index])
+	return box.Find(imageFiles[index])
 }

pkg/api/migrate.go

@@ -0,0 +1,92 @@
+package api
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+	"os"
+
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/logger"
+)
+
+type migrateData struct {
+	ExistingVersion uint
+	MigrateVersion  uint
+	BackupPath      string
+}
+
+func getMigrateData() migrateData {
+	return migrateData{
+		ExistingVersion: database.Version(),
+		MigrateVersion:  database.AppSchemaVersion(),
+		BackupPath:      database.DatabaseBackupPath(),
+	}
+}
+
+func getMigrateHandler(w http.ResponseWriter, r *http.Request) {
+	if !database.NeedsMigration() {
+		http.Redirect(w, r, "/", 301)
+		return
+	}
+
+	data, _ := setupUIBox.Find("migrate.html")
+	templ, err := template.New("Migrate").Parse(string(data))
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+		return
+	}
+
+	err = templ.Execute(w, getMigrateData())
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+	}
+}
+
+func doMigrateHandler(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+	}
+
+	formBackupPath := r.Form.Get("backuppath")
+
+	// always backup so that we can roll back to the previous version if
+	// migration fails
+	backupPath := formBackupPath
+	if formBackupPath == "" {
+		backupPath = database.DatabaseBackupPath()
+	}
+
+	// perform database backup
+	if err = database.Backup(backupPath); err != nil {
+		http.Error(w, fmt.Sprintf("error backing up database: %s", err), 500)
+		return
+	}
+
+	err = database.RunMigrations()
+	if err != nil {
+		errStr := fmt.Sprintf("error performing migration: %s", err)
+
+		// roll back to the backed up version
+		restoreErr := database.RestoreFromBackup(backupPath)
+		if restoreErr != nil {
+			errStr = fmt.Sprintf("ERROR: unable to restore database from backup after migration failure: %s\n%s", restoreErr.Error(), errStr)
+		} else {
+			errStr = "An error occurred migrating the database to the latest schema version. The backup database file was automatically renamed to restore the database.\n" + errStr
+		}
+
+		http.Error(w, errStr, 500)
+		return
+	}
+
+	// if no backup path was provided, then delete the created backup
+	if formBackupPath == "" {
+		err = os.Remove(backupPath)
+		if err != nil {
+			logger.Warnf("error removing unwanted database backup (%s): %s", backupPath, err.Error())
+		}
+	}
+
+	http.Redirect(w, r, "/", 301)
+}

pkg/api/resolver.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/99designs/gqlgen/graphql"
-
+	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
 )
 
@@ -33,6 +33,9 @@ func (r *Resolver) SceneMarker() models.SceneMarkerResolver {
 func (r *Resolver) Studio() models.StudioResolver {
 	return &studioResolver{r}
 }
+func (r *Resolver) Movie() models.MovieResolver {
+	return &movieResolver{r}
+}
 func (r *Resolver) Subscription() models.SubscriptionResolver {
 	return &subscriptionResolver{r}
 }
@@ -49,6 +52,7 @@ type performerResolver struct{ *Resolver }
 type sceneResolver struct{ *Resolver }
 type sceneMarkerResolver struct{ *Resolver }
 type studioResolver struct{ *Resolver }
+type movieResolver struct{ *Resolver }
 type tagResolver struct{ *Resolver }
 
 func (r *queryResolver) MarkerWall(ctx context.Context, q *string) ([]*models.SceneMarker, error) {
@@ -89,19 +93,24 @@ func (r *queryResolver) ValidGalleriesForScene(ctx context.Context, scene_id *st
 func (r *queryResolver) Stats(ctx context.Context) (*models.StatsResultType, error) {
 	scenesQB := models.NewSceneQueryBuilder()
 	scenesCount, _ := scenesQB.Count()
+	scenesSizeCount, _ := scenesQB.SizeCount()
 	galleryQB := models.NewGalleryQueryBuilder()
 	galleryCount, _ := galleryQB.Count()
 	performersQB := models.NewPerformerQueryBuilder()
 	performersCount, _ := performersQB.Count()
 	studiosQB := models.NewStudioQueryBuilder()
 	studiosCount, _ := studiosQB.Count()
+	moviesQB := models.NewMovieQueryBuilder()
+	moviesCount, _ := moviesQB.Count()
 	tagsQB := models.NewTagQueryBuilder()
 	tagsCount, _ := tagsQB.Count()
 	return &models.StatsResultType{
 		SceneCount:     scenesCount,
+		SceneSizeCount: scenesSizeCount,
 		GalleryCount:   galleryCount,
 		PerformerCount: performersCount,
 		StudioCount:    studiosCount,
+		MovieCount:     moviesCount,
 		TagCount:       tagsCount,
 	}, nil
 }
@@ -116,6 +125,21 @@ func (r *queryResolver) Version(ctx context.Context) (*models.Version, error) {
 	}, nil
 }
 
+//Gets latest version (git shorthash commit for now)
+func (r *queryResolver) Latestversion(ctx context.Context) (*models.ShortVersion, error) {
+	ver, url, err := GetLatestVersion(true)
+	if err == nil {
+		logger.Infof("Retrieved latest hash: %s", ver)
+	} else {
+		logger.Errorf("Error while retrieving latest hash: %s", err)
+	}
+
+	return &models.ShortVersion{
+		Shorthash: ver,
+		URL:       url,
+	}, err
+}
+
 // Get scene marker tags which show up under the video.
 func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([]*models.SceneMarkerTag, error) {
 	sceneID, _ := strconv.Atoi(scene_id)

pkg/api/resolver_model_movie.go

@@ -0,0 +1,95 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+func (r *movieResolver) Name(ctx context.Context, obj *models.Movie) (string, error) {
+	if obj.Name.Valid {
+		return obj.Name.String, nil
+	}
+	return "", nil
+}
+
+func (r *movieResolver) URL(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.URL.Valid {
+		return &obj.URL.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Aliases(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Aliases.Valid {
+		return &obj.Aliases.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Duration(ctx context.Context, obj *models.Movie) (*int, error) {
+	if obj.Duration.Valid {
+		rating := int(obj.Duration.Int64)
+		return &rating, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Date(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Date.Valid {
+		result := utils.GetYMDFromDatabaseDate(obj.Date.String)
+		return &result, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Rating(ctx context.Context, obj *models.Movie) (*int, error) {
+	if obj.Rating.Valid {
+		rating := int(obj.Rating.Int64)
+		return &rating, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Studio(ctx context.Context, obj *models.Movie) (*models.Studio, error) {
+	qb := models.NewStudioQueryBuilder()
+	if obj.StudioID.Valid {
+		return qb.Find(int(obj.StudioID.Int64), nil)
+	}
+
+	return nil, nil
+}
+
+func (r *movieResolver) Director(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Director.Valid {
+		return &obj.Director.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Synopsis(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Synopsis.Valid {
+		return &obj.Synopsis.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) FrontImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	frontimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj.ID).GetMovieFrontImageURL()
+	return &frontimagePath, nil
+}
+
+func (r *movieResolver) BackImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	backimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj.ID).GetMovieBackImageURL()
+	return &backimagePath, nil
+}
+
+func (r *movieResolver) SceneCount(ctx context.Context, obj *models.Movie) (*int, error) {
+	qb := models.NewSceneQueryBuilder()
+	res, err := qb.CountByMovieID(obj.ID)
+	return &res, err
+}

pkg/api/resolver_model_performer.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+
 	"github.com/stashapp/stash/pkg/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/models"
 )
@@ -20,6 +21,19 @@ func (r *performerResolver) URL(ctx context.Context, obj *models.Performer) (*st
 	return nil, nil
 }
 
+func (r *performerResolver) Gender(ctx context.Context, obj *models.Performer) (*models.GenderEnum, error) {
+	var ret models.GenderEnum
+
+	if obj.Gender.Valid {
+		ret = models.GenderEnum(obj.Gender.String)
+		if ret.IsValid() {
+			return &ret, nil
+		}
+	}
+
+	return nil, nil
+}
+
 func (r *performerResolver) Twitter(ctx context.Context, obj *models.Performer) (*string, error) {
 	if obj.Twitter.Valid {
 		return &obj.Twitter.String, nil

pkg/api/resolver_model_scene.go

@@ -82,7 +82,9 @@ func (r *sceneResolver) Paths(ctx context.Context, obj *models.Scene) (*models.S
 }
 
 func (r *sceneResolver) IsStreamable(ctx context.Context, obj *models.Scene) (bool, error) {
-	return manager.IsStreamable(obj)
+	// ignore error
+	ret, _ := manager.IsStreamable(obj)
+	return ret, nil
 }
 
 func (r *sceneResolver) SceneMarkers(ctx context.Context, obj *models.Scene) ([]*models.SceneMarker, error) {
@@ -100,6 +102,38 @@ func (r *sceneResolver) Studio(ctx context.Context, obj *models.Scene) (*models.
 	return qb.FindBySceneID(obj.ID)
 }
 
+func (r *sceneResolver) Movies(ctx context.Context, obj *models.Scene) ([]*models.SceneMovie, error) {
+	joinQB := models.NewJoinsQueryBuilder()
+	qb := models.NewMovieQueryBuilder()
+
+	sceneMovies, err := joinQB.GetSceneMovies(obj.ID, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var ret []*models.SceneMovie
+	for _, sm := range sceneMovies {
+		movie, err := qb.Find(sm.MovieID, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		sceneIdx := sm.SceneIndex
+		sceneMovie := &models.SceneMovie{
+			Movie: movie,
+		}
+
+		if sceneIdx.Valid {
+			var idx int
+			idx = int(sceneIdx.Int64)
+			sceneMovie.SceneIndex = &idx
+		}
+
+		ret = append(ret, sceneMovie)
+	}
+	return ret, nil
+}
+
 func (r *sceneResolver) Tags(ctx context.Context, obj *models.Scene) ([]*models.Tag, error) {
 	qb := models.NewTagQueryBuilder()
 	return qb.FindBySceneID(obj.ID, nil)

pkg/api/resolver_mutation_configure.go

@@ -38,6 +38,13 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		config.Set(config.Generated, input.GeneratedPath)
 	}
 
+	if input.CachePath != nil {
+		if err := utils.EnsureDir(*input.CachePath); err != nil {
+			return makeConfigGeneralResult(), err
+		}
+		config.Set(config.Cache, input.CachePath)
+	}
+
 	if input.MaxTranscodeSize != nil {
 		config.Set(config.MaxTranscodeSize, input.MaxTranscodeSize.String())
 	}
@@ -45,6 +52,8 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 	if input.MaxStreamingTranscodeSize != nil {
 		config.Set(config.MaxStreamingTranscodeSize, input.MaxStreamingTranscodeSize.String())
 	}
+	config.Set(config.ForceMKV, input.ForceMkv)
+	config.Set(config.ForceHEVC, input.ForceHevc)
 
 	if input.Username != nil {
 		config.Set(config.Username, input.Username)
@@ -60,6 +69,10 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		}
 	}
 
+	if input.MaxSessionAge != nil {
+		config.Set(config.MaxSessionAge, *input.MaxSessionAge)
+	}
+
 	if input.LogFile != nil {
 		config.Set(config.LogFile, input.LogFile)
 	}
@@ -76,6 +89,10 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		config.Set(config.Exclude, input.Excludes)
 	}
 
+	if input.ScraperUserAgent != nil {
+		config.Set(config.ScraperUserAgent, input.ScraperUserAgent)
+	}
+
 	if err := config.Write(); err != nil {
 		return makeConfigGeneralResult(), err
 	}
@@ -94,6 +111,10 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input models.
 		config.Set(config.WallShowTitle, *input.WallShowTitle)
 	}
 
+	if input.WallPlayback != nil {
+		config.Set(config.WallPlayback, *input.WallPlayback)
+	}
+
 	if input.MaximumLoopDuration != nil {
 		config.Set(config.MaximumLoopDuration, *input.MaximumLoopDuration)
 	}
@@ -106,6 +127,10 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input models.
 		config.Set(config.ShowStudioAsText, *input.ShowStudioAsText)
 	}
 
+	if input.Language != nil {
+		config.Set(config.Language, *input.Language)
+	}
+
 	css := ""
 
 	if input.CSS != nil {

pkg/api/resolver_mutation_metadata.go

@@ -0,0 +1,53 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *mutationResolver) MetadataScan(ctx context.Context, input models.ScanMetadataInput) (string, error) {
+	manager.GetInstance().Scan(input.UseFileMetadata)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataImport(ctx context.Context) (string, error) {
+	manager.GetInstance().Import()
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataExport(ctx context.Context) (string, error) {
+	manager.GetInstance().Export()
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataGenerate(ctx context.Context, input models.GenerateMetadataInput) (string, error) {
+	manager.GetInstance().Generate(input.Sprites, input.Previews, input.PreviewPreset, input.ImagePreviews, input.Markers, input.Transcodes, input.Thumbnails)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataAutoTag(ctx context.Context, input models.AutoTagMetadataInput) (string, error) {
+	manager.GetInstance().AutoTag(input.Performers, input.Studios, input.Tags)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataClean(ctx context.Context) (string, error) {
+	manager.GetInstance().Clean()
+	return "todo", nil
+}
+
+func (r *mutationResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateStatus, error) {
+	status := manager.GetInstance().Status
+	ret := models.MetadataUpdateStatus{
+		Progress: status.Progress,
+		Status:   status.Status.String(),
+		Message:  "",
+	}
+
+	return &ret, nil
+}
+
+func (r *mutationResolver) StopJob(ctx context.Context) (bool, error) {
+	return manager.GetInstance().Status.Stop(), nil
+}

pkg/api/resolver_mutation_movie.go

@@ -0,0 +1,199 @@
+package api
+
+import (
+	"context"
+	"database/sql"
+	"strconv"
+	"time"
+
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+func (r *mutationResolver) MovieCreate(ctx context.Context, input models.MovieCreateInput) (*models.Movie, error) {
+	// generate checksum from movie name rather than image
+	checksum := utils.MD5FromString(input.Name)
+
+	var frontimageData []byte
+	var backimageData []byte
+	var err error
+
+	if input.FrontImage == nil {
+		input.FrontImage = &models.DefaultMovieImage
+	}
+	if input.BackImage == nil {
+		input.BackImage = &models.DefaultMovieImage
+	}
+	// Process the base 64 encoded image string
+	_, frontimageData, err = utils.ProcessBase64Image(*input.FrontImage)
+	if err != nil {
+		return nil, err
+	}
+	// Process the base 64 encoded image string
+	_, backimageData, err = utils.ProcessBase64Image(*input.BackImage)
+	if err != nil {
+		return nil, err
+	}
+
+	// Populate a new movie from the input
+	currentTime := time.Now()
+	newMovie := models.Movie{
+		BackImage:  backimageData,
+		FrontImage: frontimageData,
+		Checksum:   checksum,
+		Name:       sql.NullString{String: input.Name, Valid: true},
+		CreatedAt:  models.SQLiteTimestamp{Timestamp: currentTime},
+		UpdatedAt:  models.SQLiteTimestamp{Timestamp: currentTime},
+	}
+
+	if input.Aliases != nil {
+		newMovie.Aliases = sql.NullString{String: *input.Aliases, Valid: true}
+	}
+	if input.Duration != nil {
+		duration := int64(*input.Duration)
+		newMovie.Duration = sql.NullInt64{Int64: duration, Valid: true}
+	}
+
+	if input.Date != nil {
+		newMovie.Date = models.SQLiteDate{String: *input.Date, Valid: true}
+	}
+
+	if input.Rating != nil {
+		rating := int64(*input.Rating)
+		newMovie.Rating = sql.NullInt64{Int64: rating, Valid: true}
+	}
+
+	if input.StudioID != nil {
+		studioID, _ := strconv.ParseInt(*input.StudioID, 10, 64)
+		newMovie.StudioID = sql.NullInt64{Int64: studioID, Valid: true}
+	}
+
+	if input.Director != nil {
+		newMovie.Director = sql.NullString{String: *input.Director, Valid: true}
+	}
+
+	if input.Synopsis != nil {
+		newMovie.Synopsis = sql.NullString{String: *input.Synopsis, Valid: true}
+	}
+
+	if input.URL != nil {
+		newMovie.URL = sql.NullString{String: *input.URL, Valid: true}
+	}
+
+	// Start the transaction and save the movie
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewMovieQueryBuilder()
+	movie, err := qb.Create(newMovie, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return movie, nil
+}
+
+func (r *mutationResolver) MovieUpdate(ctx context.Context, input models.MovieUpdateInput) (*models.Movie, error) {
+	// Populate movie from the input
+	movieID, _ := strconv.Atoi(input.ID)
+
+	updatedMovie := models.MoviePartial{
+		ID:        movieID,
+		UpdatedAt: &models.SQLiteTimestamp{Timestamp: time.Now()},
+	}
+	if input.FrontImage != nil {
+		_, frontimageData, err := utils.ProcessBase64Image(*input.FrontImage)
+		if err != nil {
+			return nil, err
+		}
+		updatedMovie.FrontImage = &frontimageData
+	}
+	if input.BackImage != nil {
+		_, backimageData, err := utils.ProcessBase64Image(*input.BackImage)
+		if err != nil {
+			return nil, err
+		}
+		updatedMovie.BackImage = &backimageData
+	}
+
+	if input.Name != nil {
+		// generate checksum from movie name rather than image
+		checksum := utils.MD5FromString(*input.Name)
+		updatedMovie.Name = &sql.NullString{String: *input.Name, Valid: true}
+		updatedMovie.Checksum = &checksum
+	}
+
+	if input.Aliases != nil {
+		updatedMovie.Aliases = &sql.NullString{String: *input.Aliases, Valid: true}
+	}
+	if input.Duration != nil {
+		duration := int64(*input.Duration)
+		updatedMovie.Duration = &sql.NullInt64{Int64: duration, Valid: true}
+	}
+
+	if input.Date != nil {
+		updatedMovie.Date = &models.SQLiteDate{String: *input.Date, Valid: true}
+	}
+
+	if input.Rating != nil {
+		rating := int64(*input.Rating)
+		updatedMovie.Rating = &sql.NullInt64{Int64: rating, Valid: true}
+	} else {
+		// rating must be nullable
+		updatedMovie.Rating = &sql.NullInt64{Valid: false}
+	}
+
+	if input.StudioID != nil {
+		studioID, _ := strconv.ParseInt(*input.StudioID, 10, 64)
+		updatedMovie.StudioID = &sql.NullInt64{Int64: studioID, Valid: true}
+	} else {
+		// studio must be nullable
+		updatedMovie.StudioID = &sql.NullInt64{Valid: false}
+	}
+
+	if input.Director != nil {
+		updatedMovie.Director = &sql.NullString{String: *input.Director, Valid: true}
+	}
+
+	if input.Synopsis != nil {
+		updatedMovie.Synopsis = &sql.NullString{String: *input.Synopsis, Valid: true}
+	}
+
+	if input.URL != nil {
+		updatedMovie.URL = &sql.NullString{String: *input.URL, Valid: true}
+	}
+
+	// Start the transaction and save the movie
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewMovieQueryBuilder()
+	movie, err := qb.Update(updatedMovie, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return movie, nil
+}
+
+func (r *mutationResolver) MovieDestroy(ctx context.Context, input models.MovieDestroyInput) (bool, error) {
+	qb := models.NewMovieQueryBuilder()
+	tx := database.DB.MustBeginTx(ctx, nil)
+	if err := qb.Destroy(input.ID, tx); err != nil {
+		_ = tx.Rollback()
+		return false, err
+	}
+	if err := tx.Commit(); err != nil {
+		return false, err
+	}
+	return true, nil
+}

pkg/api/resolver_mutation_performer.go

@@ -19,7 +19,11 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	var err error
 
 	if input.Image == nil {
-		imageData, err = getRandomPerformerImage()
+		gender := ""
+		if input.Gender != nil {
+			gender = input.Gender.String()
+		}
+		imageData, err = getRandomPerformerImage(gender)
 	} else {
 		_, imageData, err = utils.ProcessBase64Image(*input.Image)
 	}
@@ -42,6 +46,9 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	if input.URL != nil {
 		newPerformer.URL = sql.NullString{String: *input.URL, Valid: true}
 	}
+	if input.Gender != nil {
+		newPerformer.Gender = sql.NullString{String: input.Gender.String(), Valid: true}
+	}
 	if input.Birthdate != nil {
 		newPerformer.Birthdate = models.SQLiteDate{String: *input.Birthdate, Valid: true}
 	}
@@ -128,6 +135,9 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	if input.URL != nil {
 		updatedPerformer.URL = sql.NullString{String: *input.URL, Valid: true}
 	}
+	if input.Gender != nil {
+		updatedPerformer.Gender = sql.NullString{String: input.Gender.String(), Valid: true}
+	}
 	if input.Birthdate != nil {
 		updatedPerformer.Birthdate = models.SQLiteDate{String: *input.Birthdate, Valid: true}
 	}

pkg/api/resolver_mutation_scene.go

@@ -147,6 +147,31 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 		return nil, err
 	}
 
+	// Save the movies
+	var movieJoins []models.MoviesScenes
+
+	for _, movie := range input.Movies {
+
+		movieID, _ := strconv.Atoi(movie.MovieID)
+
+		movieJoin := models.MoviesScenes{
+			MovieID: movieID,
+			SceneID: sceneID,
+		}
+
+		if movie.SceneIndex != nil {
+			movieJoin.SceneIndex = sql.NullInt64{
+				Int64: int64(*movie.SceneIndex),
+				Valid: true,
+			}
+		}
+
+		movieJoins = append(movieJoins, movieJoin)
+	}
+	if err := jqb.UpdateMoviesScenes(sceneID, movieJoins, tx); err != nil {
+		return nil, err
+	}
+
 	// Save the tags
 	var tagJoins []models.ScenesTags
 	for _, tid := range input.TagIds {
@@ -163,10 +188,6 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 
 	// only update the cover image if provided and everything else was successful
 	if coverImageData != nil {
-		scene, err := qb.Find(sceneID)
-		if err != nil {
-			return nil, err
-		}
 
 		err = manager.SetSceneScreenshot(scene.Checksum, coverImageData)
 		if err != nil {
@@ -251,9 +272,14 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 
 		// Save the performers
 		if wasFieldIncluded(ctx, "performer_ids") {
+			performerIDs, err := adjustScenePerformerIDs(tx, sceneID, *input.PerformerIds)
+			if err != nil {
+				_ = tx.Rollback()
+				return nil, err
+			}
+
 			var performerJoins []models.PerformersScenes
-			for _, pid := range input.PerformerIds {
-				performerID, _ := strconv.Atoi(pid)
+			for _, performerID := range performerIDs {
 				performerJoin := models.PerformersScenes{
 					PerformerID: performerID,
 					SceneID:     sceneID,
@@ -268,9 +294,14 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 
 		// Save the tags
 		if wasFieldIncluded(ctx, "tag_ids") {
+			tagIDs, err := adjustSceneTagIDs(tx, sceneID, *input.TagIds)
+			if err != nil {
+				_ = tx.Rollback()
+				return nil, err
+			}
+
 			var tagJoins []models.ScenesTags
-			for _, tid := range input.TagIds {
-				tagID, _ := strconv.Atoi(tid)
+			for _, tagID := range tagIDs {
 				tagJoin := models.ScenesTags{
 					SceneID: sceneID,
 					TagID:   tagID,
@@ -292,6 +323,72 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 	return ret, nil
 }
 
+func adjustIDs(existingIDs []int, updateIDs models.BulkUpdateIds) []int {
+	for _, idStr := range updateIDs.Ids {
+		id, _ := strconv.Atoi(idStr)
+
+		// look for the id in the list
+		foundExisting := false
+		for idx, existingID := range existingIDs {
+			if existingID == id {
+				if updateIDs.Mode == models.BulkUpdateIDModeRemove {
+					// remove from the list
+					existingIDs = append(existingIDs[:idx], existingIDs[idx+1:]...)
+				}
+
+				foundExisting = true
+				break
+			}
+		}
+
+		if !foundExisting && updateIDs.Mode != models.BulkUpdateIDModeRemove {
+			existingIDs = append(existingIDs, id)
+		}
+	}
+
+	return existingIDs
+}
+
+func adjustScenePerformerIDs(tx *sqlx.Tx, sceneID int, ids models.BulkUpdateIds) ([]int, error) {
+	var ret []int
+
+	jqb := models.NewJoinsQueryBuilder()
+	if ids.Mode == models.BulkUpdateIDModeAdd || ids.Mode == models.BulkUpdateIDModeRemove {
+		// adding to the joins
+		performerJoins, err := jqb.GetScenePerformers(sceneID, tx)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, join := range performerJoins {
+			ret = append(ret, join.PerformerID)
+		}
+	}
+
+	return adjustIDs(ret, ids), nil
+}
+
+func adjustSceneTagIDs(tx *sqlx.Tx, sceneID int, ids models.BulkUpdateIds) ([]int, error) {
+	var ret []int
+
+	jqb := models.NewJoinsQueryBuilder()
+	if ids.Mode == models.BulkUpdateIDModeAdd || ids.Mode == models.BulkUpdateIDModeRemove {
+		// adding to the joins
+		tagJoins, err := jqb.GetSceneTags(sceneID, tx)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, join := range tagJoins {
+			ret = append(ret, join.TagID)
+		}
+	}
+
+	return adjustIDs(ret, ids), nil
+}
+
 func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneDestroyInput) (bool, error) {
 	qb := models.NewSceneQueryBuilder()
 	tx := database.DB.MustBeginTx(ctx, nil)
@@ -360,6 +457,14 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input models.S
 func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (bool, error) {
 	qb := models.NewSceneMarkerQueryBuilder()
 	tx := database.DB.MustBeginTx(ctx, nil)
+
+	markerID, _ := strconv.Atoi(id)
+	marker, err := qb.Find(markerID)
+
+	if err != nil {
+		return false, err
+	}
+
 	if err := qb.Destroy(id, tx); err != nil {
 		_ = tx.Rollback()
 		return false, err
@@ -367,6 +472,16 @@ func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (b
 	if err := tx.Commit(); err != nil {
 		return false, err
 	}
+
+	// delete the preview for the marker
+	sqb := models.NewSceneQueryBuilder()
+	scene, _ := sqb.Find(int(marker.SceneID.Int64))
+
+	if scene != nil {
+		seconds := int(marker.Seconds)
+		manager.DeleteSceneMarkerFiles(scene, seconds)
+	}
+
 	return true, nil
 }
 
@@ -376,13 +491,18 @@ func changeMarker(ctx context.Context, changeType int, changedMarker models.Scen
 	qb := models.NewSceneMarkerQueryBuilder()
 	jqb := models.NewJoinsQueryBuilder()
 
+	var existingMarker *models.SceneMarker
 	var sceneMarker *models.SceneMarker
 	var err error
 	switch changeType {
 	case create:
 		sceneMarker, err = qb.Create(changedMarker, tx)
 	case update:
-		sceneMarker, err = qb.Update(changedMarker, tx)
+		// check to see if timestamp was changed
+		existingMarker, err = qb.Find(changedMarker.ID)
+		if err == nil {
+			sceneMarker, err = qb.Update(changedMarker, tx)
+		}
 	}
 	if err != nil {
 		_ = tx.Rollback()
@@ -420,5 +540,87 @@ func changeMarker(ctx context.Context, changeType int, changedMarker models.Scen
 		return nil, err
 	}
 
+	// remove the marker preview if the timestamp was changed
+	if existingMarker != nil && existingMarker.Seconds != changedMarker.Seconds {
+		sqb := models.NewSceneQueryBuilder()
+
+		scene, _ := sqb.Find(int(existingMarker.SceneID.Int64))
+
+		if scene != nil {
+			seconds := int(existingMarker.Seconds)
+			manager.DeleteSceneMarkerFiles(scene, seconds)
+		}
+	}
+
 	return sceneMarker, nil
 }
+
+func (r *mutationResolver) SceneIncrementO(ctx context.Context, id string) (int, error) {
+	sceneID, _ := strconv.Atoi(id)
+
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewSceneQueryBuilder()
+
+	newVal, err := qb.IncrementOCounter(sceneID, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return 0, err
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return 0, err
+	}
+
+	return newVal, nil
+}
+
+func (r *mutationResolver) SceneDecrementO(ctx context.Context, id string) (int, error) {
+	sceneID, _ := strconv.Atoi(id)
+
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewSceneQueryBuilder()
+
+	newVal, err := qb.DecrementOCounter(sceneID, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return 0, err
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return 0, err
+	}
+
+	return newVal, nil
+}
+
+func (r *mutationResolver) SceneResetO(ctx context.Context, id string) (int, error) {
+	sceneID, _ := strconv.Atoi(id)
+
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewSceneQueryBuilder()
+
+	newVal, err := qb.ResetOCounter(sceneID, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return 0, err
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return 0, err
+	}
+
+	return newVal, nil
+}
+
+func (r *mutationResolver) SceneGenerateScreenshot(ctx context.Context, id string, at *float64) (string, error) {
+	if at != nil {
+		manager.GetInstance().GenerateScreenshot(id, *at)
+	} else {
+		manager.GetInstance().GenerateDefaultScreenshot(id)
+	}
+
+	return "todo", nil
+}

pkg/api/resolver_query_configuration.go

@@ -12,12 +12,18 @@ func (r *queryResolver) Configuration(ctx context.Context) (*models.ConfigResult
 	return makeConfigResult(), nil
 }
 
-func (r *queryResolver) Directories(ctx context.Context, path *string) ([]string, error) {
+func (r *queryResolver) Directory(ctx context.Context, path *string) (*models.Directory, error) {
 	var dirPath = ""
 	if path != nil {
 		dirPath = *path
 	}
-	return utils.ListDir(dirPath), nil
+	currentDir := utils.GetDir(dirPath)
+
+	return &models.Directory{
+		Path:        currentDir,
+		Parent:      utils.GetParent(currentDir),
+		Directories: utils.ListDir(currentDir),
+	}, nil
 }
 
 func makeConfigResult() *models.ConfigResult {
@@ -33,38 +39,49 @@ func makeConfigGeneralResult() *models.ConfigGeneralResult {
 	maxTranscodeSize := config.GetMaxTranscodeSize()
 	maxStreamingTranscodeSize := config.GetMaxStreamingTranscodeSize()
 
+	scraperUserAgent := config.GetScraperUserAgent()
+
 	return &models.ConfigGeneralResult{
 		Stashes:                   config.GetStashPaths(),
 		DatabasePath:              config.GetDatabasePath(),
 		GeneratedPath:             config.GetGeneratedPath(),
+		CachePath:                 config.GetCachePath(),
 		MaxTranscodeSize:          &maxTranscodeSize,
 		MaxStreamingTranscodeSize: &maxStreamingTranscodeSize,
+		ForceMkv:                  config.GetForceMKV(),
+		ForceHevc:                 config.GetForceHEVC(),
 		Username:                  config.GetUsername(),
 		Password:                  config.GetPasswordHash(),
+		MaxSessionAge:             config.GetMaxSessionAge(),
 		LogFile:                   &logFile,
 		LogOut:                    config.GetLogOut(),
 		LogLevel:                  config.GetLogLevel(),
 		LogAccess:                 config.GetLogAccess(),
 		Excludes:                  config.GetExcludes(),
+		ScraperUserAgent:          &scraperUserAgent,
 	}
 }
 
 func makeConfigInterfaceResult() *models.ConfigInterfaceResult {
 	soundOnPreview := config.GetSoundOnPreview()
 	wallShowTitle := config.GetWallShowTitle()
+	wallPlayback := config.GetWallPlayback()
 	maximumLoopDuration := config.GetMaximumLoopDuration()
 	autostartVideo := config.GetAutostartVideo()
 	showStudioAsText := config.GetShowStudioAsText()
 	css := config.GetCSS()
 	cssEnabled := config.GetCSSEnabled()
+	language := config.GetLanguage()
 
 	return &models.ConfigInterfaceResult{
 		SoundOnPreview:      &soundOnPreview,
 		WallShowTitle:       &wallShowTitle,
+		WallPlayback:        &wallPlayback,
 		MaximumLoopDuration: &maximumLoopDuration,
 		AutostartVideo:      &autostartVideo,
 		ShowStudioAsText:    &showStudioAsText,
 		CSS:                 &css,
 		CSSEnabled:          &cssEnabled,
+		Language:            &language,
 	}
 }

pkg/api/resolver_query_find_movie.go

@@ -0,0 +1,33 @@
+package api
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *queryResolver) FindMovie(ctx context.Context, id string) (*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	idInt, _ := strconv.Atoi(id)
+	return qb.Find(idInt, nil)
+}
+
+func (r *queryResolver) FindMovies(ctx context.Context, movieFilter *models.MovieFilterType, filter *models.FindFilterType) (*models.FindMoviesResultType, error) {
+	qb := models.NewMovieQueryBuilder()
+	movies, total := qb.Query(movieFilter, filter)
+	return &models.FindMoviesResultType{
+		Count:  total,
+		Movies: movies,
+	}, nil
+}
+
+func (r *queryResolver) AllMovies(ctx context.Context) ([]*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	return qb.All()
+}
+
+func (r *queryResolver) AllMoviesSlim(ctx context.Context) ([]*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_performer.go

@@ -25,3 +25,8 @@ func (r *queryResolver) AllPerformers(ctx context.Context) ([]*models.Performer,
 	qb := models.NewPerformerQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllPerformersSlim(ctx context.Context) ([]*models.Performer, error) {
+	qb := models.NewPerformerQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_studio.go

@@ -25,3 +25,8 @@ func (r *queryResolver) AllStudios(ctx context.Context) ([]*models.Studio, error
 	qb := models.NewStudioQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllStudiosSlim(ctx context.Context) ([]*models.Studio, error) {
+	qb := models.NewStudioQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_tag.go

@@ -16,3 +16,8 @@ func (r *queryResolver) AllTags(ctx context.Context) ([]*models.Tag, error) {
 	qb := models.NewTagQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllTagsSlim(ctx context.Context) ([]*models.Tag, error) {
+	qb := models.NewTagQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_logs.go

@@ -20,4 +20,4 @@ func (r *queryResolver) Logs(ctx context.Context) ([]*models.LogEntry, error) {
 	}
 
 	return ret, nil
-}
+}

pkg/api/resolver_query_metadata.go

@@ -7,36 +7,6 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-func (r *queryResolver) MetadataScan(ctx context.Context, input models.ScanMetadataInput) (string, error) {
-	manager.GetInstance().Scan(input.UseFileMetadata)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataImport(ctx context.Context) (string, error) {
-	manager.GetInstance().Import()
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataExport(ctx context.Context) (string, error) {
-	manager.GetInstance().Export()
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataGenerate(ctx context.Context, input models.GenerateMetadataInput) (string, error) {
-	manager.GetInstance().Generate(input.Sprites, input.Previews, input.Markers, input.Transcodes)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataAutoTag(ctx context.Context, input models.AutoTagMetadataInput) (string, error) {
-	manager.GetInstance().AutoTag(input.Performers, input.Studios, input.Tags)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataClean(ctx context.Context) (string, error) {
-	manager.GetInstance().Clean()
-	return "todo", nil
-}
-
 func (r *queryResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateStatus, error) {
 	status := manager.GetInstance().Status
 	ret := models.MetadataUpdateStatus{
@@ -47,7 +17,3 @@ func (r *queryResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateSt
 
 	return &ret, nil
 }
-
-func (r *queryResolver) StopJob(ctx context.Context) (bool, error) {
-	return manager.GetInstance().Status.Stop(), nil
-}

pkg/api/routes_gallery.go

@@ -23,13 +23,24 @@ func (rs galleryRoutes) Routes() chi.Router {
 
 func (rs galleryRoutes) File(w http.ResponseWriter, r *http.Request) {
 	gallery := r.Context().Value(galleryKey).(*models.Gallery)
+	if gallery == nil {
+		http.Error(w, http.StatusText(404), 404)
+		return
+	}
 	fileIndex, _ := strconv.Atoi(chi.URLParam(r, "fileIndex"))
 	thumb := r.URL.Query().Get("thumb")
 	w.Header().Add("Cache-Control", "max-age=604800000") // 1 Week
 	if thumb == "true" {
-		_, _ = w.Write(gallery.GetThumbnail(fileIndex))
-	} else {
+		_, _ = w.Write(cacheGthumb(gallery, fileIndex, models.DefaultGthumbWidth))
+	} else if thumb == "" {
 		_, _ = w.Write(gallery.GetImage(fileIndex))
+	} else {
+		width, err := strconv.ParseInt(thumb, 0, 64)
+		if err != nil {
+			http.Error(w, http.StatusText(400), 400)
+			return
+		}
+		_, _ = w.Write(cacheGthumb(gallery, fileIndex, int(width)))
 	}
 }
 

pkg/api/routes_movie.go

@@ -0,0 +1,54 @@
+package api
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"github.com/go-chi/chi"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+type movieRoutes struct{}
+
+func (rs movieRoutes) Routes() chi.Router {
+	r := chi.NewRouter()
+
+	r.Route("/{movieId}", func(r chi.Router) {
+		r.Use(MovieCtx)
+		r.Get("/frontimage", rs.FrontImage)
+		r.Get("/backimage", rs.BackImage)
+	})
+
+	return r
+}
+
+func (rs movieRoutes) FrontImage(w http.ResponseWriter, r *http.Request) {
+	movie := r.Context().Value(movieKey).(*models.Movie)
+	_, _ = w.Write(movie.FrontImage)
+}
+
+func (rs movieRoutes) BackImage(w http.ResponseWriter, r *http.Request) {
+	movie := r.Context().Value(movieKey).(*models.Movie)
+	_, _ = w.Write(movie.BackImage)
+}
+
+func MovieCtx(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		movieID, err := strconv.Atoi(chi.URLParam(r, "movieId"))
+		if err != nil {
+			http.Error(w, http.StatusText(404), 404)
+			return
+		}
+
+		qb := models.NewMovieQueryBuilder()
+		movie, err := qb.Find(movieID, nil)
+		if err != nil {
+			http.Error(w, http.StatusText(404), 404)
+			return
+		}
+
+		ctx := context.WithValue(r.Context(), movieKey, movie)
+		next.ServeHTTP(w, r.WithContext(ctx))
+	})
+}

pkg/api/routes_performer.go

@@ -2,10 +2,13 @@ package api
 
 import (
 	"context"
+	"crypto/md5"
+	"fmt"
 	"github.com/go-chi/chi"
 	"github.com/stashapp/stash/pkg/models"
 	"net/http"
 	"strconv"
+	"strings"
 )
 
 type performerRoutes struct{}
@@ -23,6 +26,16 @@ func (rs performerRoutes) Routes() chi.Router {
 
 func (rs performerRoutes) Image(w http.ResponseWriter, r *http.Request) {
 	performer := r.Context().Value(performerKey).(*models.Performer)
+	etag := fmt.Sprintf("%x", md5.Sum(performer.Image))
+
+	if match := r.Header.Get("If-None-Match"); match != "" {
+		if strings.Contains(match, etag) {
+			w.WriteHeader(http.StatusNotModified)
+			return
+		}
+	}
+
+	w.Header().Add("Etag", etag)
 	_, _ = w.Write(performer.Image)
 }
 

pkg/api/routes_scene.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"io"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 
@@ -42,13 +43,32 @@ func (rs sceneRoutes) Routes() chi.Router {
 // region Handlers
 
 func (rs sceneRoutes) Stream(w http.ResponseWriter, r *http.Request) {
+
 	scene := r.Context().Value(sceneKey).(*models.Scene)
 
+	container := ""
+	if scene.Format.Valid {
+		container = scene.Format.String
+	} else { // container isn't in the DB
+		// shouldn't happen, fallback to ffprobe
+		tmpVideoFile, err := ffmpeg.NewVideoFile(manager.GetInstance().FFProbePath, scene.Path)
+		if err != nil {
+			logger.Errorf("[transcode] error reading video file: %s", err.Error())
+			return
+		}
+
+		container = string(ffmpeg.MatchContainer(tmpVideoFile.Container, scene.Path))
+	}
+
 	// detect if not a streamable file and try to transcode it instead
 	filepath := manager.GetInstance().Paths.Scene.GetStreamPath(scene.Path, scene.Checksum)
 	videoCodec := scene.VideoCodec.String
+	audioCodec := ffmpeg.MissingUnsupported
+	if scene.AudioCodec.Valid {
+		audioCodec = ffmpeg.AudioCodec(scene.AudioCodec.String)
+	}
 	hasTranscode, _ := manager.HasTranscode(scene)
-	if ffmpeg.IsValidCodec(videoCodec) || hasTranscode {
+	if ffmpeg.IsValidCodec(videoCodec) && ffmpeg.IsValidCombo(videoCodec, ffmpeg.Container(container)) && ffmpeg.IsValidAudioForContainer(audioCodec, ffmpeg.Container(container)) || hasTranscode {
 		manager.RegisterStream(filepath, &w)
 		http.ServeFile(w, r, filepath)
 		manager.WaitAndDeregisterStream(filepath, &w, r)
@@ -69,16 +89,50 @@ func (rs sceneRoutes) Stream(w http.ResponseWriter, r *http.Request) {
 
 	encoder := ffmpeg.NewEncoder(manager.GetInstance().FFMPEGPath)
 
-	stream, process, err := encoder.StreamTranscode(*videoFile, startTime, config.GetMaxStreamingTranscodeSize())
+	var stream io.ReadCloser
+	var process *os.Process
+	mimeType := ffmpeg.MimeWebm
+
+	if audioCodec == ffmpeg.MissingUnsupported {
+		//ffmpeg fails if it trys to transcode a non supported audio codec
+		stream, process, err = encoder.StreamTranscodeVideo(*videoFile, startTime, config.GetMaxStreamingTranscodeSize())
+	} else {
+		copyVideo := false // try to be smart if the video to be transcoded is in a Matroska container
+		//  mp4 has always supported audio so it doesn't need to be checked
+		//  while mpeg_ts has seeking issues if we don't reencode the video
+
+		if config.GetForceMKV() { // If MKV is forced as supported and video codec is also supported then only transcode audio
+			if ffmpeg.Container(container) == ffmpeg.Matroska {
+				switch videoCodec {
+				case ffmpeg.H264, ffmpeg.Vp9, ffmpeg.Vp8:
+					copyVideo = true
+				case ffmpeg.Hevc:
+					if config.GetForceHEVC() {
+						copyVideo = true
+					}
+
+				}
+			}
+		}
+
+		if copyVideo { // copy video stream instead of transcoding it
+			stream, process, err = encoder.StreamMkvTranscodeAudio(*videoFile, startTime, config.GetMaxStreamingTranscodeSize())
+			mimeType = ffmpeg.MimeMkv
+
+		} else {
+			stream, process, err = encoder.StreamTranscode(*videoFile, startTime, config.GetMaxStreamingTranscodeSize())
+		}
+	}
+
 	if err != nil {
 		logger.Errorf("[stream] error transcoding video file: %s", err.Error())
 		return
 	}
 
 	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "video/webm")
+	w.Header().Set("Content-Type", mimeType)
 
-	logger.Info("[stream] transcoding video file")
+	logger.Infof("[stream] transcoding video file to %s", mimeType)
 
 	// handle if client closes the connection
 	notify := r.Context().Done()

pkg/api/routes_studio.go

@@ -2,10 +2,13 @@ package api
 
 import (
 	"context"
+	"crypto/md5"
+	"fmt"
 	"github.com/go-chi/chi"
 	"github.com/stashapp/stash/pkg/models"
 	"net/http"
 	"strconv"
+	"strings"
 )
 
 type studioRoutes struct{}
@@ -23,6 +26,21 @@ func (rs studioRoutes) Routes() chi.Router {
 
 func (rs studioRoutes) Image(w http.ResponseWriter, r *http.Request) {
 	studio := r.Context().Value(studioKey).(*models.Studio)
+	etag := fmt.Sprintf("%x", md5.Sum(studio.Image))
+	if match := r.Header.Get("If-None-Match"); match != "" {
+		if strings.Contains(match, etag) {
+			w.WriteHeader(http.StatusNotModified)
+			return
+		}
+	}
+
+	contentType := http.DetectContentType(studio.Image)
+	if contentType == "text/xml; charset=utf-8" || contentType == "text/plain; charset=utf-8" {
+		contentType = "image/svg+xml"
+	}
+
+	w.Header().Set("Content-Type", contentType)
+	w.Header().Add("Etag", etag)
 	_, _ = w.Write(studio.Image)
 }
 

pkg/api/server.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"os"
 	"path"
 	"path/filepath"
@@ -20,6 +21,7 @@ import (
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gorilla/websocket"
 	"github.com/rs/cors"
+	"github.com/stashapp/stash/pkg/database"
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/manager"
 	"github.com/stashapp/stash/pkg/manager/config"
@@ -28,46 +30,81 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
-var version string = ""
-var buildstamp string = ""
-var githash string = ""
+var version string
+var buildstamp string
+var githash string
 
 var uiBox *packr.Box
 
 //var legacyUiBox *packr.Box
 var setupUIBox *packr.Box
+var loginUIBox *packr.Box
+
+func allowUnauthenticated(r *http.Request) bool {
+	return strings.HasPrefix(r.URL.Path, "/login") || r.URL.Path == "/css"
+}
 
 func authenticateHandler() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			// only do this if credentials have been configured
-			if !config.HasCredentials() {
-				next.ServeHTTP(w, r)
+			ctx := r.Context()
+
+			// translate api key into current user, if present
+			userID := ""
+			var err error
+
+			// handle session
+			userID, err = getSessionUserID(w, r)
+
+			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				w.Write([]byte(err.Error()))
 				return
 			}
 
-			authUser, authPW, ok := r.BasicAuth()
+			// handle redirect if no user and user is required
+			if userID == "" && config.HasCredentials() && !allowUnauthenticated(r) {
+				// always allow
 
-			if !ok || !config.ValidateCredentials(authUser, authPW) {
-				unauthorized(w)
+				// if we don't have a userID, then redirect
+				// if graphql was requested, we just return a forbidden error
+				if r.URL.Path == "/graphql" {
+					w.Header().Add("WWW-Authenticate", `FormBased`)
+					w.WriteHeader(http.StatusUnauthorized)
+					return
+				}
+
+				// otherwise redirect to the login page
+				u := url.URL{
+					Path: "/login",
+				}
+				q := u.Query()
+				q.Set(returnURLParam, r.URL.Path)
+				u.RawQuery = q.Encode()
+				http.Redirect(w, r, u.String(), http.StatusFound)
 				return
 			}
 
+			ctx = context.WithValue(ctx, ContextUser, userID)
+
+			r = r.WithContext(ctx)
+
 			next.ServeHTTP(w, r)
 		})
 	}
 }
 
-func unauthorized(w http.ResponseWriter) {
-	w.Header().Add("WWW-Authenticate", `Basic realm=\"Stash\"`)
-	w.WriteHeader(http.StatusUnauthorized)
-}
+const setupEndPoint = "/setup"
+const migrateEndPoint = "/migrate"
+const loginEndPoint = "/login"
 
 func Start() {
-	uiBox = packr.New("UI Box", "../../ui/v2/build")
+	uiBox = packr.New("UI Box", "../../ui/v2.5/build")
 	//legacyUiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend")
 	setupUIBox = packr.New("Setup UI Box", "../../ui/setup")
+	loginUIBox = packr.New("Login UI Box", "../../ui/login")
 
+	initSessionStore()
 	initialiseImages()
 
 	r := chi.NewRouter()
@@ -83,6 +120,7 @@ func Start() {
 	r.Use(cors.AllowAll().Handler)
 	r.Use(BaseURLMiddleware)
 	r.Use(ConfigCheckMiddleware)
+	r.Use(DatabaseCheckMiddleware)
 
 	recoverFunc := handler.RecoverFunc(func(ctx context.Context, err interface{}) error {
 		logger.Error(err)
@@ -105,12 +143,20 @@ func Start() {
 	r.Handle("/graphql", gqlHandler)
 	r.Handle("/playground", handler.Playground("GraphQL playground", "/graphql"))
 
+	// session handlers
+	r.Post(loginEndPoint, handleLogin)
+	r.Get("/logout", handleLogout)
+
+	r.Get(loginEndPoint, getLoginHandler)
+
 	r.Mount("/gallery", galleryRoutes{}.Routes())
 	r.Mount("/performer", performerRoutes{}.Routes())
 	r.Mount("/scene", sceneRoutes{}.Routes())
 	r.Mount("/studio", studioRoutes{}.Routes())
+	r.Mount("/movie", movieRoutes{}.Routes())
 
 	r.HandleFunc("/css", func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/css")
 		if !config.GetCSSEnabled() {
 			return
 		}
@@ -125,6 +171,10 @@ func Start() {
 		http.ServeFile(w, r, fn)
 	})
 
+	// Serve the migration UI
+	r.Get("/migrate", getMigrateHandler)
+	r.Post("/migrate", doMigrateHandler)
+
 	// Serve the setup UI
 	r.HandleFunc("/setup*", func(w http.ResponseWriter, r *http.Request) {
 		ext := path.Ext(r.URL.Path)
@@ -136,6 +186,16 @@ func Start() {
 			http.FileServer(setupUIBox).ServeHTTP(w, r)
 		}
 	})
+	r.HandleFunc("/login*", func(w http.ResponseWriter, r *http.Request) {
+		ext := path.Ext(r.URL.Path)
+		if ext == ".html" || ext == "" {
+			data, _ := loginUIBox.Find("login.html")
+			_, _ = w.Write(data)
+		} else {
+			r.URL.Path = strings.Replace(r.URL.Path, loginEndPoint, "", 1)
+			http.FileServer(loginUIBox).ServeHTTP(w, r)
+		}
+	})
 	r.Post("/init", func(w http.ResponseWriter, r *http.Request) {
 		err := r.ParseForm()
 		if err != nil {
@@ -174,7 +234,8 @@ func Start() {
 
 		_ = os.Mkdir(downloads, 0755)
 
-		config.Set(config.Stash, stash)
+		// #536 - set stash as slice of strings
+		config.Set(config.Stash, []string{stash})
 		config.Set(config.Generated, generated)
 		config.Set(config.Metadata, metadata)
 		config.Set(config.Cache, cache)
@@ -189,6 +250,7 @@ func Start() {
 		http.Redirect(w, r, "/", 301)
 	})
 
+	startThumbCache()
 	// Serve the web app
 	r.HandleFunc("/*", func(w http.ResponseWriter, r *http.Request) {
 		ext := path.Ext(r.URL.Path)
@@ -196,6 +258,10 @@ func Start() {
 			data, _ := uiBox.Find("index.html")
 			_, _ = w.Write(data)
 		} else {
+			isStatic, _ := path.Match("/static/*/*", r.URL.Path)
+			if isStatic {
+				w.Header().Add("Cache-Control", "max-age=604800000")
+			}
 			http.FileServer(uiBox).ServeHTTP(w, r)
 		}
 	})
@@ -216,6 +282,7 @@ func Start() {
 
 		go func() {
 			printVersion()
+			printLatestVersion()
 			logger.Infof("stash is listening on " + address)
 			logger.Infof("stash is running at https://" + displayAddress + "/")
 			logger.Fatal(httpsServer.ListenAndServeTLS("", ""))
@@ -228,6 +295,7 @@ func Start() {
 
 		go func() {
 			printVersion()
+			printLatestVersion()
 			logger.Infof("stash is listening on " + address)
 			logger.Infof("stash is running at http://" + displayAddress + "/")
 			logger.Fatal(server.ListenAndServe())
@@ -290,6 +358,11 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
 		}
 		baseURL := scheme + "://" + r.Host
 
+		externalHost := config.GetExternalHost()
+		if externalHost != "" {
+			baseURL = externalHost
+		}
+
 		r = r.WithContext(context.WithValue(ctx, BaseURLCtxKey, baseURL))
 
 		next.ServeHTTP(w, r)
@@ -300,10 +373,27 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
 func ConfigCheckMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ext := path.Ext(r.URL.Path)
-		shouldRedirect := ext == "" && r.Method == "GET" && r.URL.Path != "/init"
+		shouldRedirect := ext == "" && r.Method == "GET"
 		if !config.IsValid() && shouldRedirect {
-			if !strings.HasPrefix(r.URL.Path, "/setup") {
-				http.Redirect(w, r, "/setup", 301)
+			// #539 - don't redirect if loading login page
+			if !strings.HasPrefix(r.URL.Path, setupEndPoint) && !strings.HasPrefix(r.URL.Path, loginEndPoint) {
+				http.Redirect(w, r, setupEndPoint, 301)
+				return
+			}
+		}
+		next.ServeHTTP(w, r)
+	})
+}
+
+func DatabaseCheckMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ext := path.Ext(r.URL.Path)
+		shouldRedirect := ext == "" && r.Method == "GET"
+		if shouldRedirect && database.NeedsMigration() {
+			// #451 - don't redirect if loading login page
+			// #539 - or setup page
+			if !strings.HasPrefix(r.URL.Path, migrateEndPoint) && !strings.HasPrefix(r.URL.Path, loginEndPoint) && !strings.HasPrefix(r.URL.Path, setupEndPoint) {
+				http.Redirect(w, r, migrateEndPoint, 301)
 				return
 			}
 		}

pkg/api/session.go

@@ -0,0 +1,127 @@
+package api
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+
+	"github.com/stashapp/stash/pkg/manager/config"
+
+	"github.com/gorilla/sessions"
+)
+
+const cookieName = "session"
+const usernameFormKey = "username"
+const passwordFormKey = "password"
+const userIDKey = "userID"
+
+const returnURLParam = "returnURL"
+
+var sessionStore = sessions.NewCookieStore(config.GetSessionStoreKey())
+
+type loginTemplateData struct {
+	URL   string
+	Error string
+}
+
+func initSessionStore() {
+	sessionStore.MaxAge(config.GetMaxSessionAge())
+}
+
+func redirectToLogin(w http.ResponseWriter, returnURL string, loginError string) {
+	data, _ := loginUIBox.Find("login.html")
+	templ, err := template.New("Login").Parse(string(data))
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), http.StatusInternalServerError)
+		return
+	}
+
+	err = templ.Execute(w, loginTemplateData{URL: returnURL, Error: loginError})
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), http.StatusInternalServerError)
+	}
+}
+
+func getLoginHandler(w http.ResponseWriter, r *http.Request) {
+	if !config.HasCredentials() {
+		http.Redirect(w, r, "/", http.StatusFound)
+		return
+	}
+
+	redirectToLogin(w, r.URL.Query().Get(returnURLParam), "")
+}
+
+func handleLogin(w http.ResponseWriter, r *http.Request) {
+	url := r.FormValue(returnURLParam)
+	if url == "" {
+		url = "/"
+	}
+
+	// ignore error - we want a new session regardless
+	newSession, _ := sessionStore.Get(r, cookieName)
+
+	username := r.FormValue("username")
+	password := r.FormValue("password")
+
+	// authenticate the user
+	if !config.ValidateCredentials(username, password) {
+		// redirect back to the login page with an error
+		redirectToLogin(w, url, "Username or password is invalid")
+		return
+	}
+
+	newSession.Values[userIDKey] = username
+
+	err := newSession.Save(r, w)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, url, http.StatusFound)
+}
+
+func handleLogout(w http.ResponseWriter, r *http.Request) {
+	session, err := sessionStore.Get(r, cookieName)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	delete(session.Values, userIDKey)
+	session.Options.MaxAge = -1
+
+	err = session.Save(r, w)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// redirect to the login page if credentials are required
+	getLoginHandler(w, r)
+}
+
+func getSessionUserID(w http.ResponseWriter, r *http.Request) (string, error) {
+	session, err := sessionStore.Get(r, cookieName)
+	// ignore errors and treat as an empty user id, so that we handle expired
+	// cookie
+	if err != nil {
+		return "", nil
+	}
+
+	if !session.IsNew {
+		val := session.Values[userIDKey]
+
+		// refresh the cookie
+		err = session.Save(r, w)
+		if err != nil {
+			return "", err
+		}
+
+		ret, _ := val.(string)
+
+		return ret, nil
+	}
+
+	return "", nil
+}

pkg/api/urlbuilders/movie.go

@@ -0,0 +1,24 @@
+package urlbuilders
+
+import "strconv"
+
+type MovieURLBuilder struct {
+	BaseURL  string
+	MovieID string
+}
+
+func NewMovieURLBuilder(baseURL string, movieID int) MovieURLBuilder {
+	return MovieURLBuilder{
+		BaseURL:  baseURL,
+		MovieID: strconv.Itoa(movieID),
+	}
+}
+
+func (b MovieURLBuilder) GetMovieFrontImageURL() string {
+	return b.BaseURL + "/movie/" + b.MovieID + "/frontimage"
+}
+
+func (b MovieURLBuilder) GetMovieBackImageURL() string {
+	return b.BaseURL + "/movie/" + b.MovieID + "/backimage"
+}
+

pkg/database/database.go

@@ -5,10 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"regexp"
+	"time"
 
 	"github.com/gobuffalo/packr/v2"
 	"github.com/golang-migrate/migrate/v4"
+	sqlite3mig "github.com/golang-migrate/migrate/v4/database/sqlite3"
 	"github.com/golang-migrate/migrate/v4/source"
 	"github.com/jmoiron/sqlx"
 	sqlite3 "github.com/mattn/go-sqlite3"
@@ -17,26 +18,62 @@ import (
 )
 
 var DB *sqlx.DB
-var appSchemaVersion uint = 2
+var dbPath string
+var appSchemaVersion uint = 8
+var databaseSchemaVersion uint
 
-const sqlite3Driver = "sqlite3_regexp"
+const sqlite3Driver = "sqlite3ex"
 
 func init() {
 	// register custom driver with regexp function
-	registerRegexpFunc()
+	registerCustomDriver()
 }
 
 func Initialize(databasePath string) {
-	runMigrations(databasePath)
+	dbPath = databasePath
 
+	if err := getDatabaseSchemaVersion(); err != nil {
+		panic(err)
+	}
+
+	if databaseSchemaVersion == 0 {
+		// new database, just run the migrations
+		if err := RunMigrations(); err != nil {
+			panic(err)
+		}
+		// RunMigrations calls Initialise. Just return
+		return
+	} else {
+		if databaseSchemaVersion > appSchemaVersion {
+			panic(fmt.Sprintf("Database schema version %d is incompatible with required schema version %d", databaseSchemaVersion, appSchemaVersion))
+		}
+
+		// if migration is needed, then don't open the connection
+		if NeedsMigration() {
+			logger.Warnf("Database schema version %d does not match required schema version %d.", databaseSchemaVersion, appSchemaVersion)
+			return
+		}
+	}
+
+	const disableForeignKeys = false
+	DB = open(databasePath, disableForeignKeys)
+}
+
+func open(databasePath string, disableForeignKeys bool) *sqlx.DB {
 	// https://github.com/mattn/go-sqlite3
-	conn, err := sqlx.Open(sqlite3Driver, "file:"+databasePath+"?_fk=true")
+	url := "file:" + databasePath
+	if !disableForeignKeys {
+		url += "?_fk=true"
+	}
+
+	conn, err := sqlx.Open(sqlite3Driver, url)
 	conn.SetMaxOpenConns(25)
 	conn.SetMaxIdleConns(4)
 	if err != nil {
 		logger.Fatalf("db.Open(): %q\n", err)
 	}
-	DB = conn
+
+	return conn
 }
 
 func Reset(databasePath string) error {
@@ -55,45 +92,123 @@ func Reset(databasePath string) error {
 	return nil
 }
 
+// Backup the database
+func Backup(backupPath string) error {
+	db, err := sqlx.Connect(sqlite3Driver, "file:"+dbPath+"?_fk=true")
+	if err != nil {
+		return fmt.Errorf("Open database %s failed:%s", dbPath, err)
+	}
+	defer db.Close()
+
+	_, err = db.Exec(`VACUUM INTO "` + backupPath + `"`)
+	if err != nil {
+		return fmt.Errorf("Vacuum failed: %s", err)
+	}
+
+	return nil
+}
+
+func RestoreFromBackup(backupPath string) error {
+	return os.Rename(backupPath, dbPath)
+}
+
 // Migrate the database
-func runMigrations(databasePath string) {
+func NeedsMigration() bool {
+	return databaseSchemaVersion != appSchemaVersion
+}
+
+func AppSchemaVersion() uint {
+	return appSchemaVersion
+}
+
+func DatabaseBackupPath() string {
+	return fmt.Sprintf("%s.%d.%s", dbPath, databaseSchemaVersion, time.Now().Format("20060102_150405"))
+}
+
+func Version() uint {
+	return databaseSchemaVersion
+}
+
+func getMigrate() (*migrate.Migrate, error) {
 	migrationsBox := packr.New("Migrations Box", "./migrations")
 	packrSource := &Packr2Source{
 		Box:        migrationsBox,
 		Migrations: source.NewMigrations(),
 	}
 
-	databasePath = utils.FixWindowsPath(databasePath)
+	databasePath := utils.FixWindowsPath(dbPath)
 	s, _ := WithInstance(packrSource)
-	m, err := migrate.NewWithSourceInstance(
+
+	const disableForeignKeys = true
+	conn := open(databasePath, disableForeignKeys)
+
+	driver, err := sqlite3mig.WithInstance(conn.DB, &sqlite3mig.Config{})
+	if err != nil {
+		return nil, err
+	}
+
+	// use sqlite3Driver so that migration has access to durationToTinyInt
+	return migrate.NewWithInstance(
 		"packr2",
 		s,
-		fmt.Sprintf("sqlite3://%s", "file:"+databasePath),
+		databasePath,
+		driver,
 	)
+}
+
+func getDatabaseSchemaVersion() error {
+	m, err := getMigrate()
+	if err != nil {
+		return err
+	}
+
+	databaseSchemaVersion, _, _ = m.Version()
+	m.Close()
+	return nil
+}
+
+// Migrate the database
+func RunMigrations() error {
+	m, err := getMigrate()
 	if err != nil {
 		panic(err.Error())
 	}
 
-	databaseSchemaVersion, _, _ := m.Version()
+	databaseSchemaVersion, _, _ = m.Version()
 	stepNumber := appSchemaVersion - databaseSchemaVersion
 	if stepNumber != 0 {
 		err = m.Steps(int(stepNumber))
 		if err != nil {
-			panic(err.Error())
+			// migration failed
+			m.Close()
+			return err
 		}
 	}
 	m.Close()
+
+	// re-initialise the database
+	Initialize(dbPath)
+
+	return nil
 }
 
-func registerRegexpFunc() {
-	regexFn := func(re, s string) (bool, error) {
-		return regexp.MatchString(re, s)
-	}
-
+func registerCustomDriver() {
 	sql.Register(sqlite3Driver,
 		&sqlite3.SQLiteDriver{
 			ConnectHook: func(conn *sqlite3.SQLiteConn) error {
-				return conn.RegisterFunc("regexp", regexFn, true)
+				funcs := map[string]interface{}{
+					"regexp":            regexFn,
+					"durationToTinyInt": durationToTinyIntFn,
+				}
+
+				for name, fn := range funcs {
+					if err := conn.RegisterFunc(name, fn, true); err != nil {
+						return fmt.Errorf("Error registering function %s: %s", name, err.Error())
+					}
+				}
+
+				return nil
 			},
-		})
+		},
+	)
 }

pkg/database/functions.go

@@ -0,0 +1,37 @@
+package database
+
+import (
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+func regexFn(re, s string) (bool, error) {
+	return regexp.MatchString(re, s)
+}
+
+func durationToTinyIntFn(str string) (int64, error) {
+	splits := strings.Split(str, ":")
+
+	if len(splits) > 3 {
+		return 0, nil
+	}
+
+	seconds := 0
+	factor := 1
+	for len(splits) > 0 {
+		// pop the last split
+		var thisSplit string
+		thisSplit, splits = splits[len(splits)-1], splits[:len(splits)-1]
+
+		thisInt, err := strconv.Atoi(thisSplit)
+		if err != nil {
+			return 0, nil
+		}
+
+		seconds += factor * thisInt
+		factor *= 60
+	}
+
+	return int64(seconds), nil
+}

pkg/database/migrations/3_o_counter.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `scenes` ADD COLUMN `o_counter` tinyint not null default 0;

pkg/database/migrations/4_movie.up.sql

@@ -0,0 +1,32 @@
+CREATE TABLE `movies` (
+  `id` integer not null primary key autoincrement,
+  `name` varchar(255),
+  `aliases` varchar(255),
+  `duration` varchar(6),
+  `date` date,
+  `rating` varchar(1),
+  `director` varchar(255),
+  `synopsis` text,
+  `front_image` blob not null,
+  `back_image` blob,
+  `checksum` varchar(255) not null,
+  `url` varchar(255),
+  `created_at` datetime not null,
+  `updated_at` datetime not null
+);
+CREATE TABLE `movies_scenes` (
+  `movie_id` integer,
+  `scene_id` integer,
+  `scene_index` varchar(2),
+  foreign key(`movie_id`) references `movies`(`id`),
+  foreign key(`scene_id`) references `scenes`(`id`)
+);
+
+
+ALTER TABLE `scraped_items` ADD COLUMN `movie_id` integer;
+CREATE UNIQUE INDEX `movies_checksum_unique` on `movies` (`checksum`);
+CREATE UNIQUE INDEX `index_movie_id_scene_index_unique` ON `movies_scenes` ( `movie_id`, `scene_index` );
+CREATE INDEX `index_movies_scenes_on_movie_id` on `movies_scenes` (`movie_id`);
+CREATE INDEX `index_movies_scenes_on_scene_id` on `movies_scenes` (`scene_id`);
+
+

pkg/database/migrations/5_performer_gender.down.sql

@@ -0,0 +1,89 @@
+
+PRAGMA foreign_keys=off;
+
+-- need to re-create the performers table without the added column.
+-- also need re-create the performers_scenes table due to the foreign key
+
+-- rename existing performers table
+ALTER TABLE `performers` RENAME TO `performers_old`;
+ALTER TABLE `performers_scenes` RENAME TO `performers_scenes_old`;
+
+-- drop the indexes
+DROP INDEX IF EXISTS `index_performers_on_name`;
+DROP INDEX IF EXISTS `index_performers_on_checksum`;
+DROP INDEX IF EXISTS `index_performers_scenes_on_scene_id`;
+DROP INDEX IF EXISTS `index_performers_scenes_on_performer_id`;
+
+-- recreate the tables
+CREATE TABLE `performers` (
+  `id` integer not null primary key autoincrement,
+  `image` blob not null,
+  `checksum` varchar(255) not null,
+  `name` varchar(255),
+  `url` varchar(255),
+  `twitter` varchar(255),
+  `instagram` varchar(255),
+  `birthdate` date,
+  `ethnicity` varchar(255),
+  `country` varchar(255),
+  `eye_color` varchar(255),
+  `height` varchar(255),
+  `measurements` varchar(255),
+  `fake_tits` varchar(255),
+  `career_length` varchar(255),
+  `tattoos` varchar(255),
+  `piercings` varchar(255),
+  `aliases` varchar(255),
+  `favorite` boolean not null default '0',
+  `created_at` datetime not null,
+  `updated_at` datetime not null
+);
+
+CREATE TABLE `performers_scenes` (
+  `performer_id` integer,
+  `scene_id` integer,
+  foreign key(`performer_id`) references `performers`(`id`),
+  foreign key(`scene_id`) references `scenes`(`id`)
+);
+
+INSERT INTO `performers` 
+  SELECT 
+  `id`,
+  `image`,
+  `checksum`,
+  `name`,
+  `url`,
+  `twitter`,
+  `instagram`,
+  `birthdate`,
+  `ethnicity`,
+  `country`,
+  `eye_color`,
+  `height`,
+  `measurements`,
+  `fake_tits`,
+  `career_length`,
+  `tattoos`,
+  `piercings`,
+  `aliases`,
+  `favorite`,
+  `created_at`,
+  `updated_at`
+  FROM `performers_old`;
+
+INSERT INTO `performers_scenes`
+  SELECT
+  `performer_id`,
+  `scene_id`
+  FROM `performers_scenes_old`;
+
+DROP TABLE `performers_scenes_old`;
+DROP TABLE `performers_old`;
+
+-- re-create the indexes after removing the old tables
+CREATE INDEX `index_performers_on_name` on `performers` (`name`);
+CREATE INDEX `index_performers_on_checksum` on `performers` (`checksum`);
+CREATE INDEX `index_performers_scenes_on_scene_id` on `performers_scenes` (`scene_id`);
+CREATE INDEX `index_performers_scenes_on_performer_id` on `performers_scenes` (`performer_id`);
+
+PRAGMA foreign_keys=on;

pkg/database/migrations/5_performer_gender.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `performers` ADD COLUMN `gender` varchar(20);

pkg/database/migrations/6_scenes_format.up.sql

@@ -0,0 +1 @@
+ALTER TABLE `scenes` ADD COLUMN `format` varchar(255);

pkg/database/migrations/7_performer_optimization.up.sql

@@ -0,0 +1,101 @@
+DROP INDEX `performers_checksum_unique`;
+DROP INDEX `index_performers_on_name`;
+DROP INDEX `index_performers_on_checksum`;
+ALTER TABLE `performers` RENAME TO `temp_old_performers`;
+CREATE TABLE `performers` (
+  `id` integer not null primary key autoincrement,
+  `checksum` varchar(255) not null,
+  `name` varchar(255),
+  `gender` varchar(20),
+  `url` varchar(255),
+  `twitter` varchar(255),
+  `instagram` varchar(255),
+  `birthdate` date,
+  `ethnicity` varchar(255),
+  `country` varchar(255),
+  `eye_color` varchar(255),
+  `height` varchar(255),
+  `measurements` varchar(255),
+  `fake_tits` varchar(255),
+  `career_length` varchar(255),
+  `tattoos` varchar(255),
+  `piercings` varchar(255),
+  `aliases` varchar(255),
+  `favorite` boolean not null default '0',
+  `created_at` datetime not null,
+  `updated_at` datetime not null,
+  `image` blob not null
+);
+CREATE UNIQUE INDEX `performers_checksum_unique` on `performers` (`checksum`);
+CREATE INDEX `index_performers_on_name` on `performers` (`name`);
+INSERT INTO `performers` (
+  `id`,
+  `checksum`,
+  `name`,
+  `gender`,
+  `url`,
+  `twitter`,
+  `instagram`,
+  `birthdate`,
+  `ethnicity`,
+  `country`,
+  `eye_color`,
+  `height`,
+  `measurements`,
+  `fake_tits`,
+  `career_length`,
+  `tattoos`,
+  `piercings`,
+  `aliases`,
+  `favorite`,
+  `created_at`,
+  `updated_at`,
+  `image`
+)
+SELECT 
+  `id`,
+  `checksum`,
+  `name`,
+  `gender`,
+  `url`,
+  `twitter`,
+  `instagram`,
+  `birthdate`,
+  `ethnicity`,
+  `country`,
+  `eye_color`,
+  `height`,
+  `measurements`,
+  `fake_tits`,
+  `career_length`,
+  `tattoos`,
+  `piercings`,
+  `aliases`,
+  `favorite`,
+  `created_at`,
+  `updated_at`,
+  `image`
+FROM `temp_old_performers`;
+
+DROP INDEX `index_performers_scenes_on_scene_id`;
+DROP INDEX `index_performers_scenes_on_performer_id`;
+ALTER TABLE performers_scenes RENAME TO temp_old_performers_scenes;
+CREATE TABLE `performers_scenes` (
+  `performer_id` integer,
+  `scene_id` integer,
+  foreign key(`performer_id`) references `performers`(`id`),
+  foreign key(`scene_id`) references `scenes`(`id`)
+);
+CREATE INDEX `index_performers_scenes_on_scene_id` on `performers_scenes` (`scene_id`);
+CREATE INDEX `index_performers_scenes_on_performer_id` on `performers_scenes` (`performer_id`);
+INSERT INTO `performers_scenes` (
+  `performer_id`,
+  `scene_id`
+)
+SELECT 
+  `performer_id`,
+  `scene_id`
+FROM `temp_old_performers_scenes`;
+
+DROP TABLE `temp_old_performers`;
+DROP TABLE `temp_old_performers_scenes`;

pkg/database/migrations/8_movie_fix.up.sql

@@ -0,0 +1,106 @@
+ALTER TABLE `movies` rename to `_movies_old`;
+ALTER TABLE `movies_scenes` rename to `_movies_scenes_old`;
+
+DROP INDEX IF EXISTS `movies_checksum_unique`;
+DROP INDEX IF EXISTS `index_movie_id_scene_index_unique`;
+DROP INDEX IF EXISTS `index_movies_scenes_on_movie_id`;
+DROP INDEX IF EXISTS `index_movies_scenes_on_scene_id`;
+
+-- recreate the movies table with fixed column types and constraints
+CREATE TABLE `movies` (
+  `id` integer not null primary key autoincrement,
+  -- add not null
+  `name` varchar(255) not null,
+  `aliases` varchar(255),
+  -- varchar(6) -> integer
+  `duration` integer,
+  `date` date,
+  -- varchar(1) -> tinyint
+  `rating` tinyint,
+  `studio_id` integer,
+  `director` varchar(255),
+  `synopsis` text,
+  `checksum` varchar(255) not null,
+  `url` varchar(255),
+  `created_at` datetime not null,
+  `updated_at` datetime not null,
+  `front_image` blob not null,
+  `back_image` blob,
+  foreign key(`studio_id`) references `studios`(`id`) on delete set null
+);
+CREATE TABLE `movies_scenes` (
+  `movie_id` integer,
+  `scene_id` integer,
+  -- varchar(2) -> tinyint
+  `scene_index` tinyint,
+  foreign key(`movie_id`) references `movies`(`id`) on delete cascade,
+  foreign key(`scene_id`) references `scenes`(`id`) on delete cascade
+);
+
+-- add unique index on movie name
+CREATE UNIQUE INDEX `movies_name_unique` on `movies` (`name`);
+CREATE UNIQUE INDEX `movies_checksum_unique` on `movies` (`checksum`);
+-- remove unique index on movies_scenes
+CREATE INDEX `index_movies_scenes_on_movie_id` on `movies_scenes` (`movie_id`);
+CREATE INDEX `index_movies_scenes_on_scene_id` on `movies_scenes` (`scene_id`);
+CREATE INDEX `index_movies_on_studio_id` on `movies` (`studio_id`);
+
+-- custom functions cannot accept NULL values, so massage the old data
+UPDATE `_movies_old` set `duration` = 0 WHERE `duration` IS NULL;
+
+-- now populate from the old tables
+INSERT INTO `movies`
+  (
+    `id`,
+    `name`,
+    `aliases`,
+    `duration`,
+    `date`,
+    `rating`,
+    `director`,
+    `synopsis`,
+    `front_image`,
+    `back_image`,
+    `checksum`,
+    `url`,
+    `created_at`,
+    `updated_at`
+  )
+  SELECT 
+    `id`,
+    `name`,
+    `aliases`,
+    durationToTinyInt(`duration`),
+    `date`,
+    CAST(`rating` as tinyint),
+    `director`,
+    `synopsis`,
+    `front_image`,
+    `back_image`,
+    `checksum`,
+    `url`,
+    `created_at`,
+    `updated_at`
+  FROM `_movies_old`
+  -- ignore null named movies
+  WHERE `name` is not null;
+
+-- durationToTinyInt returns 0 if it cannot parse the string
+-- set these values to null instead
+UPDATE `movies` SET `duration` = NULL WHERE `duration` = 0;
+
+INSERT INTO `movies_scenes` 
+  (
+    `movie_id`,
+    `scene_id`,
+    `scene_index`
+  )
+  SELECT
+    `movie_id`,
+    `scene_id`,
+    CAST(`scene_index` as tinyint)
+  FROM `_movies_scenes_old`;
+
+-- drop old tables
+DROP TABLE `_movies_scenes_old`;
+DROP TABLE `_movies_old`;

pkg/ffmpeg/encoder.go

@@ -18,8 +18,8 @@ type Encoder struct {
 }
 
 var (
-	runningEncoders      map[string][]*os.Process = make(map[string][]*os.Process)
-	runningEncodersMutex                          = sync.RWMutex{}
+	runningEncoders      = make(map[string][]*os.Process)
+	runningEncodersMutex = sync.RWMutex{}
 )
 
 func NewEncoder(ffmpegPath string) Encoder {

pkg/ffmpeg/encoder_scene_preview_chunk.go

@@ -13,9 +13,10 @@ type ScenePreviewChunkOptions struct {
 	OutputPath string
 }
 
-func (e *Encoder) ScenePreviewVideoChunk(probeResult VideoFile, options ScenePreviewChunkOptions) {
+func (e *Encoder) ScenePreviewVideoChunk(probeResult VideoFile, options ScenePreviewChunkOptions, preset string) {
 	args := []string{
 		"-v", "error",
+		"-xerror",
 		"-ss", strconv.Itoa(options.Time),
 		"-i", probeResult.Path,
 		"-t", "0.75",
@@ -25,7 +26,7 @@ func (e *Encoder) ScenePreviewVideoChunk(probeResult VideoFile, options ScenePre
 		"-pix_fmt", "yuv420p",
 		"-profile:v", "high",
 		"-level", "4.2",
-		"-preset", "veryslow",
+		"-preset", preset,
 		"-crf", "21",
 		"-threads", "4",
 		"-vf", fmt.Sprintf("scale=%v:-2", options.Width),

pkg/ffmpeg/encoder_screenshot.go

@@ -10,7 +10,7 @@ type ScreenshotOptions struct {
 	Verbosity  string
 }
 
-func (e *Encoder) Screenshot(probeResult VideoFile, options ScreenshotOptions) {
+func (e *Encoder) Screenshot(probeResult VideoFile, options ScreenshotOptions) error {
 	if options.Verbosity == "" {
 		options.Verbosity = "error"
 	}
@@ -28,5 +28,7 @@ func (e *Encoder) Screenshot(probeResult VideoFile, options ScreenshotOptions) {
 		"-f", "image2",
 		options.OutputPath,
 	}
-	_, _ = e.run(probeResult, args)
+	_, err := e.run(probeResult, args)
+
+	return err
 }

pkg/ffmpeg/encoder_transcode.go

@@ -69,6 +69,49 @@ func (e *Encoder) Transcode(probeResult VideoFile, options TranscodeOptions) {
 	_, _ = e.run(probeResult, args)
 }
 
+//transcode the video, remove the audio
+//in some videos where the audio codec is not supported by ffmpeg
+//ffmpeg fails if you try to transcode the audio
+func (e *Encoder) TranscodeVideo(probeResult VideoFile, options TranscodeOptions) {
+	scale := calculateTranscodeScale(probeResult, options.MaxTranscodeSize)
+	args := []string{
+		"-i", probeResult.Path,
+		"-an",
+		"-c:v", "libx264",
+		"-pix_fmt", "yuv420p",
+		"-profile:v", "high",
+		"-level", "4.2",
+		"-preset", "superfast",
+		"-crf", "23",
+		"-vf", "scale=" + scale,
+		options.OutputPath,
+	}
+	_, _ = e.run(probeResult, args)
+}
+
+//copy the video stream as is, transcode audio
+func (e *Encoder) TranscodeAudio(probeResult VideoFile, options TranscodeOptions) {
+	args := []string{
+		"-i", probeResult.Path,
+		"-c:v", "copy",
+		"-c:a", "aac",
+		"-strict", "-2",
+		options.OutputPath,
+	}
+	_, _ = e.run(probeResult, args)
+}
+
+//copy the video stream as is, drop audio
+func (e *Encoder) CopyVideo(probeResult VideoFile, options TranscodeOptions) {
+	args := []string{
+		"-i", probeResult.Path,
+		"-an",
+		"-c:v", "copy",
+		options.OutputPath,
+	}
+	_, _ = e.run(probeResult, args)
+}
+
 func (e *Encoder) StreamTranscode(probeResult VideoFile, startTime string, maxTranscodeSize models.StreamingResolutionEnum) (io.ReadCloser, *os.Process, error) {
 	scale := calculateTranscodeScale(probeResult, maxTranscodeSize)
 	args := []string{}
@@ -92,3 +135,53 @@ func (e *Encoder) StreamTranscode(probeResult VideoFile, startTime string, maxTr
 
 	return e.stream(probeResult, args)
 }
+
+//transcode the video, remove the audio
+//in some videos where the audio codec is not supported by ffmpeg
+//ffmpeg fails if you try to transcode the audio
+func (e *Encoder) StreamTranscodeVideo(probeResult VideoFile, startTime string, maxTranscodeSize models.StreamingResolutionEnum) (io.ReadCloser, *os.Process, error) {
+	scale := calculateTranscodeScale(probeResult, maxTranscodeSize)
+	args := []string{}
+
+	if startTime != "" {
+		args = append(args, "-ss", startTime)
+	}
+
+	args = append(args,
+		"-i", probeResult.Path,
+		"-an",
+		"-c:v", "libvpx-vp9",
+		"-vf", "scale="+scale,
+		"-deadline", "realtime",
+		"-cpu-used", "5",
+		"-row-mt", "1",
+		"-crf", "30",
+		"-b:v", "0",
+		"-f", "webm",
+		"pipe:",
+	)
+
+	return e.stream(probeResult, args)
+}
+
+//it is very common in MKVs to have just the audio codec unsupported
+//copy the video stream, transcode the audio and serve as Matroska
+func (e *Encoder) StreamMkvTranscodeAudio(probeResult VideoFile, startTime string, maxTranscodeSize models.StreamingResolutionEnum) (io.ReadCloser, *os.Process, error) {
+	args := []string{}
+
+	if startTime != "" {
+		args = append(args, "-ss", startTime)
+	}
+
+	args = append(args,
+		"-i", probeResult.Path,
+		"-c:v", "copy",
+		"-c:a", "libopus",
+		"-b:a", "96k",
+		"-vbr", "on",
+		"-f", "matroska",
+		"pipe:",
+	)
+
+	return e.stream(probeResult, args)
+}

pkg/ffmpeg/ffprobe.go

@@ -10,11 +10,106 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/config"
 )
 
-var ValidCodecs = []string{"h264", "h265", "vp8", "vp9"}
+type Container string
+type AudioCodec string
+
+const (
+	Mp4                Container  = "mp4"
+	M4v                Container  = "m4v"
+	Mov                Container  = "mov"
+	Wmv                Container  = "wmv"
+	Webm               Container  = "webm"
+	Matroska           Container  = "matroska"
+	Avi                Container  = "avi"
+	Flv                Container  = "flv"
+	Mpegts             Container  = "mpegts"
+	Aac                AudioCodec = "aac"
+	Mp3                AudioCodec = "mp3"
+	Opus               AudioCodec = "opus"
+	Vorbis             AudioCodec = "vorbis"
+	MissingUnsupported AudioCodec = ""
+	Mp4Ffmpeg          string     = "mov,mp4,m4a,3gp,3g2,mj2" // browsers support all of them
+	M4vFfmpeg          string     = "mov,mp4,m4a,3gp,3g2,mj2" // so we don't care that ffmpeg
+	MovFfmpeg          string     = "mov,mp4,m4a,3gp,3g2,mj2" // can't differentiate between them
+	WmvFfmpeg          string     = "asf"
+	WebmFfmpeg         string     = "matroska,webm"
+	MatroskaFfmpeg     string     = "matroska,webm"
+	AviFfmpeg          string     = "avi"
+	FlvFfmpeg          string     = "flv"
+	MpegtsFfmpeg       string     = "mpegts"
+	H264               string     = "h264"
+	H265               string     = "h265" // found in rare cases from a faulty encoder
+	Hevc               string     = "hevc"
+	Vp8                string     = "vp8"
+	Vp9                string     = "vp9"
+	MimeWebm           string     = "video/webm"
+	MimeMkv            string     = "video/x-matroska"
+)
+
+var ValidCodecs = []string{H264, H265, Vp8, Vp9}
+
+var validForH264Mkv = []Container{Mp4, Matroska}
+var validForH264 = []Container{Mp4}
+var validForH265Mkv = []Container{Mp4, Matroska}
+var validForH265 = []Container{Mp4}
+var validForVp8 = []Container{Webm}
+var validForVp9Mkv = []Container{Webm, Matroska}
+var validForVp9 = []Container{Webm}
+var validForHevcMkv = []Container{Mp4, Matroska}
+var validForHevc = []Container{Mp4}
+
+var validAudioForMkv = []AudioCodec{Aac, Mp3, Vorbis, Opus}
+var validAudioForWebm = []AudioCodec{Vorbis, Opus}
+var validAudioForMp4 = []AudioCodec{Aac, Mp3}
+
+//maps user readable container strings to ffprobe's format_name
+//on some formats ffprobe can't differentiate
+var ContainerToFfprobe = map[Container]string{
+	Mp4:      Mp4Ffmpeg,
+	M4v:      M4vFfmpeg,
+	Mov:      MovFfmpeg,
+	Wmv:      WmvFfmpeg,
+	Webm:     WebmFfmpeg,
+	Matroska: MatroskaFfmpeg,
+	Avi:      AviFfmpeg,
+	Flv:      FlvFfmpeg,
+	Mpegts:   MpegtsFfmpeg,
+}
+
+var FfprobeToContainer = map[string]Container{
+	Mp4Ffmpeg:      Mp4,
+	WmvFfmpeg:      Wmv,
+	AviFfmpeg:      Avi,
+	FlvFfmpeg:      Flv,
+	MpegtsFfmpeg:   Mpegts,
+	MatroskaFfmpeg: Matroska,
+}
+
+func MatchContainer(format string, filePath string) Container { // match ffprobe string to our Container
+
+	container := FfprobeToContainer[format]
+	if container == Matroska {
+		container = MagicContainer(filePath) // use magic number instead of ffprobe for matroska,webm
+	}
+	if container == "" { // if format is not in our Container list leave it as ffprobes reported format_name
+		container = Container(format)
+	}
+	return container
+}
 
 func IsValidCodec(codecName string) bool {
+	forceHEVC := config.GetForceHEVC()
+	if forceHEVC {
+		if codecName == Hevc {
+			return true
+		}
+	}
+
 	for _, c := range ValidCodecs {
 		if c == codecName {
 			return true
@@ -23,6 +118,78 @@ func IsValidCodec(codecName string) bool {
 	return false
 }
 
+func IsValidAudio(audio AudioCodec, ValidCodecs []AudioCodec) bool {
+
+	// if audio codec is missing or unsupported by ffmpeg we can't do anything about it
+	// report it as valid so that the file can at least be streamed directly if the video codec is supported
+	if audio == MissingUnsupported {
+		return true
+	}
+
+	for _, c := range ValidCodecs {
+		if c == audio {
+			return true
+		}
+	}
+
+	return false
+}
+
+func IsValidAudioForContainer(audio AudioCodec, format Container) bool {
+	switch format {
+	case Matroska:
+		return IsValidAudio(audio, validAudioForMkv)
+	case Webm:
+		return IsValidAudio(audio, validAudioForWebm)
+	case Mp4:
+		return IsValidAudio(audio, validAudioForMp4)
+	}
+	return false
+
+}
+
+func IsValidForContainer(format Container, validContainers []Container) bool {
+	for _, fmt := range validContainers {
+		if fmt == format {
+			return true
+		}
+	}
+	return false
+}
+
+//extend stream validation check to take into account container
+func IsValidCombo(codecName string, format Container) bool {
+	forceMKV := config.GetForceMKV()
+	forceHEVC := config.GetForceHEVC()
+	switch codecName {
+	case H264:
+		if forceMKV {
+			return IsValidForContainer(format, validForH264Mkv)
+		}
+		return IsValidForContainer(format, validForH264)
+	case H265:
+		if forceMKV {
+			return IsValidForContainer(format, validForH265Mkv)
+		}
+		return IsValidForContainer(format, validForH265)
+	case Vp8:
+		return IsValidForContainer(format, validForVp8)
+	case Vp9:
+		if forceMKV {
+			return IsValidForContainer(format, validForVp9Mkv)
+		}
+		return IsValidForContainer(format, validForVp9)
+	case Hevc:
+		if forceHEVC {
+			if forceMKV {
+				return IsValidForContainer(format, validForHevcMkv)
+			}
+			return IsValidForContainer(format, validForHevc)
+		}
+	}
+	return false
+}
+
 type VideoFile struct {
 	JSON        FFProbeJSON
 	AudioStream *FFProbeStream
@@ -98,7 +265,11 @@ func parse(filePath string, probeJSON *FFProbeJSON) (*VideoFile, error) {
 	result.Container = probeJSON.Format.FormatName
 	duration, _ := strconv.ParseFloat(probeJSON.Format.Duration, 64)
 	result.Duration = math.Round(duration*100) / 100
-	fileStat, _ := os.Stat(filePath)
+	fileStat, err := os.Stat(filePath)
+	if err != nil {
+		logger.Errorf("Error statting file: %v", err)
+		return nil, err
+	}
 	result.Size = fileStat.Size()
 	result.StartTime, _ = strconv.ParseFloat(probeJSON.Format.StartTime, 64)
 	result.CreationTime = probeJSON.Format.Tags.CreationTime.Time

pkg/ffmpeg/media_detection.go

@@ -0,0 +1,66 @@
+package ffmpeg
+
+import (
+	"bytes"
+	"github.com/stashapp/stash/pkg/logger"
+	"os"
+)
+
+// detect file format from magic file number
+// https://github.com/lex-r/filetype/blob/73c10ad714e3b8ecf5cd1564c882ed6d440d5c2d/matchers/video.go
+
+func mkv(buf []byte) bool {
+	return len(buf) > 3 &&
+		buf[0] == 0x1A && buf[1] == 0x45 &&
+		buf[2] == 0xDF && buf[3] == 0xA3 &&
+		containsMatroskaSignature(buf, []byte{'m', 'a', 't', 'r', 'o', 's', 'k', 'a'})
+}
+
+func webm(buf []byte) bool {
+	return len(buf) > 3 &&
+		buf[0] == 0x1A && buf[1] == 0x45 &&
+		buf[2] == 0xDF && buf[3] == 0xA3 &&
+		containsMatroskaSignature(buf, []byte{'w', 'e', 'b', 'm'})
+}
+
+func containsMatroskaSignature(buf, subType []byte) bool {
+	limit := 4096
+	if len(buf) < limit {
+		limit = len(buf)
+	}
+
+	index := bytes.Index(buf[:limit], subType)
+	if index < 3 {
+		return false
+	}
+
+	return buf[index-3] == 0x42 && buf[index-2] == 0x82
+}
+
+//returns container as string ("" on error or no match)
+//implements only mkv or webm as ffprobe can't distinguish between them
+//and not all browsers support mkv
+func MagicContainer(file_path string) Container {
+	file, err := os.Open(file_path)
+	if err != nil {
+		logger.Errorf("[magicfile] %v", err)
+		return ""
+	}
+
+	defer file.Close()
+
+	buf := make([]byte, 4096)
+	_, err = file.Read(buf)
+	if err != nil {
+		logger.Errorf("[magicfile] %v", err)
+		return ""
+	}
+
+	if webm(buf) {
+		return Webm
+	}
+	if mkv(buf) {
+		return Matroska
+	}
+	return ""
+}

pkg/manager/config/config.go

@@ -19,10 +19,12 @@ const Metadata = "metadata"
 const Downloads = "downloads"
 const Username = "username"
 const Password = "password"
+const MaxSessionAge = "max_session_age"
+
+const DefaultMaxSessionAge = 60 * 60 * 1 // 1 hours
 
 const Database = "database"
 
-const ScrapersPath = "scrapers_path"
 const Exclude = "exclude"
 
 const MaxTranscodeSize = "max_transcode_size"
@@ -30,6 +32,20 @@ const MaxStreamingTranscodeSize = "max_streaming_transcode_size"
 
 const Host = "host"
 const Port = "port"
+const ExternalHost = "external_host"
+
+// key used to sign JWT tokens
+const JWTSignKey = "jwt_secret_key"
+
+// key used for session store
+const SessionStoreKey = "session_store_key"
+
+// scraping options
+const ScrapersPath = "scrapers_path"
+const ScraperUserAgent = "scraper_user_agent"
+
+// i18n
+const Language = "language"
 
 // Interface options
 const SoundOnPreview = "sound_on_preview"
@@ -38,6 +54,11 @@ const MaximumLoopDuration = "maximum_loop_duration"
 const AutostartVideo = "autostart_video"
 const ShowStudioAsText = "show_studio_as_text"
 const CSSEnabled = "cssEnabled"
+const WallPlayback = "wall_playback"
+
+// Playback force codec,container
+const ForceMKV = "forceMKV"
+const ForceHEVC = "forceHEVC"
 
 // Logging options
 const LogFile = "logFile"
@@ -82,6 +103,14 @@ func GetDatabasePath() string {
 	return viper.GetString(Database)
 }
 
+func GetJWTSignKey() []byte {
+	return []byte(viper.GetString(JWTSignKey))
+}
+
+func GetSessionStoreKey() []byte {
+	return []byte(viper.GetString(SessionStoreKey))
+}
+
 func GetDefaultScrapersPath() string {
 	// default to the same directory as the config file
 	configFileUsed := viper.ConfigFileUsed()
@@ -96,10 +125,25 @@ func GetExcludes() []string {
 	return viper.GetStringSlice(Exclude)
 }
 
+func GetLanguage() string {
+	ret := viper.GetString(Language)
+
+	// default to English
+	if ret == "" {
+		return "en-US"
+	}
+
+	return ret
+}
+
 func GetScrapersPath() string {
 	return viper.GetString(ScrapersPath)
 }
 
+func GetScraperUserAgent() string {
+	return viper.GetString(ScraperUserAgent)
+}
+
 func GetHost() string {
 	return viper.GetString(Host)
 }
@@ -108,6 +152,10 @@ func GetPort() int {
 	return viper.GetInt(Port)
 }
 
+func GetExternalHost() string {
+	return viper.GetString(ExternalHost)
+}
+
 func GetMaxTranscodeSize() models.StreamingResolutionEnum {
 	ret := viper.GetString(MaxTranscodeSize)
 
@@ -176,6 +224,13 @@ func ValidateCredentials(username string, password string) bool {
 	return username == authUser && err == nil
 }
 
+// GetMaxSessionAge gets the maximum age for session cookies, in seconds.
+// Session cookie expiry times are refreshed every request.
+func GetMaxSessionAge() int {
+	viper.SetDefault(MaxSessionAge, DefaultMaxSessionAge)
+	return viper.GetInt(MaxSessionAge)
+}
+
 // Interface options
 func GetSoundOnPreview() bool {
 	viper.SetDefault(SoundOnPreview, true)
@@ -187,6 +242,11 @@ func GetWallShowTitle() bool {
 	return viper.GetBool(WallShowTitle)
 }
 
+func GetWallPlayback() string {
+	viper.SetDefault(WallPlayback, "video")
+	return viper.GetString(WallPlayback)
+}
+
 func GetMaximumLoopDuration() int {
 	viper.SetDefault(MaximumLoopDuration, 0)
 	return viper.GetInt(MaximumLoopDuration)
@@ -241,6 +301,15 @@ func GetCSSEnabled() bool {
 	return viper.GetBool(CSSEnabled)
 }
 
+// force codec,container
+func GetForceMKV() bool {
+	return viper.GetBool(ForceMKV)
+}
+
+func GetForceHEVC() bool {
+	return viper.GetBool(ForceHEVC)
+}
+
 // GetLogFile returns the filename of the file to output logs to.
 // An empty string means that file logging will be disabled.
 func GetLogFile() string {
@@ -289,3 +358,21 @@ func IsValid() bool {
 	// TODO: check valid paths
 	return setPaths
 }
+
+// SetInitialConfig fills in missing required config fields
+func SetInitialConfig() error {
+	// generate some api keys
+	const apiKeyLength = 32
+
+	if string(GetJWTSignKey()) == "" {
+		signKey := utils.GenerateRandomKey(apiKeyLength)
+		Set(JWTSignKey, signKey)
+	}
+
+	if string(GetSessionStoreKey()) == "" {
+		sessionStoreKey := utils.GenerateRandomKey(apiKeyLength)
+		Set(SessionStoreKey, sessionStoreKey)
+	}
+
+	return Write()
+}

pkg/manager/exclude_files.go

@@ -1,9 +1,10 @@
 package manager
 
 import (
-	"github.com/stashapp/stash/pkg/logger"
 	"regexp"
 	"strings"
+
+	"github.com/stashapp/stash/pkg/logger"
 )
 
 func excludeFiles(files []string, patterns []string) ([]string, int) {
@@ -37,21 +38,13 @@ func excludeFiles(files []string, patterns []string) ([]string, int) {
 }
 
 func matchFile(file string, patterns []string) bool {
-	if patterns == nil {
-		logger.Infof("No exclude patterns in config.")
-
-	} else {
+	if patterns != nil {
 		fileRegexps := generateRegexps(patterns)
 
-		if len(fileRegexps) == 0 {
-			return false
-		}
-
 		for _, regPattern := range fileRegexps {
 			if regPattern.MatchString(strings.ToLower(file)) {
 				return true
 			}
-
 		}
 	}
 

pkg/manager/filename_parser.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/stashapp/stash/pkg/models"
 
@@ -87,8 +88,10 @@ func initParserFields() {
 	//I = new ParserField("i", undefined, "Matches any ignored word", false);
 
 	ret["d"] = newParserField("d", `(?:\.|-|_)`, false)
+	ret["rating"] = newParserField("rating", `\d`, true)
 	ret["performer"] = newParserField("performer", ".*", true)
 	ret["studio"] = newParserField("studio", ".*", true)
+	ret["movie"] = newParserField("movie", ".*", true)
 	ret["tag"] = newParserField("tag", ".*", true)
 
 	// date fields
@@ -96,6 +99,7 @@ func initParserFields() {
 	ret["yyyy"] = newParserField("yyyy", `\d{4}`, true)
 	ret["yy"] = newParserField("yy", `\d{2}`, true)
 	ret["mm"] = newParserField("mm", `\d{2}`, true)
+	ret["mmm"] = newParserField("mmm", `\w{3}`, true)
 	ret["dd"] = newParserField("dd", `\d{2}`, true)
 	ret["yyyymmdd"] = newFullDateParserField("yyyymmdd", `\d{8}`)
 	ret["yymmdd"] = newFullDateParserField("yymmdd", `\d{6}`)
@@ -204,6 +208,7 @@ type sceneHolder struct {
 	mm         string
 	dd         string
 	performers []string
+	movies     []string
 	studio     string
 	tags       []string
 }
@@ -222,6 +227,10 @@ func newSceneHolder(scene *models.Scene) *sceneHolder {
 	return &ret
 }
 
+func validateRating(rating int) bool {
+	return rating >= 1 && rating <= 5
+}
+
 func validateDate(dateStr string) bool {
 	splits := strings.Split(dateStr, "-")
 	if len(splits) != 3 {
@@ -283,6 +292,20 @@ func (h *sceneHolder) setDate(field *parserField, value string) {
 	}
 }
 
+func mmmToMonth(mmm string) string {
+	format := "02-Jan-2006"
+	dateStr := "01-" + mmm + "-2000"
+	t, err := time.Parse(format, dateStr)
+
+	if err != nil {
+		return ""
+	}
+
+	// expect month in two-digit format
+	format = "01-02-2006"
+	return t.Format(format)[0:2]
+}
+
 func (h *sceneHolder) setField(field parserField, value interface{}) {
 	if field.isFullDateField {
 		h.setDate(&field, value.(string))
@@ -302,27 +325,35 @@ func (h *sceneHolder) setField(field parserField, value interface{}) {
 				Valid:  true,
 			}
 		}
+	case "rating":
+		rating, _ := strconv.Atoi(value.(string))
+		if validateRating(rating) {
+			h.result.Rating = sql.NullInt64{
+				Int64: int64(rating),
+				Valid: true,
+			}
+		}
 	case "performer":
 		// add performer to list
 		h.performers = append(h.performers, value.(string))
 	case "studio":
 		h.studio = value.(string)
+	case "movie":
+		h.movies = append(h.movies, value.(string))
 	case "tag":
 		h.tags = append(h.tags, value.(string))
 	case "yyyy":
 		h.yyyy = value.(string)
-		break
 	case "yy":
 		v := value.(string)
 		v = "20" + v
 		h.yyyy = v
-		break
+	case "mmm":
+		h.mm = mmmToMonth(value.(string))
 	case "mm":
 		h.mm = value.(string)
-		break
 	case "dd":
 		h.dd = value.(string)
-		break
 	}
 }
 
@@ -335,9 +366,15 @@ func (h *sceneHolder) postParse() {
 }
 
 func (m parseMapper) parse(scene *models.Scene) *sceneHolder {
-	// perform matching on basename
-	// TODO - may want to handle full path at some point
+
+	// #302 - if the pattern includes a path separator, then include the entire
+	// scene path in the match. Otherwise, use the default behaviour of just
+	// the file's basename
+	// must be double \ because of the regex escaping
 	filename := filepath.Base(scene.Path)
+	if strings.Contains(m.regexString, `\\`) || strings.Contains(m.regexString, "/") {
+		filename = scene.Path
+	}
 
 	result := m.regex.FindStringSubmatch(filename)
 
@@ -368,7 +405,7 @@ func (m parseMapper) parse(scene *models.Scene) *sceneHolder {
 }
 
 type performerQueryer interface {
-	FindByNames(names []string, tx *sqlx.Tx) ([]*models.Performer, error)
+	FindByNames(names []string, tx *sqlx.Tx, nocase bool) ([]*models.Performer, error)
 }
 
 type sceneQueryer interface {
@@ -376,11 +413,15 @@ type sceneQueryer interface {
 }
 
 type tagQueryer interface {
-	FindByName(name string, tx *sqlx.Tx) (*models.Tag, error)
+	FindByName(name string, tx *sqlx.Tx, nocase bool) (*models.Tag, error)
 }
 
 type studioQueryer interface {
-	FindByName(name string, tx *sqlx.Tx) (*models.Studio, error)
+	FindByName(name string, tx *sqlx.Tx, nocase bool) (*models.Studio, error)
+}
+
+type movieQueryer interface {
+	FindByName(name string, tx *sqlx.Tx, nocase bool) (*models.Movie, error)
 }
 
 type SceneFilenameParser struct {
@@ -390,12 +431,14 @@ type SceneFilenameParser struct {
 	whitespaceRE   *regexp.Regexp
 	performerCache map[string]*models.Performer
 	studioCache    map[string]*models.Studio
+	movieCache     map[string]*models.Movie
 	tagCache       map[string]*models.Tag
 
 	performerQuery performerQueryer
 	sceneQuery     sceneQueryer
 	tagQuery       tagQueryer
 	studioQuery    studioQueryer
+	movieQuery     movieQueryer
 }
 
 func NewSceneFilenameParser(filter *models.FindFilterType, config models.SceneParserInput) *SceneFilenameParser {
@@ -407,6 +450,7 @@ func NewSceneFilenameParser(filter *models.FindFilterType, config models.ScenePa
 
 	p.performerCache = make(map[string]*models.Performer)
 	p.studioCache = make(map[string]*models.Studio)
+	p.movieCache = make(map[string]*models.Movie)
 	p.tagCache = make(map[string]*models.Tag)
 
 	p.initWhiteSpaceRegex()
@@ -423,6 +467,9 @@ func NewSceneFilenameParser(filter *models.FindFilterType, config models.ScenePa
 	studioQuery := models.NewStudioQueryBuilder()
 	p.studioQuery = &studioQuery
 
+	movieQuery := models.NewMovieQueryBuilder()
+	p.movieQuery = &movieQuery
+
 	return p
 }
 
@@ -499,7 +546,7 @@ func (p *SceneFilenameParser) queryPerformer(performerName string) *models.Perfo
 	}
 
 	// perform an exact match and grab the first
-	performers, _ := p.performerQuery.FindByNames([]string{performerName}, nil)
+	performers, _ := p.performerQuery.FindByNames([]string{performerName}, nil, true)
 
 	var ret *models.Performer
 	if len(performers) > 0 {
@@ -521,7 +568,7 @@ func (p *SceneFilenameParser) queryStudio(studioName string) *models.Studio {
 		return ret
 	}
 
-	ret, _ := p.studioQuery.FindByName(studioName, nil)
+	ret, _ := p.studioQuery.FindByName(studioName, nil, true)
 
 	// add result to cache
 	p.studioCache[studioName] = ret
@@ -529,6 +576,23 @@ func (p *SceneFilenameParser) queryStudio(studioName string) *models.Studio {
 	return ret
 }
 
+func (p *SceneFilenameParser) queryMovie(movieName string) *models.Movie {
+	// massage the movie name
+	movieName = delimiterRE.ReplaceAllString(movieName, " ")
+
+	// check cache first
+	if ret, found := p.movieCache[movieName]; found {
+		return ret
+	}
+
+	ret, _ := p.movieQuery.FindByName(movieName, nil, true)
+
+	// add result to cache
+	p.movieCache[movieName] = ret
+
+	return ret
+}
+
 func (p *SceneFilenameParser) queryTag(tagName string) *models.Tag {
 	// massage the performer name
 	tagName = delimiterRE.ReplaceAllString(tagName, " ")
@@ -539,7 +603,7 @@ func (p *SceneFilenameParser) queryTag(tagName string) *models.Tag {
 	}
 
 	// match tag name exactly
-	ret, _ := p.tagQuery.FindByName(tagName, nil)
+	ret, _ := p.tagQuery.FindByName(tagName, nil, true)
 
 	// add result to cache
 	p.tagCache[tagName] = ret
@@ -590,6 +654,24 @@ func (p *SceneFilenameParser) setStudio(h sceneHolder, result *models.SceneParse
 	}
 }
 
+func (p *SceneFilenameParser) setMovies(h sceneHolder, result *models.SceneParserResult) {
+	// query for each movie
+	moviesSet := make(map[int]bool)
+	for _, movieName := range h.movies {
+		if movieName != "" {
+			movie := p.queryMovie(movieName)
+			if movie != nil {
+				if _, found := moviesSet[movie.ID]; !found {
+					result.Movies = append(result.Movies, &models.SceneMovieID{
+						MovieID: strconv.Itoa(movie.ID),
+					})
+					moviesSet[movie.ID] = true
+				}
+			}
+		}
+	}
+}
+
 func (p *SceneFilenameParser) setParserResult(h sceneHolder, result *models.SceneParserResult) {
 	if h.result.Title.Valid {
 		title := h.result.Title.String
@@ -606,6 +688,11 @@ func (p *SceneFilenameParser) setParserResult(h sceneHolder, result *models.Scen
 		result.Date = &h.result.Date.String
 	}
 
+	if h.result.Rating.Valid {
+		rating := int(h.result.Rating.Int64)
+		result.Rating = &rating
+	}
+
 	if len(h.performers) > 0 {
 		p.setPerformers(h, result)
 	}
@@ -613,4 +700,9 @@ func (p *SceneFilenameParser) setParserResult(h sceneHolder, result *models.Scen
 		p.setTags(h, result)
 	}
 	p.setStudio(h, result)
+
+	if len(h.movies) > 0 {
+		p.setMovies(h, result)
+	}
+
 }

pkg/manager/generator_preview.go

@@ -16,9 +16,14 @@ type PreviewGenerator struct {
 	VideoFilename   string
 	ImageFilename   string
 	OutputDirectory string
+
+	GenerateVideo bool
+	GenerateImage bool
+
+	PreviewPreset string
 }
 
-func NewPreviewGenerator(videoFile ffmpeg.VideoFile, videoFilename string, imageFilename string, outputDirectory string) (*PreviewGenerator, error) {
+func NewPreviewGenerator(videoFile ffmpeg.VideoFile, videoFilename string, imageFilename string, outputDirectory string, generateVideo bool, generateImage bool, previewPreset string) (*PreviewGenerator, error) {
 	exists, err := utils.FileExists(videoFile.Path)
 	if !exists {
 		return nil, err
@@ -37,6 +42,9 @@ func NewPreviewGenerator(videoFile ffmpeg.VideoFile, videoFilename string, image
 		VideoFilename:   videoFilename,
 		ImageFilename:   imageFilename,
 		OutputDirectory: outputDirectory,
+		GenerateVideo:   generateVideo,
+		GenerateImage:   generateImage,
+		PreviewPreset:   previewPreset,
 	}, nil
 }
 
@@ -47,11 +55,16 @@ func (g *PreviewGenerator) Generate() error {
 	if err := g.generateConcatFile(); err != nil {
 		return err
 	}
-	if err := g.generateVideo(&encoder); err != nil {
-		return err
+
+	if g.GenerateVideo {
+		if err := g.generateVideo(&encoder); err != nil {
+			return err
+		}
 	}
-	if err := g.generateImage(&encoder); err != nil {
-		return err
+	if g.GenerateImage {
+		if err := g.generateImage(&encoder); err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -91,7 +104,7 @@ func (g *PreviewGenerator) generateVideo(encoder *ffmpeg.Encoder) error {
 			Width:      640,
 			OutputPath: chunkOutputPath,
 		}
-		encoder.ScenePreviewVideoChunk(g.Info.VideoFile, options)
+		encoder.ScenePreviewVideoChunk(g.Info.VideoFile, options, g.PreviewPreset)
 	}
 
 	videoOutputPath := filepath.Join(g.OutputDirectory, g.VideoFilename)

pkg/manager/json_utils.go

@@ -38,6 +38,14 @@ func (jp *jsonUtils) saveStudio(checksum string, studio *jsonschema.Studio) erro
 	return jsonschema.SaveStudioFile(instance.Paths.JSON.StudioJSONPath(checksum), studio)
 }
 
+func (jp *jsonUtils) getMovie(checksum string) (*jsonschema.Movie, error) {
+	return jsonschema.LoadMovieFile(instance.Paths.JSON.MovieJSONPath(checksum))
+}
+
+func (jp *jsonUtils) saveMovie(checksum string, movie *jsonschema.Movie) error {
+	return jsonschema.SaveMovieFile(instance.Paths.JSON.MovieJSONPath(checksum), movie)
+}
+
 func (jp *jsonUtils) getScene(checksum string) (*jsonschema.Scene, error) {
 	return jsonschema.LoadSceneFile(instance.Paths.JSON.SceneJSONPath(checksum))
 }

pkg/manager/jsonschema/mappings.go

@@ -1,8 +1,8 @@
 package jsonschema
 
 import (
-	"encoding/json"
 	"fmt"
+	"github.com/json-iterator/go"
 	"os"
 )
 
@@ -19,6 +19,7 @@ type PathMapping struct {
 type Mappings struct {
 	Performers []NameMapping `json:"performers"`
 	Studios    []NameMapping `json:"studios"`
+	Movies     []NameMapping `json:"movies"`
 	Galleries  []PathMapping `json:"galleries"`
 	Scenes     []PathMapping `json:"scenes"`
 }
@@ -30,6 +31,7 @@ func LoadMappingsFile(filePath string) (*Mappings, error) {
 	if err != nil {
 		return nil, err
 	}
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	jsonParser := json.NewDecoder(file)
 	err = jsonParser.Decode(&mappings)
 	if err != nil {

pkg/manager/jsonschema/movie.go

@@ -0,0 +1,47 @@
+package jsonschema
+
+import (
+	"fmt"
+	"github.com/json-iterator/go"
+	"os"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+type Movie struct {
+	Name       string          `json:"name,omitempty"`
+	Aliases    string          `json:"aliases,omitempty"`
+	Duration   int             `json:"duration,omitempty"`
+	Date       string          `json:"date,omitempty"`
+	Rating     int             `json:"rating,omitempty"`
+	Director   string          `json:"director,omitempty"`
+	Synopsis   string          `json:"sypnopsis,omitempty"`
+	FrontImage string          `json:"front_image,omitempty"`
+	BackImage  string          `json:"back_image,omitempty"`
+	URL        string          `json:"url,omitempty"`
+	CreatedAt  models.JSONTime `json:"created_at,omitempty"`
+	UpdatedAt  models.JSONTime `json:"updated_at,omitempty"`
+}
+
+func LoadMovieFile(filePath string) (*Movie, error) {
+	var movie Movie
+	file, err := os.Open(filePath)
+	defer file.Close()
+	if err != nil {
+		return nil, err
+	}
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	jsonParser := json.NewDecoder(file)
+	err = jsonParser.Decode(&movie)
+	if err != nil {
+		return nil, err
+	}
+	return &movie, nil
+}
+
+func SaveMovieFile(filePath string, movie *Movie) error {
+	if movie == nil {
+		return fmt.Errorf("movie must not be nil")
+	}
+	return marshalToFile(filePath, movie)
+}