When attaching files to a post tagged with a project, copy the attach…

…ed files to the project directory too

bin/journal-server/journal-server.go

@@ -323,10 +323,13 @@ func readAttachmentHashes(r *http.Request) []string {
 }
 
 func saveJournalEntry(timestamp time.Time, contents string, project string, attachmentIDs []string, starred bool) error {
+	project_attachments_dir := ""
 	var nonFatalError error
 	if project != "" && *projects_dir != "" {
-		prf := path.Join(*projects_dir, strings.Replace(strings.Replace(project, "/", "", -1), "\\", "", -1))
+		proj := strings.Replace(strings.Replace(project, "/", "", -1), "\\", "", -1)
+		prf := path.Join(*projects_dir, proj)
 		if f, err := os.OpenFile(prf, os.O_APPEND|os.O_WRONLY, 0600); err == nil {
+			project_attachments_dir = path.Join(*projects_dir, stripProjectSuffix(proj))
 			fmt.Fprintf(f, "\n=== %s ===\n%s\n", timestamp.Format("2006-01-02"), contents)
 			f.Close()
 		}
@@ -353,6 +356,17 @@ func saveJournalEntry(timestamp time.Time, contents string, project string, atta
 			}
 			f.Write(entry.Buf)
 			f.Close()
+
+			if project_attachments_dir != "" {
+				os.MkdirAll(project_attachments_dir, 0755)
+				f, err := os.Create(path.Join(project_attachments_dir, att_hash))
+				if err != nil {
+					nonFatalError = err
+					continue
+				}
+				f.Write(entry.Buf)
+				f.Close()
+			}
 		}
 	}
 

bin/journal-server/plumbing.go

@@ -17,13 +17,17 @@ var daily *template.Template
 var bwvlist *template.Template
 var tie *template.Template
 
-func formatProjectName(name string) string {
+func stripProjectSuffix(name string) string {
 	if len(name) > 4 && name[len(name)-4:] == ".txt" {
 		name = name[:len(name)-5]
 	} else if len(name) > 5 && name[len(name)-5:] == ".wiki" {
 		name = name[:len(name)-5]
 	}
+	return name
+}
 
+func formatProjectName(name string) string {
+	name = stripProjectSuffix(name)
 	name = strings.Replace(name, "_", " ", -1)
 
 	return name