more stuff

sapht · Jan 15, 2012 · c69d4c8 · c69d4c8
1 parent 5f00d72
commit c69d4c8
Show file tree

Hide file tree

Showing 8 changed files with 321 additions and 209 deletions.
diff --git a/env_live.sh b/env_live.sh
@@ -3,3 +3,4 @@ export SAPHTUNE_SONG_DIR="/Volumes/Audio/Workspace/songs"
 export SAPHTUNE_ALBUM_DIR="/Volumes/Audio/Workspace/album"
 export SAPHTUNE_GIT_SONG_DIR="/Volumes/Audio/git/songs"
 export SAPHTUNE_GIT_ALBUM_DIR="/Volumes/Audio/git/album"
+export SAPHTUNE_CACHE_FILE="/Volumes/Audio/Workspace/saphtunes/cache.dat"
diff --git a/src/album.c b/src/album.c
@@ -12,19 +12,71 @@ album_create(char *root, char *name)
 
     git_load_generic(&r->git, root, name);
     r->path = r->git.path;
+    r->m3u_path = malloc(PATH_MAX_LEN * sizeof(char));
+    sprintf(r->m3u_path, "%s/%s/playlist.m3u", root, name);
     r->slug = name;
 
     /*printf("Album path is %s\n", r->path);*/
 
     return r;
 }
 
+void
+album_make_m3u(struct album *album)
+{
+    char *buf = malloc(sizeof(char) * album->songs.len * PATH_MAX_LEN);
+    FILE *fp = fopen(album->m3u_path, "w");
+    struct song *song;
+    for (int i=0; i<album->songs.len; i++) {
+        song = album->songs.e[i];
+        fwrite(song->render_path, strlen(song->render_path), 1, fp);
+        fwrite("\n", 1, 1, fp);
+    }
+
+    fclose(fp);
+}
+
+void
+album_list_make_m3u(struct album_list *album_list)
+{
+    struct album *album;
+    for(int i=0; i<album_list->len; i++) {
+        album = album_list->e[i];
+        album_make_m3u(album);
+    }
+}
+
+
+
 struct song_list *
 album_list_find_exclusions(
     struct album_list *album_list,
     struct song_list *song_list)
 {
-    return song_list;
+	struct song_list orphans;
+	orphans.e = malloc(1024 * sizeof(void*)); /* let's say max 1024 songs... */
+	orphans.len = 0;
+
+    for(int i=0; i<song_list->len; i++) {
+		int found = 0;
+		for(int j=0; j<album_list->len; j++) {
+			for(int k=0; k<album_list->e[j]->songs.len; k++) {
+				if (album_list->e[j]->songs.e[k] == song_list->e[i]) {
+					found = 1;
+				}
+			}
+		}
+
+		if(!found) {
+			orphans.e[
+				orphans.len++
+			] = song_list->e[i];
+		}
+	}
+
+	struct song_list *retval = malloc(sizeof(orphans));
+	*retval = orphans;
+	return retval;
 }
 
 void

diff --git a/src/album.h b/src/album.h
@@ -9,6 +9,7 @@
 struct album {
     char *slug;
     char *path;
+    char *m3u_path;
     struct git_repo git;
     struct song_list songs;
 };
@@ -18,6 +19,8 @@ struct album_list {
     int len;
 };
 
+void album_make_m3u(struct album *album);
+void album_list_make_m3u(struct album_list *album_list);
 int album_load_dir(char* dir, struct album_list *album_list);
 void album_list_match_songs(struct album_list *album_list, struct song_list *song_list);
 struct album * album_create(char *root, char *name);

