pk
/
rss-dl
mirror of https://github.com/pikami/rss-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove HTTP GET params from saving file path

This commit is contained in:
Pijus Kamandulis 2019-06-20 22:49:19 +03:00
parent 63d39f225e
commit 881f1aec48
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpers/string_methods.go
View File

@ -3,6 +3,7 @@ package helpers
import ( import (
"log" "log"
"regexp" "regexp"
"strings"
) )
// ToCleanString - replaces spaces with underscores // ToCleanString - replaces spaces with underscores
@ -13,3 +14,8 @@ func ToCleanString(str string) string {
} }
return reg.ReplaceAllString(str, "_") return reg.ReplaceAllString(str, "_")
} }
// RemoveGetParams - removes http GET params
func RemoveGetParams(str string) string {
return strings.Split(str, "?")[0]
}

7
main.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings"
. "./fileio" . "./fileio"
. "./helpers" . "./helpers"
@ -26,7 +25,7 @@ func main() {
LogInfo("Writing feed details as JSON to " + feedInfoPath) LogInfo("Writing feed details as JSON to " + feedInfoPath)
WriteToFile(feedInfoPath, GrabFeedDetailsJSON(feed)) WriteToFile(feedInfoPath, GrabFeedDetailsJSON(feed))
feedImagePath := outputDir + "/image" + filepath.Ext(feed.Image.URL) feedImagePath := outputDir + "/image" + RemoveGetParams(filepath.Ext(feed.Image.URL))
DownloadFile(feedImagePath, feed.Image.URL) DownloadFile(feedImagePath, feed.Image.URL)
for _, item := range feed.Items { for _, item := range feed.Items {
@ -48,14 +47,14 @@ func main() {
itemDetailsPath, itemDetailsPath,
GrabFeedItemJSON(item)) GrabFeedItemJSON(item))
itemImagePath := itemOutputDir + "/image" + filepath.Ext(item.Image.URL) itemImagePath := itemOutputDir + "/image" + RemoveGetParams(filepath.Ext(item.Image.URL))
LogInfo("Downloading image to " + itemImagePath) LogInfo("Downloading image to " + itemImagePath)
DownloadFile( DownloadFile(
itemImagePath, itemImagePath,
item.Image.URL) item.Image.URL)
for _, enclosure := range item.Enclosures { for _, enclosure := range item.Enclosures {
filename := strings.Split(filepath.Base(enclosure.URL), "?")[0] filename := RemoveGetParams(filepath.Base(enclosure.URL))
LogInfo("Downloading attachment '" + filename + "'") LogInfo("Downloading attachment '" + filename + "'")
DownloadFile( DownloadFile(
itemOutputDir+"/"+filename, itemOutputDir+"/"+filename,