tnypxl/rollup
1
0
Fork 0
mirror of https://github.com/tnypxl/rollup.git synced 2025-12-13 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update getFilenameFromContent to handle invalid URLs and use .rollup.md suffix

Browse Source
This commit is contained in:
Arik Jones (aider)
2024-09-19 16:31:43 -05:00
parent 30e11153f9
commit 7c8fcc3261
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/web.go
View File

@@ -203,23 +203,23 @@ func extractAndConvertContent(urlStr string) (string, error) {
return header + markdown + "\n\n", nil
}
func getFilenameFromContent(content, urlStr string) string {
func getFilenameFromContent(content, urlStr string) (string, error) {
// Try to extract title from content
titleStart := strings.Index(content, "<title>")
titleEnd := strings.Index(content, "</title>")
if titleStart != -1 && titleEnd != -1 && titleEnd > titleStart {
title := content[titleStart+7 : titleEnd]
return sanitizeFilename(title) + ".md"
return sanitizeFilename(title) + ".rollup.md", nil
}
// If no title found, use the URL without the protocol
parsedURL, err := url.Parse(urlStr)
if err != nil {
return "untitled.md"
return "", fmt.Errorf("invalid URL: %v", err)
}
filename := parsedURL.Host + parsedURL.Path
return sanitizeFilename(filename) + ".md"
return sanitizeFilename(filename) + ".rollup.md", nil
}
func sanitizeFilename(name string) string {

26
cmd/web_test.go
View File

@@ -70,18 +70,28 @@ func TestGetFilenameFromContent(t *testing.T) {
content string
url string
expected string
expectErr bool
}{
{"<title>Test Page</title>", "http://example.com", "Test_Page.md"},
{"No title here", "http://example.com/page", "example_com_page.md"},
{"<title> Trim Me </title>", "http://example.com", "Trim_Me.md"},
{"<title></title>", "http://example.com", "example_com.md"},
{"Invalid URL", "not a valid url", "untitled.md"},
{"<title>Test Page</title>", "http://example.com", "Test_Page.rollup.md", false},
{"No title here", "http://example.com/page", "example_com_page.rollup.md", false},
{"<title> Trim Me </title>", "http://example.com", "Trim_Me.rollup.md", false},
{"<title></title>", "http://example.com", "example_com.rollup.md", false},
{"Invalid URL", "not a valid url", "", true},
}
for _, test := range tests {
result := getFilenameFromContent(test.content, test.url)
if result != test.expected {
t.Errorf("getFilenameFromContent(%q, %q) = %q; want %q", test.content, test.url, result, test.expected)
result, err := getFilenameFromContent(test.content, test.url)
if test.expectErr {
if err == nil {
t.Errorf("getFilenameFromContent(%q, %q) expected an error, but got none", test.content, test.url)
}
} else {
if err != nil {
t.Errorf("getFilenameFromContent(%q, %q) unexpected error: %v", test.content, test.url, err)
}
if result != test.expected {
t.Errorf("getFilenameFromContent(%q, %q) = %q; want %q", test.content, test.url, result, test.expected)
}
}
}
}