Skip to content

Commit 775c8d1

Browse files
authored
Merge pull request HaveAGitGat#148 from HaveAGitGat/dev
Dev 1.103
2 parents 74745fe + 2d5cd3b commit 775c8d1

22 files changed

+908
-749
lines changed

‎imports/ui/App.jsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,24 @@ const AppRouter = () => {
5050

5151
var version = GlobalSettingsDB.find({}).fetch()[0].version;
5252

53-
var newVersion = 1.102
53+
var newVersion = 1.103
5454

5555
setVersion(newVersion)
5656

5757
if(version != newVersion){
5858

5959
alert(`
6060
61+
Beta v1.103 release [27th Jan 2020]:
62+
Changes:
63+
-[New] Option to set folder watch scan interval (default 30 secs)
64+
-[New] Button to skip all for transcode and health check queues
65+
-[New] Option on 'Options' tab to toggle worker stall detector
66+
-[New] Basic output file size estimation shown on workers
67+
-[Re-Fix] Prevent too many workers being started
68+
-[Fix] Links open correctly when using context menu
69+
-[Fix] Images stored locally
70+
6171
Beta v1.102 release [18th Jan 2020]:
6272
Changes:
6373
-[New] Plugin creator option (Filter by age) - select 'Date created' or 'Date modified'

‎imports/ui/libraries/tab_Libraries.jsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class App extends Component {
6363
folder:"",
6464
folderValid:true,
6565
foldersToIgnore:"",
66+
folderWatchScanInterval:30,
6667
cache:"",
6768
cacheValid:true,
6869
output:"",
@@ -812,7 +813,7 @@ class App extends Component {
812813

813814
<p>Provide a base folder path and the folder browser will show subfolders which you can navigate to using the buttons.</p>
814815

815-
<img src="https://i.imgur.com/vyp7fle.png"/>
816+
<img src="/images/example_folder_browser.png"/>
816817

817818
<p>'Scan (Find new)' does 2 things - it removes files from the database which don't exist anymore, and adds newly detected files. Turn on 'Folder watch' to automate this process. New files will be scanned for every 30 seconds or so.</p>
818819
<p>All new files will be added to both the transcode queues and the health check queues. If you're not interested in using one or the other, then just make sure not to fire up any workers for that respective queue.</p>
@@ -823,7 +824,7 @@ class App extends Component {
823824
<p>In the library transcode settings, you can either use plugins or manually set either video file or audio file transcode settings.</p>
824825

825826
<p>You can stack plugins but this will increase the number of transcode/remux passes on a file. It's best to use/create a plugin which can do what you need all at once.</p>
826-
<img src="https://i.imgur.com/yGmb9Rn.png"/>
827+
<img src="/images/example_plugin_stack.png"/>
827828

828829

829830
<p>See the plugins tab for plugins info on creating a plugin.</p>
@@ -842,7 +843,7 @@ class App extends Component {
842843

843844
<p>Please see the following for help with creating FFmpeg commands:</p>
844845

845-
<p><a href="" onClick={(e) => { e.preventDefault(); window.open("https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats", "_blank"); }}>https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats</a></p>
846+
<p><a href="https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats" onClick={(e) => { e.preventDefault(); window.open("https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats", "_blank"); }}>https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats</a></p>
846847

847848
<br/>
848849
<br/>
@@ -860,7 +861,7 @@ class App extends Component {
860861

861862
<p>You can learn more about HandBrake presets here:</p>
862863

863-
<p><a href="" onClick={(e) => {e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
864+
<p><a href="https://handbrake.fr/docs/en/latest/technical/official-presets.html" onClick={(e) => {e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
864865

865866
<br/>
866867
<br/>

‎imports/ui/libraries/tab_Libraries_Folder.jsx‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,9 @@ class Folder extends Component {
588588
);
589589
};
590590

591-
resetAllStatus(mode) {
591+
setAllStatus(mode) {
592592
if (confirm('Are you sure you want to re-queue all files?')) {
593-
Meteor.call('resetAllStatus', this.props.libraryItem._id, mode);
593+
Meteor.call('setAllStatus', this.props.libraryItem._id, mode, null, 'Queued');
594594
}
595595
}
596596

@@ -740,14 +740,14 @@ class Folder extends Component {
740740
</Dropdown.Item>
741741

742742
<Dropdown.Item
743-
onClick={() => this.resetAllStatus('TranscodeDecisionMaker')}
743+
onClick={() => this.setAllStatus('TranscodeDecisionMaker')}
744744
>
745745
<span className="buttonTextSize">
746746
Requeue all items (transcode)
747747
</span>
748748
</Dropdown.Item>
749749
<Dropdown.Item
750-
onClick={() => this.resetAllStatus('HealthCheck')}
750+
onClick={() => this.setAllStatus('HealthCheck')}
751751
>
752752
<span className="buttonTextSize">
753753
Requeue all items (health check)
@@ -1198,6 +1198,15 @@ SettingsDB.insert(thisLibrary)
11981198
onChange={this.handleChange}
11991199
></input>
12001200

1201+
<p>Folder watch scan interval (seconds)</p>
1202+
<input
1203+
type="text"
1204+
className="folderPaths"
1205+
name="folderWatchScanInterval"
1206+
defaultValue={this.props.libraryItem.folderWatchScanInterval}
1207+
onChange={this.handleChange}
1208+
></input>
1209+
12011210

12021211

12031212
</div>

‎imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export default class App extends Component {
135135

136136
<p>Please see the following for help with creating FFmpeg commands:</p>
137137

138-
<p><a href="" onClick={(e) => { e.preventDefault(); window.open("https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats", "_blank"); }}>https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats</a></p>
138+
<p><a href="https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats" onClick={(e) => { e.preventDefault(); window.open("https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats", "_blank"); }}>https://opensource.com/article/17/6/ffmpeg-convert-media-file-formats</a></p>
139139

140140

141141
<br />
@@ -154,7 +154,7 @@ export default class App extends Component {
154154

155155
<p>You can learn more about HandBrake presets here:</p>
156156

157-
<p><a href="" onClick={(e) => { e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
157+
<p><a href="https://handbrake.fr/docs/en/latest/technical/official-presets.html" onClick={(e) => { e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
158158

159159
<br />
160160
<br />

‎imports/ui/plugins/pluginTemplates/Action/TranscodeHandBrakeBasic.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export default class App extends Component {
118118

119119
<p>You can learn more about HandBrake presets here:</p>
120120

121-
<p><a href="" onClick={(e) => { e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
121+
<p><a href="https://handbrake.fr/docs/en/latest/technical/official-presets.html" onClick={(e) => { e.preventDefault(); window.open("https://handbrake.fr/docs/en/latest/technical/official-presets.html", "_blank") }}>HandBrake presets</a></p>
122122

123123
<br />
124124
<br />
@@ -163,7 +163,7 @@ export default class App extends Component {
163163
<option value='Apple 720p30 Surround'>Apple 720p30 Surround (h264)</option>
164164
<option value='Apple 540p30 Surround'>Apple 540p30 Surround (h264)</option>
165165
<option value='Apple 240p30'>Apple 240p30 (h264)</option>
166-
<option value='Chromecast 2160p60 4K HEVC Surround'>Chromecast 2160p60 4K HEVC Surround (h264)</option>
166+
<option value='Chromecast 2160p60 4K HEVC Surround'>Chromecast 2160p60 4K HEVC Surround (h265)</option>
167167
<option value='Chromecast 1080p60 Surround'>Chromecast 1080p60 Surround (h264)</option>
168168
<option value='Chromecast 1080p30 Surround'>Chromecast 1080p30 Surround (h264)</option>
169169
<option value='Amazon Fire 2160p60 4K HEVC Surround'>Amazon Fire 2160p60 4K HEVC Surround (h265)</option>

‎imports/ui/plugins/pluginTemplates/PluginGuide.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var ButtonStyle = {
6666
<br/>
6767

6868
<p align="center">
69-
<img src="https://i.imgur.com/483AakN.png" height="500" />
69+
<img src="/images/example_plugin_stack_flow.png" height="500" />
7070
</p>
7171

7272

‎imports/ui/plugins/tab_Plugins.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class App extends Component {
345345
</div>
346346
),
347347
id: 'Link',
348-
accessor: row => <p><a href="" onClick={(e) => {
348+
accessor: row => <p><a href={row.Link} onClick={(e) => {
349349
e.preventDefault();
350350
window.open(row.Link, "_blank")
351351
}}>{row.Link}</a></p>,

‎imports/ui/styles/main.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,7 @@ input[type="text"]
747747
border: 2px solid black;
748748
border-radius: 5px;
749749

750+
overflow: auto;
750751
padding:2em;
751752

752753

‎imports/ui/tab_Dev.jsx‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default class App extends Component {
5353

5454
<p align="center">
5555

56-
<img src="https://i.imgur.com/s8ZbOsT.png" />
56+
<img src="/images/icon_dark.png" />
5757

5858
</p>
5959

@@ -83,7 +83,7 @@ export default class App extends Component {
8383
<p></p>
8484

8585
<p align="center">
86-
<img src="https://i.imgur.com/wRV6tBJ.png" height="300" />
86+
<img src="/images/example_file_replacement.png" height="300" />
8787
</p>
8888

8989
<p></p>
@@ -120,6 +120,25 @@ export default class App extends Component {
120120

121121
<p>Change log</p>
122122

123+
124+
<p>Beta v1.103 release [27th Jan 2020]:
125+
126+
<br />Changes:
127+
128+
<br />-[New] Option to set folder watch scan interval (default 30 secs)
129+
<br />-[New] Button to skip all for transcode and health check queues
130+
<br />-[New] Option on 'Options' tab to toggle worker stall detector
131+
<br />-[New] Basic output file size estimation shown on workers
132+
<br />-[Re-Fix] Prevent too many workers being started
133+
<br />-[Fix] Links open correctly when using context menu
134+
<br />-[Fix] Images stored locally
135+
136+
137+
<br />
138+
<br />
139+
140+
</p>
141+
123142
<p>Beta v1.102 release [18th Jan 2020]:
124143

125144
<br />Changes:

‎imports/ui/tab_Help.jsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,14 @@ export default class App extends Component {
129129
<br></br>
130130

131131

132+
<p>unRAID: Enable NVENC: https://forums.unraid.net/topic/77813-plugin-linuxserverio-unraid-nvidia/</p>
133+
<p>unRAID: Enable Intel QSV: https://forums.unraid.net/topic/77943-guide-plex-hardware-acceleration-using-intel-quick-sync/ </p>
134+
135+
<br></br>
136+
<br></br>
132137

133138

139+
134140

135141

136142

0 commit comments

Comments
 (0)