From f1cbc7348014d7fb926adf65c52e9a94701f8eaf Mon Sep 17 00:00:00 2001 From: Dimitris Kazakos Date: Wed, 20 Apr 2011 20:32:33 +0300 Subject: [PATCH] Also delete created directories (if they exist and are empty) when deleting a recording file from disk --- src/dvr/dvr_db.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index acc626fa..4bd16a03 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -1192,6 +1192,34 @@ dvr_entry_delete(dvr_entry_t *de) if(unlink(de->de_filename) && errno != ENOENT) tvhlog(LOG_WARNING, "dvr", "Unable to remove file '%s' from disk -- %s", de->de_filename, strerror(errno)); + + /* Also delete directories, if they were created for the recording and if they are empty */ + + dvr_config_t *cfg = dvr_config_find_by_name_default(de->de_config_name); + char path[500]; + + snprintf(path, sizeof(path), "%s", cfg->dvr_storage); + + if(cfg->dvr_flags & DVR_DIR_PER_TITLE || cfg->dvr_flags & DVR_DIR_PER_CHANNEL || cfg->dvr_flags & DVR_DIR_PER_DAY) { + char *p; + int l; + + l = strlen(de->de_filename); + p = alloca(l + 1); + memcpy(p, de->de_filename, l); + p[l--] = 0; + + for(; l >= 0; l--) { + if(p[l] == '/') { + p[l] = 0; + if(strncmp(p, cfg->dvr_storage, strlen(p)) == 0) + break; + if(rmdir(p) == -1) + break; + } + } + } + } dvr_entry_remove(de); }