ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Add getSanitizedName to Model 

This method provides returns a name, which is safe to use with
filesystem I/O. Fc2Model returns the model ID for this.
This commit is contained in:
0xboobface 2019-02-19 15:28:52 +01:00
parent 75a625bbe0
commit e1eeb830da
8 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/ctbrec/ui/JavaFxModel.java
View File

@ -49,6 +49,11 @@ public class JavaFxModel implements Model {
delegate.setName(name);
}
@Override
public String getSanitizedNamed() {
return delegate.getSanitizedNamed();
}
@Override
public String getPreview() {
return delegate.getPreview();

2
client/src/main/java/ctbrec/ui/RecordedModelsTab.java
View File

@ -349,7 +349,7 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener {
.peek(fxm -> {
for (Recording recording : recordings) {
if(recording.getStatus() == Recording.State.RECORDING &&
recording.getModelName().equals(fxm.getName()))
recording.getModelName().equals(fxm.getSanitizedNamed()))
{
fxm.getRecordingProperty().set(true);
break;

6
common/src/main/java/ctbrec/AbstractModel.java
View File

@ -66,6 +66,12 @@ public abstract class AbstractModel implements Model {
this.displayName = name;
}
@Override
public String getSanitizedNamed() {
String sanitizedName = getName();
return sanitizedName.replace(' ', '_').replace('\\', '_').replace('/', '_');
}
@Override
public String getPreview() {
return preview;

6
common/src/main/java/ctbrec/Config.java
View File

@ -137,16 +137,16 @@ public class Config {
File dirForRecording = getDirForRecording(model);
SimpleDateFormat sdf = new SimpleDateFormat(RECORDING_DATE_FORMAT);
String startTime = sdf.format(new Date());
File targetFile = new File(dirForRecording, model.getName() + '_' + startTime + ".ts");
File targetFile = new File(dirForRecording, model.getSanitizedNamed() + '_' + startTime + ".ts");
return targetFile;
}
private File getDirForRecording(Model model) {
switch(getSettings().recordingsDirStructure) {
case ONE_PER_MODEL:
return new File(getSettings().recordingsDir, model.getName());
return new File(getSettings().recordingsDir, model.getSanitizedNamed());
case ONE_PER_RECORDING:
File modelDir = new File(getSettings().recordingsDir, model.getName());
File modelDir = new File(getSettings().recordingsDir, model.getSanitizedNamed());
SimpleDateFormat sdf = new SimpleDateFormat(RECORDING_DATE_FORMAT);
String startTime = sdf.format(new Date());
return new File(modelDir, startTime);

5
common/src/main/java/ctbrec/Model.java
View File

@ -46,6 +46,11 @@ public interface Model extends Comparable<Model> {
public void setName(String name);
/**
* Returns a name, which is safe to use with the filesystem
*/
public String getSanitizedNamed();
public String getPreview();
public void setPreview(String preview);

2
common/src/main/java/ctbrec/recorder/Recorder.java
View File

@ -59,7 +59,7 @@ public interface Recorder {
List<Recording> recordings = getRecordings();
return getModels().stream().filter(m -> {
for (Recording recording : recordings) {
if (recording.getStatus() == Recording.State.RECORDING && recording.getModelName().equals(m.getName())) {
if (recording.getStatus() == Recording.State.RECORDING && recording.getModelName().equals(m.getSanitizedNamed())) {
return true;
}
}

2
common/src/main/java/ctbrec/recorder/download/HlsDownload.java
View File

@ -58,7 +58,7 @@ public class HlsDownload extends AbstractHlsDownload {
super.model = model;
SimpleDateFormat sdf = new SimpleDateFormat(Config.RECORDING_DATE_FORMAT);
String startTime = sdf.format(new Date());
Path modelDir = FileSystems.getDefault().getPath(config.getSettings().recordingsDir, model.getName());
Path modelDir = FileSystems.getDefault().getPath(config.getSettings().recordingsDir, model.getSanitizedNamed());
downloadDir = FileSystems.getDefault().getPath(modelDir.toString(), startTime);
if(!model.isOnline()) {

5
common/src/main/java/ctbrec/sites/fc2live/Fc2Model.java
View File

@ -394,4 +394,9 @@ public class Fc2Model extends AbstractModel {
public void writeSiteSpecificData(JsonWriter writer) throws IOException {
writer.name("id").value(id);
}
@Override
public String getSanitizedNamed() {
return id;
}
}