BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed config setting name to allowFetchAllRecordings

Browse Source
This commit is contained in:
Paul Trudel 2023-02-24 15:48:53 +00:00
parent 6cd625933f
commit c4da4e8416
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bbb-common-web/src/main/java/org/bigbluebutton/api/service/impl/RecordingServiceDbImpl.java
View File

@ -30,7 +30,7 @@ public class RecordingServiceDbImpl implements RecordingService {
private RecordingMetadataReaderHelper recordingServiceHelper;
private String recordStatusDir;
private String captionsDir;
private Boolean allowAllRecordingsRetrieval;
private Boolean allowFetchAllRecordings;
private String presentationBaseDir;
private String defaultServerUrl;
private String defaultTextTrackUrl;
@ -75,7 +75,7 @@ public class RecordingServiceDbImpl implements RecordingService {
@Override
public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters, int offset, Pageable pageable) {
// If no IDs or limit were provided return no recordings instead of every recording
if((idList == null || idList.isEmpty()) && pageable == null && !allowAllRecordingsRetrieval) return xmlService.noRecordings();
if((idList == null || idList.isEmpty()) && pageable == null && !allowFetchAllRecordings) return xmlService.noRecordings();
logger.info("Retrieving all recordings");
Set<Recording> recordings = new HashSet<>(dataStore.findAll(Recording.class));
@ -263,8 +263,8 @@ public class RecordingServiceDbImpl implements RecordingService {
captionsDir = dir;
}
public void setAllowAllRecordingsRetrieval(Boolean allowAllRecordingsRetrieval) {
this.allowAllRecordingsRetrieval = allowAllRecordingsRetrieval;
public void setAllowFetchAllRecordings(Boolean allowFetchAllRecordings) {
this.allowFetchAllRecordings = allowFetchAllRecordings;
}
public void setRecordingServiceHelper(RecordingMetadataReaderHelper r) {

6
bbb-common-web/src/main/java/org/bigbluebutton/api/service/impl/RecordingServiceFileImpl.java
View File

@ -62,7 +62,7 @@ public class RecordingServiceFileImpl implements RecordingService {
private XmlService xmlService;
private String recordStatusDir;
private String captionsDir;
private Boolean allowAllRecordingsRetrieval;
private Boolean allowFetchAllRecordings;
private String presentationBaseDir;
private String defaultServerUrl;
private String defaultTextTrackUrl;
@ -204,7 +204,7 @@ public class RecordingServiceFileImpl implements RecordingService {
public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters, int offset, Pageable pageable) {
// If no IDs or limit were provided return no recordings instead of every recording
if(idList.isEmpty() && pageable == null && !allowAllRecordingsRetrieval) return xmlService.noRecordings();
if(idList.isEmpty() && pageable == null && !allowFetchAllRecordings) return xmlService.noRecordings();
List<RecordingMetadata> recsList = getRecordingsMetadata(idList, states);
ArrayList<RecordingMetadata> recs = filterRecordingsByMetadata(recsList, metadataFilters);
@ -435,7 +435,7 @@ public class RecordingServiceFileImpl implements RecordingService {
captionsDir = dir;
}
public void setAllowAllRecordingsRetrieval(Boolean allowAllRecordingsRetrieval) { this.allowAllRecordingsRetrieval = allowAllRecordingsRetrieval; }
public void setAllowFetchAllRecordings(Boolean allowFetchAllRecordings) { this.allowFetchAllRecordings = allowFetchAllRecordings; }
public void setRecordingServiceHelper(RecordingMetadataReaderHelper r) {
recordingServiceHelper = r;

3
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -337,7 +337,8 @@ publishedDir=/var/bigbluebutton/published
unpublishedDir=/var/bigbluebutton/unpublished
captionsDir=/var/bigbluebutton/captions
allowAllRecordingsRetrieval=true
# Determines if the API should allow all recordings on the server to be returned in a single request
allowFetchAllRecordings=true
# The directory where the pre-built configs are stored
configDir=/var/bigbluebutton/configs

2
bigbluebutton-web/grails-app/conf/spring/resources.xml
View File

@ -102,7 +102,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="publishedDir" value="${publishedDir}"/>
<property name="unpublishedDir" value="${unpublishedDir}"/>
<property name="captionsDir" value="${captionsDir}"/>
<property name="allowAllRecordingsRetrieval" value="${allowAllRecordingsRetrieval}"/>
<property name="allowFetchAllRecordings" value="${allowFetchAllRecordings}"/>
<property name="recordingServiceHelper" ref="recordingServiceHelper"/>
<property name="xmlService" ref="xmlService" />
<property name="presentationBaseDir" value="${presentationDir}"/>