engines.netnaija: passing movieIndex

Author: deven96

engine/fzmovies.go

@@ -72,7 +72,9 @@ func (engine *FzEngine) parseSingleMovie(el *colly.HTMLElement, index int) (Movi
 	// Remove all Video: or Movie: Prefixes
 	movie.UploadDate = strings.TrimSpace(el.ChildTexts("small")[1])
 	movie.Title = strings.TrimSuffix(strings.TrimSpace(el.ChildText("b")), "<more>")
-	movie.Description = strings.TrimSpace(el.ChildTexts("small")[3])
+	if len(el.ChildTexts("small")) > 3 {
+		movie.Description = strings.TrimSpace(el.ChildTexts("small")[3])
+	}
 	downloadLink, err := url.Parse(el.Request.AbsoluteURL(el.ChildAttr("a", "href")))
 
 	if err != nil {
@@ -97,8 +99,11 @@ func (engine *FzEngine) updateDownloadProps(downloadCollector *colly.Collector,
 		}
 		movie.DownloadLink = downloadLink
 		re := regexp.MustCompile(`(.* MB)`)
-		dl := strings.TrimPrefix(re.FindStringSubmatch(e.ChildText("dcounter"))[0], "(")
-		movie.Size = dl
+		stringsub := re.FindStringSubmatch(e.ChildText("dcounter"))
+		if len(stringsub) > 0 {
+			dl := strings.TrimPrefix(stringsub[0], "(")
+			movie.Size = dl
+		}
 		downloadCollector.Visit(downloadLink.String())
 	})
 

engine/netnaija.go

@@ -122,12 +122,17 @@ func (engine *NetNaijaEngine) updateDownloadProps(downloadCollector *colly.Colle
 	})
 
 	downloadCollector.OnHTML("h3.file-name", func(e *colly.HTMLElement) {
+		movieIndex := getMovieIndexFromCtx(e.Request)
+		movie := &((*movies)[movieIndex])
 		downloadLink, err := url.Parse(path.Join(strings.TrimSpace(e.ChildAttr("a", "href")), "download"))
 		if err != nil {
 			log.Fatal(err)
 		}
-		(*movies)[getMovieIndexFromCtx(e.Request)].DownloadLink = downloadLink
-		downloadCollector.Visit(e.ChildAttr("a", "href"))
+		movie.DownloadLink = downloadLink
+		// downloadCollector.Visit(e.ChildAttr("a", "href"))
+		ctx := colly.NewContext()
+		ctx.Put("movieIndex", strconv.Itoa(movieIndex))
+		downloadCollector.Request("GET", e.ChildAttr("a", "href"), nil, ctx, nil)
 	})
 
 	downloadCollector.OnHTML("div.video-about", func(e *colly.HTMLElement) {
@@ -145,7 +150,9 @@ func (engine *NetNaijaEngine) updateDownloadProps(downloadCollector *colly.Colle
 			movie.DownloadLink = downloadLink
 		}
 		if !strings.HasSuffix(movie.DownloadLink.String(), "?d=1") {
-			downloadCollector.Visit(movie.DownloadLink.String())
+			ctx := colly.NewContext()
+			ctx.Put("movieIndex", strconv.Itoa(movieIndex))
+			downloadCollector.Request("GET", movie.DownloadLink.String(), nil, ctx, nil)
 		}
 	})