diff --git a/src/git.c b/src/git.c
@@ -16,10 +16,10 @@ git_load_generic(struct git_repo *repo,
                  char *root, 
                  char *name)
 {
-    repo->path = malloc(255 * sizeof(char));
+    repo->path = malloc(PATH_MAX_LEN * sizeof(char));
     sprintf(repo->path, "%s/%s", root, name);
 
-    repo->config_path = malloc(255 * sizeof(char));
+    repo->config_path = malloc(PATH_MAX_LEN * sizeof(char));
     sprintf(repo->config_path, "%s/.git/config", repo->path);
 
     repo->status = 0;
@@ -143,7 +143,7 @@ git_repo_fill_submodules(struct git_repo *root_repo, char **paths)
 
     int path_num = 0;
 
-    char *submodule_dotfile_path = malloc(255);
+    char *submodule_dotfile_path = malloc(PATH_MAX_LEN * sizeof(char));
     sprintf(submodule_dotfile_path, "%s/%s", root_repo->path, ".gitmodules");
 
     FILE *fp = fopen(submodule_dotfile_path, "rb");

diff --git a/src/main.c b/src/main.c
@@ -13,13 +13,12 @@ static int load_data() {
     if ((st.p.song_dir      = getenv("SAPHTUNE_SONG_DIR")) == NULL ||
         (st.p.album_dir     = getenv("SAPHTUNE_ALBUM_DIR")) == NULL ||
         (st.p.song_git_dir  = getenv("SAPHTUNE_GIT_SONG_DIR")) == NULL ||
+        (st.p.cache         = getenv("SAPHTUNE_CACHE_FILE")) == NULL ||
         (st.p.album_git_dir = getenv("SAPHTUNE_GIT_ALBUM_DIR")) == NULL) {
         fprintf(stderr, "Could not load paths from env\n");
         exit(1);
     }
 
-    st.p.cache = "/tmp/saphtune-cache.dat";
-
     cache_load(st.p.cache);
 
     st.songs  = malloc(sizeof(struct song_list));
@@ -32,6 +31,8 @@ static int load_data() {
 
     printf("Matching album repos to songs...\n");
     album_list_match_songs(_st.albums, _st.songs);
+    printf("Making album m3u...\n");
+    album_list_make_m3u(_st.albums);
 
     return 1;
 }
@@ -45,14 +46,16 @@ static int main_from_args(int argc, char **argv)
             exit(1);
         }
 
-        struct song_list*orphans = album_list_find_exclusions(
+        struct song_list *orphans = album_list_find_exclusions(
             st.albums, st.songs
         );
+
         if (orphans->len > 0) {
             for (int i=0; i<orphans->len; i++) {
                 printf("%s\n", orphans->e[i]->slug);
             }
         }
+
     } else if (strcmp(argv[1], "analyze") == 0) {
         printf("Supercool analyze finder initialized\n");
         struct song_render_stat stat = song_render_analyze(argv[2]);

diff --git a/src/ui_common.c b/src/ui_common.c
@@ -16,39 +16,6 @@ song_format_duration(int duration)
 	return retval;
 }
 
-void
-ui_fill_song_list(GtkWidget *song_list_wdg, 
-                  struct song_list *song_list)
-{
-    GtkTreeIter song_iter;
-    gtk_list_store_clear(GTK_LIST_STORE(song_list_wdg));
-
-    int j, i;
-    for(i=0; i<song_list->len; i++) {
-        j=i;
-        if (song_list != st.songs) {
-            /* Find matching real id */
-            for(j=0; j<st.songs->len; j++) {
-                if(st.songs->e[j] == song_list->e[i]) { break; }
-            }
-        }
-
-        char *duration = song_format_duration(
-			song_list->e[i]->render_stat.duration
-		);
-
-        gtk_list_store_append(GTK_LIST_STORE(song_list_wdg), &song_iter);
-        gtk_list_store_set(GTK_LIST_STORE(song_list_wdg),
-                           &song_iter,
-                           0, j,
-                           1, song_list->e[i]->slug,
-                           2, duration,
-                           3, song_list->e[i]->render_stat.nullspace,
-                           4, song_list->e[i]->render_stat.clipping,
-                           5, (0 != song_list->e[i]->git.status),
-                           -1);
-    }
-}
 
 int
 treesel_offset_item(