From 6e2c8d17a1bca969d454fa3155a0391280ebd080 Mon Sep 17 00:00:00 2001 From: Justin Hawkins Date: Sun, 19 Nov 2023 20:58:26 +1030 Subject: [PATCH] I am a numpty, put the testdata in the right place. --- download/download_testdata.go | 15 ++++++++++++++- main.go | 29 ++--------------------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/download/download_testdata.go b/download/download_testdata.go index e555993..566d1c9 100644 --- a/download/download_testdata.go +++ b/download/download_testdata.go @@ -11,13 +11,26 @@ func (m *Manager) AddStressTestData(c *config.ConfigService) { "https://www.youtube.com/watch?v=ZUzhZpQAU40", "https://www.youtube.com/watch?v=kVxM3eRWGak", "https://www.youtube.com/watch?v=pl-y9869y0w", - "https://vimeo.com/783453809", "https://www.youtube.com/watch?v=Uw4NEPE4l3A", "https://www.youtube.com/watch?v=2RF0lcTuuYE", "https://www.youtube.com/watch?v=lymwNQY0dus", "https://www.youtube.com/watch?v=NTc-I4Z_duc", "https://www.youtube.com/watch?v=wNSm1TJ84Ac", + "https://www.youtube.com/watch?v=tyixMpuGEL8", + "https://www.youtube.com/watch?v=VnxbkH_3E_4", + "https://www.youtube.com/watch?v=VStscvYLYLs", + "https://www.youtube.com/watch?v=vYMiSz-WlEY", + "https://vimeo.com/786570322", + "https://vimeo.com/783453809", + + "https://www.gamespot.com/videos/survival-fps-how-metro-2033-solidified-a-subgenre/2300-6408243/", + "https://www.gamespot.com/videos/dirt-3-right-back-where-you-started-gameplay-movie/2300-6314712/", + "https://www.gamespot.com/videos/the-b-list-driver-san-francisco/2300-6405593/", + + "https://www.imdb.com/video/vi1914750745/?listId=ls053181649&ref_=hm_hp_i_hero-video-1_1", + "https://www.imdb.com/video/vi3879585561/?listId=ls053181649&ref_=vp_pl_ap_6", + "https://www.imdb.com/video/vi54445849/?listId=ls053181649&ref_=vp_nxt_btn", } for _, u := range urls { d := NewDownload(u, c.Config) diff --git a/main.go b/main.go index 27be245..f9f2a30 100644 --- a/main.go +++ b/main.go @@ -44,9 +44,7 @@ func main() { log.Printf("Starting gropple %s - https://github.com/tardisx/gropple", versionInfo.GetInfo().CurrentVersion) var configPath string - var testDownloads bool flag.StringVar(&configPath, "config-path", "", "path to config file") - flag.BoolVar(&testDownloads, "test-downloads", false, "queue up several downloads for testing purposes") flag.Parse() @@ -77,31 +75,6 @@ func main() { // create the download manager dm = &download.Manager{MaxPerDomain: configService.Config.Server.MaximumActiveDownloads} - if testDownloads { - dm.AddDownload(download.NewDownload("https://www.youtube.com/watch?v=tyixMpuGEL8", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.youtube.com/watch?v=VnxbkH_3E_4", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.youtube.com/watch?v=VStscvYLYLs", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.youtube.com/watch?v=vYMiSz-WlEY", configService.Config)) - - dm.AddDownload(download.NewDownload("https://www.gamespot.com/videos/survival-fps-how-metro-2033-solidified-a-subgenre/2300-6408243/", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.gamespot.com/videos/dirt-3-right-back-where-you-started-gameplay-movie/2300-6314712/", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.gamespot.com/videos/the-b-list-driver-san-francisco/2300-6405593/", configService.Config)) - - dm.AddDownload(download.NewDownload("https://www.imdb.com/video/vi1914750745/?listId=ls053181649&ref_=hm_hp_i_hero-video-1_1", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.imdb.com/video/vi3879585561/?listId=ls053181649&ref_=vp_pl_ap_6", configService.Config)) - dm.AddDownload(download.NewDownload("https://www.imdb.com/video/vi54445849/?listId=ls053181649&ref_=vp_nxt_btn", configService.Config)) - - if len(configService.Config.DownloadProfiles) == 0 { - panic("no profiles installed - cannot add test downloads") - } - profile := configService.Config.ProfileCalled(configService.Config.DownloadProfiles[0].Name) - for i := range dm.Downloads { - // set the profile and queue it - dm.Downloads[i].DownloadProfile = *profile - dm.Queue(dm.Downloads[i]) - } - } - r := mux.NewRouter() r.HandleFunc("/", homeHandler) r.HandleFunc("/static/{filename}", staticHandler) @@ -140,6 +113,8 @@ func main() { // start downloading queued downloads when slots available, and clean up // old entries go dm.ManageQueue() + + // add testdata if compiled with the '-tags testdata' flag dm.AddStressTestData(configService) log.Printf("Visit %s for details on installing the bookmarklet and to check status", configService.Config.Server.Address)