csv reader shouldn't return error about lazy quotes from now, lang versions are sorted alphabetically
This commit is contained in:
parent
8bec38dae5
commit
fc0af6a9f3
|
@ -145,7 +145,7 @@ func (h *handler) createSchema(server *models.Server) error {
|
||||||
func (h *handler) getServers() ([]*models.Server, map[string]string, error) {
|
func (h *handler) getServers() ([]*models.Server, map[string]string, error) {
|
||||||
log.Print("Loading servers...")
|
log.Print("Loading servers...")
|
||||||
langVersions := []*models.LangVersion{}
|
langVersions := []*models.LangVersion{}
|
||||||
if err := h.db.Model(&langVersions).Relation("SpecialServers").Select(); err != nil {
|
if err := h.db.Model(&langVersions).Relation("SpecialServers").Order("tag ASC").Select(); err != nil {
|
||||||
return nil, nil, errors.Wrap(err, "getServers")
|
return nil, nil, errors.Wrap(err, "getServers")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,13 +16,19 @@ var client = &http.Client{
|
||||||
Timeout: 20 * time.Second,
|
Timeout: 20 * time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newCsvReader(r io.Reader) *csv.Reader {
|
||||||
|
csvReader := csv.NewReader(r)
|
||||||
|
csvReader.LazyQuotes = true
|
||||||
|
return csvReader
|
||||||
|
}
|
||||||
|
|
||||||
func uncompressAndReadCsvLines(r io.Reader) ([][]string, error) {
|
func uncompressAndReadCsvLines(r io.Reader) ([][]string, error) {
|
||||||
uncompressedStream, err := gzip.NewReader(r)
|
uncompressedStream, err := gzip.NewReader(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return [][]string{}, err
|
return [][]string{}, err
|
||||||
}
|
}
|
||||||
defer uncompressedStream.Close()
|
defer uncompressedStream.Close()
|
||||||
return csv.NewReader(uncompressedStream).ReadAll()
|
return newCsvReader(uncompressedStream).ReadAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
func getCSVData(url string, compressed bool) ([][]string, error) {
|
func getCSVData(url string, compressed bool) ([][]string, error) {
|
||||||
|
@ -32,7 +38,7 @@ func getCSVData(url string, compressed bool) ([][]string, error) {
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
if !compressed {
|
if !compressed {
|
||||||
return csv.NewReader(resp.Body).ReadAll()
|
return newCsvReader(resp.Body).ReadAll()
|
||||||
}
|
}
|
||||||
return uncompressAndReadCsvLines(resp.Body)
|
return uncompressAndReadCsvLines(resp.Body)
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue
Block a user