mirror/Mellow
1
0
Fork 0
mirror of https://github.com/v0idp/Mellow.git synced 2025-12-30 18:29:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from v0idp/develop

Browse Source 
you can now set if the movie or tv show will be searched on sonarr/ra…
This commit is contained in:
void*
2020-02-28 18:55:28 +01:00
committed by GitHub
parent 30435e36a6 5562da7867
commit 8bbe2871a8
9 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/settings.json
View File

@@ -1 +1 @@
{"general":{"username":"mellow","password":"$2a$10$hKxfwH5lKDxogjIPKR.9mOJi664EQ298OYiRt/HuqVjSHw8BRKEya"},"bot":{"token":"","ownerid":"","commandprefix":"","channelname":"","deletecommandmessages":"false","unknowncommandresponse":"false","defaultservice":"ombi","requesttv":"","requestmovie":"","admin":"","selection":"emoji"},"ombi":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","username":""},"tautulli":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false"},"sonarr":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","profile":"0","profileanime":"0","rootfolder":"","rootfolderanime":"","languageprofile":"0","seasonfolders":"false","v3":"false"},"radarr":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","profile":"0","rootfolder":"","minimumavailability":"Announced"}}
{"general":{"username":"mellow","password":"$2a$10$hKxfwH5lKDxogjIPKR.9mOJi664EQ298OYiRt/HuqVjSHw8BRKEya"},"bot":{"token":"","ownerid":"","commandprefix":"","channelname":"","deletecommandmessages":"false","unknowncommandresponse":"false","defaultservice":"ombi","requesttv":"","requestmovie":"","admin":"","selection":"emoji"},"ombi":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","username":""},"tautulli":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false"},"sonarr":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","profile":"0","profileanime":"0","rootfolder":"","rootfolderanime":"","languageprofile":"0","seasonfolders":"false","v3":"false","searchonrequest":"false"},"radarr":{"host":"","port":"","baseurl":"","apikey":"","ssl":"false","profile":"0","rootfolder":"","minimumavailability":"Announced","searchonrequest":"false"}}

4
src/api/helpers/radarr.js
View File

@@ -1,4 +1,4 @@
module.exports = buildRadarrMovie = (movie, radarr, searchNow = false) => {
module.exports = buildRadarrMovie = (movie, radarr) => {
if (radarr.profile === "0" || radarr.rootfolder === "0" || radarr.rootfolder === "") {
const errMsg = 'Please set quality profile and default root folder in radarr config!';
console.log(errMsg);
@@ -20,7 +20,7 @@ module.exports = buildRadarrMovie = (movie, radarr, searchNow = false) => {
Object.assign(newMovie, {
addOptions: {
searchForMovie: searchNow
searchForMovie: (radarr.searchonrequest === "true") ? true : false
}
});

4
src/api/helpers/sonarr.js
View File

@@ -1,7 +1,7 @@
const TVMaze = require('../tvmaze.js');
const tvmaze = new TVMaze();
module.exports = buildSonarrSeries = (series, sonarr, searchNow = false) => {
module.exports = buildSonarrSeries = (series, sonarr) => {
if (sonarr.profile === "0" || sonarr.rootfolder === "0" || sonarr.rootfolder === "") {
const errMsg = 'Please set quality profile and default root folder in sonarr config!';
console.log(errMsg);
@@ -45,7 +45,7 @@ module.exports = buildSonarrSeries = (series, sonarr, searchNow = false) => {
addOptions: {
ignoreEpisodesWithFiles: true,
ignoreEpisodesWithoutFiles: false,
searchForMissingEpisodes: searchNow
searchForMissingEpisodes: (sonarr.searchonrequest === "true") ? true : false
}
});

2
src/bots/services/radarr.js
View File

@@ -60,7 +60,7 @@ module.exports = class SonarrService {
}
addMovie(msg, msgEmbed, movie) {
const newMovie = buildRadarrMovie(movie, this.client.db.config['radarr'], true);
const newMovie = buildRadarrMovie(movie, this.client.db.config['radarr']);
if (typeof newMovie === "string") {
return this.client.reply(msg, newMovie);
}

2
src/bots/services/sonarr.js
View File

@@ -28,7 +28,7 @@ module.exports = class SonarrService {
}
addSeries(msg, msgEmbed, series) {
const newSeries = buildSonarrSeries(series, this.client.db.config['sonarr'], true);
const newSeries = buildSonarrSeries(series, this.client.db.config['sonarr']);
if (typeof newSeries === "string") {
return this.client.reply(msg, newSeries);
}

2
src/database/Database.js
View File

@@ -73,6 +73,7 @@ module.exports = class Database {
newWebConfig.sonarr.languageprofile = request.body.languageprofile;
newWebConfig.sonarr.seasonfolders = (request.body.seasonfolders) ? 'true' : 'false';
newWebConfig.sonarr.v3 = (request.body.v3) ? 'true' : 'false';
newWebConfig.sonarr.searchonrequest = (request.body.searchonrequest) ? 'true' : 'false';
} else if (request.originalUrl == '/radarr' && request.body.apiKey != '' && request.body.host != '') {
newWebConfig.radarr.host = request.body.host;
newWebConfig.radarr.port = request.body.port;
@@ -82,6 +83,7 @@ module.exports = class Database {
newWebConfig.radarr.profile = request.body.profile;
newWebConfig.radarr.rootfolder = request.body.rootfolder;
newWebConfig.radarr.minimumavailability = request.body.minimumavailability;
newWebConfig.radarr.searchonrequest = (request.body.searchonrequest) ? 'true' : 'false';
}
if (request.body)
storeData(newWebConfig);

6
src/database/settings_format.json
View File

@@ -43,7 +43,8 @@
"rootfolderanime": "",
"languageprofile": "0",
"seasonfolders": "false",
"v3": "false"
"v3": "false",
"searchonrequest": "false"
},
"radarr": {
"host": "",
@@ -53,6 +54,7 @@
"ssl": "false",
"profile": "0",
"rootfolder": "",
"minimumavailability": "Announced"
"minimumavailability": "Announced",
"searchonrequest": "false"
}
}

7
src/web/views/tabs/radarr.ejs
View File

@@ -87,6 +87,13 @@
</select>
</div>
</div>
<div class="form-group row">
<label for="searchonrequest" class="col-md-4 form-check-label">Search On Request</label>
<div class="col-md-8">
<input type="checkbox" class="searchonrequest" name="searchonrequest" value="true" <% if (radarrSettings && radarrSettings.searchonrequest === 'true') { %>checked<% } %>>
</div>
</div>
</div>
</div>

7
src/web/views/tabs/sonarr.ejs
View File

@@ -131,6 +131,13 @@
<input type="checkbox" class="seasonfolders" name="seasonfolders" value="true" <% if (sonarrSettings && sonarrSettings.seasonfolders === 'true') { %>checked<% } %>>
</div>
</div>
<div class="form-group row">
<label for="searchonrequest" class="col-md-4 form-check-label">Search On Request</label>
<div class="col-md-8">
<input type="checkbox" class="searchonrequest" name="searchonrequest" value="true" <% if (sonarrSettings && sonarrSettings.searchonrequest === 'true') { %>checked<% } %>>
</div>
</div>
</div>
</div>