Merge pull request #215 from HaveAGitGat/dev

1.109
HaveAGitGat · May 17, 2020 · 99156c3 · 99156c3
2 parents 545d705 + 63ff559
commit 99156c3
Show file tree

Hide file tree

Showing 13 changed files with 284 additions and 276 deletions.
diff --git a/imports/ui/App.jsx b/imports/ui/App.jsx
@@ -38,7 +38,7 @@ const tabs = [
 export default AppRouter = () => {
   const [basePath, setBasePath] = React.useState("");
   const [currentVersion, setVersion] = React.useState("");
-  const [newVersion, setNewVersion] = React.useState(1.108);
+  const [newVersion, setNewVersion] = React.useState(1.109);
   const [showUpdateScreen, setShowUpdateScreen] = React.useState(false);
 
   toggleConsole = () => {

diff --git a/imports/ui/libraries/tab_Libraries.jsx b/imports/ui/libraries/tab_Libraries.jsx
@@ -994,17 +994,17 @@ class App extends Component {
 
                       <p>
                         When using FFmpeg, you need to separate the input and
-                        output parameters with a comma. FFmpeg Examples:
+                        output parameters with {'<io>'}. FFmpeg Examples:
                       </p>
 
-                      <p>-r 1,-r 24</p>
-                      <p>,-sn -c:v copy -c:a copy</p>
+                      <p>-r 1{'<io>'}-r 24</p>
+                      <p>{'<io>'}-sn -c:v copy -c:a copy</p>
                       <p>
-                        ,-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast
+                        {'<io>'}-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast
                       </p>
-                      <p>,-map 0 -c copy -c:v libx265 -c:a aac</p>
+                      <p>{'<io>'}-map 0 -c copy -c:v libx265 -c:a aac</p>
                       <p>
-                        -c:v h264_cuvid,-c:v hevc_nvenc -preset slow -c:a copy
+                        -c:v h264_cuvid{'<io>'}-c:v hevc_nvenc -preset slow -c:a copy
                       </p>
 
                       <p>

diff --git a/imports/ui/libraries/tab_Libraries_Folder.jsx b/imports/ui/libraries/tab_Libraries_Folder.jsx
@@ -1314,6 +1314,9 @@ class Folder extends Component {
               }
             >
               <p> Transcode cache:</p>
+              <br/>
+              <p>Files will be transcoded into the transcode cache. Completed files will then be moved to library/output folder.</p>
+              <br/>
 
               <input
                 type="text"

diff --git a/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx b/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx
@@ -108,14 +108,14 @@ export default class App extends Component {
 
         <p>
           When using FFmpeg, you need to separate the input and output
-          parameters with a comma. FFmpeg Examples:
+          parameters with {'<io>'}. FFmpeg Examples:
         </p>
 
-        <p>-r 1,-r 24</p>
-        <p>,-sn -c:v copy -c:a copy</p>
-        <p>,-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast</p>
-        <p>,-map 0 -c copy -c:v libx265 -c:a aac</p>
-        <p>-c:v h264_cuvid,-c:v hevc_nvenc -preset slow -c:a copy</p>
+        <p>-r 1{'<io>'}-r 24</p>
+        <p>{'<io>'}-sn -c:v copy -c:a copy</p>
+        <p>{'<io>'}-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast</p>
+        <p>{'<io>'}-map 0 -c copy -c:v libx265 -c:a aac</p>
+        <p>-c:v h264_cuvid{'<io>'}-c:v hevc_nvenc -preset slow -c:a copy</p>
 
         <p>Please see the following for help with creating FFmpeg commands:</p>
 

diff --git a/imports/ui/tab_Dev.jsx b/imports/ui/tab_Dev.jsx
@@ -91,6 +91,25 @@ export default class App extends Component {
                 <LatestDevNotes />
                 <p>
                   {" "}
+          Beta v1.108 release [18th April 2020]:
+          <br />
+          Changes:
+          <br />
+          -[New] Add default plugins to new libraries
+          <br />
+          -[Improvement] Check other properties to calculate bitrate
+          <br />
+          -[Improvement] Reduce worker spawn rate
+          <br />
+          -[Improvement] Change process priority from "Below normal" to "Low"
+          when switch enabled (Win)
+          <br />
+          -[Fix] Prevent folder watcher re-adding already scanned files
+          <br />
+                  <br />
+                </p>
+                <p>
+                  {" "}
                   Beta v1.107 release [4th April 2020]:
                   <br />
                   Changes:

diff --git a/imports/ui/tab_Dev_latest.jsx b/imports/ui/tab_Dev_latest.jsx
@@ -11,21 +11,60 @@ export default class App extends Component {
     return (
       <div>
         <p>
+
+          IMPORTANT:
+          <br />
+          On Sunday 24th May 2020 the 'tdarr' container will be replaced with the 'tdarr_aio' container as the
+          tdarr container does not provide much benefit but makes things increasingly difficult as Tdarr
+          development progresses. It's also confusing for new users to have a selection of containers.
+          <br />
+          After 24th May 2020, both the tdarr and tdarr_aio containers will be the SAME but all documentation will direct new
+          users to download the new 'tdarr' container. Existing tdarr_aio users can continue using that container (tdarr_aio) and will receive updates.
+          <br />
+          Current 'tdarr' container users will need to create a Tdarr backup (on the 'Backups' tab) and then restore the backup once they've set up the new 'tdarr'
+          container on/after 24th May 2020.
+          <br />
+          <br />
+          In summary:
+          <br />
+          Pre 24th May 2020:
+          <br />
+          tdarr - Alpine image with MongoDB needed separately
+          <br />
+          tdarr_aio - all-in-one Ubuntu image with MongoDB inside and hardware transcoding
+          <br />
+          <br />
+          Post 24th May 2020:
+          <br />
+          tdarr - all-in-one Ubuntu image with MongoDB inside and hardware transcoding
+          <br />
+          tdarr_aio - all-in-one Ubuntu image with MongoDB inside and hardware transcoding
+          <br />
+          <br />
+          Please use the channels on the 'Help' tab if you have any questions
+
+
+
+          <br />
+          <br />
           {" "}
-          Beta v1.108 release [18th April 2020]:
+          Beta v1.109 release [17th May 2020]:
           <br />
           Changes:
           <br />
-          -[New] Add default plugins to new libraries
+          -[New] Added health check and transcode cache description
+          <br />
+          -[New] More errors detected during thorough health check
+          <br />
+          -[New] Health check will be skipped if both options (Quick/Thorough) unchecked
           <br />
-          -[Improvement] Check other properties to calculate bitrate
+          -[New] Queue files for transcode even if they've failed reading with FFprobe
           <br />
-          -[Improvement] Reduce worker spawn rate
+          -[New] More comprehensive logging system
           <br />
-          -[Improvement] Change process priority from "Below normal" to "Low"
-          when switch enabled (Win)
+          -[New] Clearer UI for how to edit library titles
           <br />
-          -[Fix] Prevent folder watcher re-adding already scanned files
+          -[New] Split FFmpeg input and output args with {'<io>'} to prevent issues when FFmpeg command contains commas
           <br />
           <br />
         </p>