Fix add html/rss not working if previous add failed and .in_progress still exists

3 files changed, 17 insertions, 9 deletions

diff --git a/automedia b/automedia
index fda2bc7..1144b10 100755
--- a/automedia
+++ b/automedia
diff --git a/src/html.c b/src/html.c
index 6977770..6442188 100644
--- a/src/html.c
+++ b/src/html.c
@@ -259,7 +259,11 @@ int add_html(const char *name, const char *url, char *html_config_dir, char *pro
     strcat(html_tracked_dir, "/tracked/");
     strcat(html_tracked_dir, name);
 
-    if(file_exists(html_tracked_dir) == 0) {
+    char in_progress_filepath[PATH_MAX];
+    strcpy(in_progress_filepath, html_tracked_dir);
+    strcat(in_progress_filepath, "/.in_progress");
+
+    if(file_exists(html_tracked_dir) == 0 && file_exists(in_progress_filepath) != 0) {
         fprintf(stderr, "You are already tracking %s\n", url);
         result = -1;
         goto cleanup;
@@ -275,12 +279,11 @@ int add_html(const char *name, const char *url, char *html_config_dir, char *pro
         Create an ".in_progress" file to prevent periodic sync from reading rss data
         before we have finished adding all the data.
     */
-    char in_progress_filepath[PATH_MAX];
-    strcpy(in_progress_filepath, html_tracked_dir);
-    strcat(in_progress_filepath, "/.in_progress");
+    remove(in_progress_filepath);
     result = create_lock_file(in_progress_filepath);
     if(result != 0) {
         fprintf(stderr, "Failed to create %s/.in_progress\n", html_tracked_dir);
+        remove(html_tracked_dir);
         goto cleanup;
     }
 
@@ -300,7 +303,7 @@ int add_html(const char *name, const char *url, char *html_config_dir, char *pro
     }
 
     char updated[32];
-    assert(sizeof(time_t) == 4);
+    assert(sizeof(time_t) == sizeof(long));
     sprintf(updated, "%ld", time(NULL));
     result = file_overwrite_in_dir(html_tracked_dir, "updated", updated, strlen(updated));
     if(result != 0) {
diff --git a/src/rss.c b/src/rss.c
index 0f3aafd..c71c1ce 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -299,6 +299,8 @@ static int get_rss_url_from_episode_info(const char *episode_name, EpisodeInfo *
     return 0;
 }
 
+/* TODO: Fix the remove() calls. They wont work since they are not recursive and the directories has files in them */
+/* Same for add_html */
 int add_rss(const char *name, const char *url, char *rss_config_dir, const char *start_after) {
     int result = 0;
 
@@ -364,7 +366,11 @@ int add_rss(const char *name, const char *url, char *rss_config_dir, const char
     strcat(rss_tracked_dir, "/tracked/");
     strcat(rss_tracked_dir, name);
 
-    if(file_exists(rss_tracked_dir) == 0) {
+    char in_progress_filepath[PATH_MAX];
+    strcpy(in_progress_filepath, rss_tracked_dir);
+    strcat(in_progress_filepath, "/.in_progress");
+
+    if(file_exists(rss_tracked_dir) == 0 && file_exists(in_progress_filepath) != 0) {
         fprintf(stderr, "You are already tracking %s\n", url);
         result = -1;
         goto cleanup;
@@ -380,12 +386,11 @@ int add_rss(const char *name, const char *url, char *rss_config_dir, const char
         Create an ".in_progress" file to prevent periodic sync from reading rss data
         before we have finished adding all the data.
     */
-    char in_progress_filepath[PATH_MAX];
-    strcpy(in_progress_filepath, rss_tracked_dir);
-    strcat(in_progress_filepath, "/.in_progress");
+    remove(in_progress_filepath);
     result = create_lock_file(in_progress_filepath);
     if(result != 0) {
         fprintf(stderr, "Failed to create %s/.in_progress\n", rss_tracked_dir);
+        remove(rss_tracked_dir);
         goto cleanup;
     }