From aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 20 Jan 2016 13:36:16 -0600 Subject: Revert " PLT-7 adding loc for db calls" --- api/export.go | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'api/export.go') diff --git a/api/export.go b/api/export.go index 39d6c4389..fa9686005 100644 --- a/api/export.go +++ b/api/export.go @@ -6,12 +6,10 @@ package api import ( "archive/zip" "encoding/json" - "io" - "os" - "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" - goi18n "github.com/nicksnyder/go-i18n/i18n" + "io" + "os" ) const ( @@ -53,19 +51,19 @@ func ExportOptionsFromJson(data io.Reader) *ExportOptions { return &o } -func ExportToFile(T goi18n.TranslateFunc, options *ExportOptions) (link string, err *model.AppError) { +func ExportToFile(options *ExportOptions) (link string, err *model.AppError) { // Open file for export if file, err := openFileWriteStream(EXPORT_PATH + EXPORT_FILENAME); err != nil { return "", err } else { defer closeFileWriteStream(file) - ExportToWriter(T, file, options) + ExportToWriter(file, options) } return "/api/v1/files/get_export", nil } -func ExportToWriter(T goi18n.TranslateFunc, w io.Writer, options *ExportOptions) *model.AppError { +func ExportToWriter(w io.Writer, options *ExportOptions) *model.AppError { // Open a writer to write to zip file zipWriter := zip.NewWriter(w) defer zipWriter.Close() @@ -80,23 +78,23 @@ func ExportToWriter(T goi18n.TranslateFunc, w io.Writer, options *ExportOptions) } // Export Teams - ExportTeams(T, zipWriter, options) + ExportTeams(zipWriter, options) return nil } -func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions) *model.AppError { +func ExportTeams(writer ExportWriter, options *ExportOptions) *model.AppError { // Get the teams var teams []*model.Team if len(options.TeamsToExport) == 0 { - if result := <-Srv.Store.Team().GetAll(T); result.Err != nil { + if result := <-Srv.Store.Team().GetAll(); result.Err != nil { return result.Err } else { teams = result.Data.([]*model.Team) } } else { for _, teamId := range options.TeamsToExport { - if result := <-Srv.Store.Team().Get(T, teamId); result.Err != nil { + if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { return result.Err } else { team := result.Data.(*model.Team) @@ -122,10 +120,10 @@ func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt // Export the channels, local storage and users for _, team := range teams { - if err := ExportChannels(T, writer, options, team.Id); err != nil { + if err := ExportChannels(writer, options, team.Id); err != nil { return err } - if err := ExportUsers(T, writer, options, team.Id); err != nil { + if err := ExportUsers(writer, options, team.Id); err != nil { return err } if err := ExportLocalStorage(writer, options, team.Id); err != nil { @@ -136,18 +134,18 @@ func ExportTeams(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt return nil } -func ExportChannels(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { +func ExportChannels(writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { // Get the channels var channels []*model.Channel if len(options.ChannelsToExport) == 0 { - if result := <-Srv.Store.Channel().GetForExport(T, teamId); result.Err != nil { + if result := <-Srv.Store.Channel().GetForExport(teamId); result.Err != nil { return result.Err } else { channels = result.Data.([]*model.Channel) } } else { for _, channelId := range options.ChannelsToExport { - if result := <-Srv.Store.Channel().Get(T, channelId); result.Err != nil { + if result := <-Srv.Store.Channel().Get(channelId); result.Err != nil { return result.Err } else { channel := result.Data.(*model.Channel) @@ -158,7 +156,7 @@ func ExportChannels(T goi18n.TranslateFunc, writer ExportWriter, options *Export for i := range channels { // Get members - mchan := Srv.Store.Channel().GetMembers(T, channels[i].Id) + mchan := Srv.Store.Channel().GetMembers(channels[i].Id) // Sanitize channels[i].PreExport() @@ -192,7 +190,7 @@ func ExportChannels(T goi18n.TranslateFunc, writer ExportWriter, options *Export } for _, channel := range channels { - if err := ExportPosts(T, writer, options, channel.Id); err != nil { + if err := ExportPosts(writer, options, channel.Id); err != nil { return err } } @@ -200,10 +198,10 @@ func ExportChannels(T goi18n.TranslateFunc, writer ExportWriter, options *Export return nil } -func ExportPosts(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions, channelId string) *model.AppError { +func ExportPosts(writer ExportWriter, options *ExportOptions, channelId string) *model.AppError { // Get the posts var posts []*model.Post - if result := <-Srv.Store.Post().GetForExport(T, channelId); result.Err != nil { + if result := <-Srv.Store.Post().GetForExport(channelId); result.Err != nil { return result.Err } else { posts = result.Data.([]*model.Post) @@ -225,10 +223,10 @@ func ExportPosts(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOpt return nil } -func ExportUsers(T goi18n.TranslateFunc, writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { +func ExportUsers(writer ExportWriter, options *ExportOptions, teamId string) *model.AppError { // Get the users var users []*model.User - if result := <-Srv.Store.User().GetForExport(T, teamId); result.Err != nil { + if result := <-Srv.Store.User().GetForExport(teamId); result.Err != nil { return result.Err } else { users = result.Data.([]*model.User) -- cgit v1.2.3-1-g7c22