Skip to content

Commit 45ef24d

Browse files
HaveAGitGatHaveAGitGat
authored
Merge pull request #129 from HaveAGitGat/dev
1.102
2 parents 60c6caf + 84a2b30 commit 45ef24d

File tree

11 files changed

+157
-31
lines changed

11 files changed

+157
-31
lines changed

‎imports/ui/App.jsx‎

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

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

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

5555
setVersion(newVersion)
5656

5757
if(version != newVersion){
5858

5959
alert(`
6060
61+
Beta v1.102 release [18th Jan 2020]:
62+
Changes:
63+
-[New] Plugin creator option (Filter by age) - select 'Date created' or 'Date modified'
64+
-[New] Plugin creator option (Filter by age) - include files OLDER than specified time
65+
-[New] Options to sort queue by date (Scanned, Created, Modified)
66+
-[Fix] Audio file codec not showing in search results
67+
-[Fix] MJPEG video incorrectly tagged as audio file
68+
-[Fix] Default plugin priority
69+
-[Fix] 'Too many packets buffered for output stream' when health checking
70+
-[Fix] Folder path placeholder text
71+
6172
Beta v1.101 release [06 Dec 19]:
6273
Changes:
6374
-[New] Force processing of files

‎imports/ui/libraries/tab_Libraries.jsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ class App extends Component {
6060
SettingsDB.insert({
6161
name:"Library Name",
6262
priority:count,
63-
folder:"Path to your media files. Input a base folder and the folder browser below will show subfolders to navigate.",
63+
folder:"",
6464
folderValid:true,
6565
foldersToIgnore:"",
66-
cache:"Path to your transcode cache. Input a base folder and the folder browser below will show subfolders to navigate.",
66+
cache:"",
6767
cacheValid:true,
68-
output:"Path to your output folder. Input a base folder and the folder browser below will show subfolders to navigate.",
68+
output:"",
6969
outputValid:true,
7070
folderToFolderConversion:false,
7171
folderToFolderConversionDeleteSource:false,
@@ -85,6 +85,7 @@ class App extends Component {
8585
_id:"Tdarr_Plugin_lmg1_Reorder_Streams",
8686
checked:true,
8787
source:"Community",
88+
priority:0,
8889
}],
8990
pluginValid:false,
9091
pluginCommunity:true,

‎imports/ui/libraries/tab_Libraries_Folder.jsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,7 @@ SettingsDB.insert(thisLibrary)
11501150
ref={this.props.libraryItem._id + 'f'}
11511151
name="folder"
11521152
defaultValue={this.props.libraryItem.folder}
1153+
placeholder='Path to your media files. Input a base folder and the folder browser below will show subfolders to navigate.'
11531154
onChange={this.handleChange}
11541155
></input>
11551156

@@ -1188,7 +1189,7 @@ SettingsDB.insert(thisLibrary)
11881189
</div>
11891190
<div id="folderList"></div>
11901191

1191-
<p>Sub-folders to ignore (e.g.: .grab,.index,User/AppData):</p>
1192+
<p>File paths containing the following will be ignored (e.g.: .grab,.index,User/AppData,-trailer,.mp4):</p>
11921193
<input
11931194
type="text"
11941195
className="folderPaths"
@@ -1216,6 +1217,7 @@ SettingsDB.insert(thisLibrary)
12161217
ref={this.props.libraryItem._id + 'c'}
12171218
name="cache"
12181219
defaultValue={this.props.libraryItem.cache}
1220+
placeholder='Path to your transcode cache. Input a base folder and the folder browser below will show subfolders to navigate.'
12191221
onChange={this.handleChange}
12201222
></input>
12211223

@@ -1361,6 +1363,7 @@ SettingsDB.insert(thisLibrary)
13611363
ref={this.props.libraryItem._id + 'o'}
13621364
name="output"
13631365
defaultValue={this.props.libraryItem.output}
1366+
placeholder='Path to your output folder. Input a base folder and the folder browser below will show subfolders to navigate.'
13641367
onChange={this.handleChange}
13651368
></input>
13661369

@@ -1609,7 +1612,7 @@ SettingsDB.insert(thisLibrary)
16091612

16101613
<center>
16111614
<p>
1612-
See the 'Plugins' tab guide for how the plugin stack works and for creating plugins.<b>It is best practice to put video transcode plugins at the top of your stack (below re-order streams if that's enabled).</b>
1615+
See the 'Plugins' tab guide for how the plugin stack works and for creating plugins.<b>It is best practice to put video transcode plugins at the top of your stack.</b>
16131616
</p>
16141617
</center>
16151618

‎imports/ui/plugins/pluginTemplates/Filter/FilterByAge.jsx‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { Component } from 'react';
22
import { Button } from 'react-bootstrap';
3+
import Checkbox from '@material-ui/core/Checkbox';
34
import ReactDOM from 'react-dom';
45

56

@@ -18,6 +19,8 @@ export default class App extends Component {
1819
super(props);
1920

2021
this.state = {
22+
excludeSwitch: true,
23+
dateType: 'dateCreated'
2124

2225
};
2326

@@ -45,18 +48,24 @@ export default class App extends Component {
4548

4649
var totalSeconds = (h * 3600) + (m * 60) + (s)
4750

51+
if (this.state.excludeSwitch === true) {
4852

49-
var obj = {
50-
name: 'Filter by age',
51-
filter: `library.filters.filterByAge(file,${totalSeconds})`,
52-
description: `Files older than the following will be excluded from processing: ${string}`
53-
}
53+
var mode = 'exclude'
5454

55-
this.props.pushConditional(obj)
55+
} else {
5656

57+
var mode = 'include'
58+
59+
}
5760

5861

62+
var obj = {
63+
name: 'Filter by age',
64+
filter: `library.filters.filterByAge(file,${totalSeconds},'${mode}','${this.state.dateType}')`,
65+
description: `Files older than the following will be ${mode}d from processing: ${string}`
66+
}
5967

68+
this.props.pushConditional(obj)
6069

6170
}
6271

@@ -75,11 +84,43 @@ export default class App extends Component {
7584
<br />
7685

7786

87+
<center><p>Date created<Checkbox checked={this.state.dateType == 'dateCreated' ? true : false} onChange={event => {
88+
89+
this.setState({
90+
dateType: 'dateCreated'
91+
})
92+
93+
94+
}} />/ Date modified <Checkbox checked={this.state.dateType == 'dateModified' ? true : false} onChange={event => {
95+
96+
this.setState({
97+
dateType: 'dateModified',
98+
})
99+
100+
101+
}} /></p> </center>
102+
103+
<br />
104+
105+
106+
<center><p>Exclude<Checkbox checked={this.state.excludeSwitch} onChange={event => {
107+
108+
this.setState({
109+
excludeSwitch: !this.state.excludeSwitch,
110+
})
78111

79-
<center><p>Exclude files older than</p> </center>
112+
113+
}} />/ Include <Checkbox checked={!this.state.excludeSwitch} onChange={event => {
114+
115+
this.setState({
116+
excludeSwitch: !this.state.excludeSwitch,
117+
})
118+
119+
120+
}} /> files older than</p> </center>
80121
<br />
81122

82-
<center><p>
123+
<center><p>
83124

84125
<input type="text" className="filterByDate" ref="hours" defaultValue={"0"}></input>
85126
H{'\u00A0'}{'\u00A0'}
@@ -90,7 +131,7 @@ export default class App extends Component {
90131
</p> </center>
91132

92133

93-
134+
94135
<br />
95136

96137

@@ -104,8 +145,6 @@ export default class App extends Component {
104145
<br />
105146
<br />
106147

107-
108-
109148
</div>
110149

111150
);

‎imports/ui/searchResults.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ return null
204204
<p>Codec</p>
205205
</div>
206206
),
207-
accessor: 'video_codec_name',
207+
accessor: 'ffProbeData.streams[0].codec_name',
208208
width: getColumnWidth(data, 'video_codec_name', 'Codec'),
209209
getProps: (state, rowInfo, column) => {
210210
return {
@@ -600,7 +600,7 @@ renderBumpButton(file) {
600600

601601
renderRedoButton(file, mode) {
602602

603-
603+
604604
var obj = {
605605
[mode]: "Queued",
606606
processingStatus: false,

‎imports/ui/tab_Dev.jsx‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,25 @@ export default class App extends Component {
120120

121121
<p>Change log</p>
122122

123-
<p>Beta v1.101 release [06 Dec 19]:
123+
<p>Beta v1.102 release [18th Jan 2020]:
124+
125+
<br />Changes:
126+
127+
<br />-[New] Plugin creator option (Filter by age) - select 'Date created' or 'Date modified'
128+
<br />-[New] Plugin creator option (Filter by age) - include files OLDER than specified time
129+
<br />-[New] Options to sort queue by date (Scanned, Created, Modified)
130+
<br />-[Fix] Audio file codec not showing in search results
131+
<br />-[Fix] MJPEG video incorrectly tagged as audio file
132+
<br />-[Fix] Default plugin priority
133+
<br />-[Fix] 'Too many packets buffered for output stream' when health checking
134+
<br />-[Fix] Folder path placeholder text
135+
136+
<br />
137+
<br />
138+
139+
</p>
140+
141+
<p>Beta v1.101 release [6th Dec 19]:
124142

125143
<br />Changes:
126144

‎imports/ui/transcoding/tab_Transcoding.jsx‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -948,17 +948,27 @@ class App extends Component {
948948

949949

950950

951-
<p>Sort queue by: </p>
952-
<p>Oldest:
951+
<p>Sort queue by: </p>
952+
<p>Oldest (Scanned):
953953
{this.renderSortBox('sortDateOldest')}
954-
Newest:
954+
Newest (Scanned):
955955
{this.renderSortBox('sortDateNewest')}
956-
957-
Smallest:
956+
957+
Oldest (Created):
958+
{this.renderSortBox('sortDateFileCreatedOldest')}
959+
Newest (Created):
960+
{this.renderSortBox('sortDateFileCreatedNewest')}
961+
962+
Oldest (Modified):
963+
{this.renderSortBox('sortDateFileModifiedOldest')}
964+
Newest (Modified):
965+
{this.renderSortBox('sortDateFileModifiedNewest')}
966+
967+
Smallest:
958968
{this.renderSortBox('sortSizeSmallest')}
959-
Largest:
969+
Largest:
960970
{this.renderSortBox('sortSizeLargest')}
961-
</p>
971+
</p>
962972

963973

964974
<p>Library alternation: {this.renderCheckBox('alternateLibraries')}</p>

‎package-lock.json‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@ffmpeg-installer/ffmpeg": "^1.0.20",
1616
"@material-ui/core": "^4.6.0",
1717
"@trendmicro/react-sidenav": "^0.4.5",
18+
"all": "0.0.0",
1819
"babel-eslint": "^10.0.3",
1920
"bootstrap": "^4.3.1",
2021
"child_process": "^1.0.2",

‎private/fileScanner.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,10 +741,9 @@ function ffprobeLaunch(filesToScan) {
741741

742742
}
743743

744-
745744
//if (!!("video_codec_name" in thisFileObject)) {
746745

747-
if (jsonString.includes('"codec_type":"video"') && !jsonString.includes('"codec_name":"mjpeg"') ) {
746+
if (jsonString.includes('"codec_type":"video"') && thisFileObject.meta.MIMEType.includes('video')) {
748747

749748
updateConsole(scannerID, `Tagging video res:${filepath}`)
750749

0 commit comments

Comments
 (0)