Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: run goimports-reviser happy #548

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/server/routes/daemon/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (
"net/http"
"runtime"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api"
"github.com/blacktop/ipsw/api/types"
"github.com/gin-gonic/gin"
)

// AddRoutes adds the download routes to the router
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/devicelist/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (
"net/http"
"sort"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/pkg/xcode"
"github.com/gin-gonic/gin"
)

// swagger:response
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/diff/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"path/filepath"

"github.com/aymanbagabas/go-udiff"
"github.com/blacktop/ipsw/api/types"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
)

// swagger:parameters postDiffFiles postDiffBlobs
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/download/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package download
import (
"net/http"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/commands/download/ipsw"
"github.com/gin-gonic/gin"
)

func downloadIPSW(c *gin.Context) {
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/dsc/dsc.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ import (
"strings"

"github.com/blacktop/go-macho"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
cmd "github.com/blacktop/ipsw/internal/commands/dsc"
"github.com/blacktop/ipsw/internal/demangle"
"github.com/blacktop/ipsw/internal/swift"
"github.com/blacktop/ipsw/pkg/dyld"
"github.com/gin-gonic/gin"
)

// swagger:parameters postDscAddrToOff
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/extract/extract.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (
"net/http"
"path/filepath"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/internal/commands/extract"
"github.com/blacktop/ipsw/internal/utils"
"github.com/gin-gonic/gin"
)

// The extract response message
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/idev/idev.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import (
"net/http"
"time"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/usb"
"github.com/blacktop/ipsw/pkg/usb/amfi"
"github.com/blacktop/ipsw/pkg/usb/heartbeat"
"github.com/blacktop/ipsw/pkg/usb/lockdownd"
"github.com/gin-gonic/gin"
)

// swagger:response idevInfoResponse
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/info/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"net/http"
"strconv"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/download"
"github.com/blacktop/ipsw/pkg/info"
"github.com/gin-gonic/gin"
)

// swagger:response
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/ipsw/ipsw.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ import (

"github.com/apex/log"
"github.com/blacktop/go-plist"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/commands/ent"
"github.com/blacktop/ipsw/internal/commands/extract"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/aea"
"github.com/blacktop/ipsw/pkg/info"
"github.com/gin-gonic/gin"
)

// swagger:model
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/kernel/kernel.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"net/http"

"github.com/blacktop/go-macho"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/pkg/kernelcache"
"github.com/gin-gonic/gin"
)

// swagger:response kernelKextsResponse
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/macho/macho.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"strings"

"github.com/blacktop/go-macho"
"github.com/blacktop/ipsw/api/types"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
)

// Info is the struct for the macho info route parameters
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/mount/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"path/filepath"
"slices"

"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/commands/mount"
"github.com/blacktop/ipsw/pkg/info"
"github.com/gin-gonic/gin"
)

// swagger:response
Expand Down
3 changes: 2 additions & 1 deletion api/server/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
package routes

import (
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api/server/routes/daemon"
"github.com/blacktop/ipsw/api/server/routes/devicelist"
"github.com/blacktop/ipsw/api/server/routes/diff"
Expand All @@ -14,7 +16,6 @@ import (
"github.com/blacktop/ipsw/api/server/routes/kernel"
"github.com/blacktop/ipsw/api/server/routes/macho"
"github.com/blacktop/ipsw/api/server/routes/mount"
"github.com/gin-gonic/gin"
)

// Add adds the command routes to the router
Expand Down
5 changes: 3 additions & 2 deletions api/server/routes/syms/syms.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import (
"net/http"
"path/filepath"

"github.com/gin-gonic/gin"
"github.com/spf13/cast"

"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/db"
"github.com/blacktop/ipsw/internal/model"
"github.com/blacktop/ipsw/internal/syms"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
)

// swagger:response
Expand Down
3 changes: 2 additions & 1 deletion api/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ import (
"time"

"github.com/apex/log"
"github.com/gin-gonic/gin"

"github.com/blacktop/ipsw/api"
"github.com/blacktop/ipsw/api/server/routes"
"github.com/blacktop/ipsw/api/server/routes/aea"
"github.com/blacktop/ipsw/api/server/routes/syms"
"github.com/blacktop/ipsw/api/types"
"github.com/blacktop/ipsw/internal/db"
"github.com/gin-gonic/gin"
)

// Config is the server config
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/appstore/appstore_bundle_cap_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_bundle_ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import (
"fmt"

"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/appstore/appstore_cert_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ import (
"path/filepath"

"github.com/apex/log"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_cert_ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import (
"fmt"

"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/appstore/appstore_cert_rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_device_ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import (
"fmt"

"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_device_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_device_reg.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import (
"fmt"

"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_profile_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_profile_ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import (
"fmt"

"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ipsw/cmd/appstore/appstore_profile_renew.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/internal/utils"
"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/appstore/appstore_profile_rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/apex/log"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/pkg/appstore"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/appstore/appstore_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ import (
"time"

"github.com/apex/log"
"github.com/blacktop/ipsw/pkg/appstore"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/blacktop/ipsw/pkg/appstore"
)

// ASTokenCmd represents the appstore token command
Expand Down
3 changes: 2 additions & 1 deletion cmd/ipsw/cmd/apsctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ package cmd
import (
"fmt"

"github.com/blacktop/ipsw/internal/apsd"
"github.com/spf13/cobra"

"github.com/blacktop/ipsw/internal/apsd"
)

func init() {
Expand Down
Loading