git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now deleting the link structure at startup and rebuilding it again
[utils]
/
mythtv
/
src
/
main
/
java
/
org
/
wamblee
/
mythtv
/
LinkStructure.java
diff --git
a/mythtv/src/main/java/org/wamblee/mythtv/LinkStructure.java
b/mythtv/src/main/java/org/wamblee/mythtv/LinkStructure.java
index 868ab09d9efa88be5068030140c9c842cbc62c7e..7effde65b830ce580600e97351d940c7b1dcb767 100644
(file)
--- a/
mythtv/src/main/java/org/wamblee/mythtv/LinkStructure.java
+++ b/
mythtv/src/main/java/org/wamblee/mythtv/LinkStructure.java
@@
-34,7
+34,7
@@
public class LinkStructure implements Listener {
private static final Log LOG = LogFactory.getLog(LinkStructure.class);
private static final Log LOG = LogFactory.getLog(LinkStructure.class);
- private String _monitorDir
= "/mnt/vcr"
;
+ private String _monitorDir;
private File _linkDir;
private File _linkDir;
@@
-47,11
+47,21
@@
public class LinkStructure implements Listener {
public LinkStructure(String aMonitorDir, File aLinkDir,
RecordingDatabase aDatabase) {
_monitorDir = aMonitorDir + "/";
public LinkStructure(String aMonitorDir, File aLinkDir,
RecordingDatabase aDatabase) {
_monitorDir = aMonitorDir + "/";
+ deleteDir(aLinkDir);
_linkDir = aLinkDir;
_database = aDatabase;
_format = new SimpleDateFormat("yyyy-MM-dd-HH:mm");
_recordings = new HashMap<File,Recording>();
}
_linkDir = aLinkDir;
_database = aDatabase;
_format = new SimpleDateFormat("yyyy-MM-dd-HH:mm");
_recordings = new HashMap<File,Recording>();
}
+
+ private void deleteDir(File aFile) {
+ for (File file: aFile.listFiles()) {
+ if ( file.isDirectory()) {
+ deleteDir(file);
+ }
+ LOG.info("File deleted " + file + ": " + file.delete());
+ }
+ }
/*
* (non-Javadoc)
/*
* (non-Javadoc)
@@
-118,7
+128,7
@@
public class LinkStructure implements Listener {
}
private String getDirectory(Recording aRecording) {
}
private String getDirectory(Recording aRecording) {
- return aRecording.getTitle();
+ return aRecording.getTitle()
.replaceAll("/", "-")
;
}
private FileType getFileType(File aFile) {
}
private FileType getFileType(File aFile) {
@@
-138,10
+148,10
@@
public class LinkStructure implements Listener {
}
private String getFilename(Recording aRecording, FileType aType) {
}
private String getFilename(Recording aRecording, FileType aType) {
- return _format.format(aRecording.getProgstart()) + "-"
+ return
(
_format.format(aRecording.getProgstart()) + "-"
+ aRecording.getSubtitle() + "-"
+ aRecording.getChannel().getName() + "."
+ aRecording.getSubtitle() + "-"
+ aRecording.getChannel().getName() + "."
- + aType.toString().toLowerCase();
+ + aType.toString().toLowerCase()
).replaceAll("/", "-")
;
}
private boolean exists(String aPath) {
}
private boolean exists(String aPath) {
@@
-197,5
+207,4
@@
public class LinkStructure implements Listener {
e);
}
}
e);
}
}
-
}
}