Iter9

.gitignore

@@ -21,3 +21,6 @@ vendor/
 # IDEs directories
 .idea
 .vscode
+cmd/.DS_Store
+.DS_Store
+/tmp

cmd/shortener/main.go

@@ -1,3 +1,24 @@
 package main
 
-func main() {}
+import (
+ "github.com/shilin-anton/urlreducer/internal/app/config"
+ filemanager "github.com/shilin-anton/urlreducer/internal/app/file-manager"
+ handler "github.com/shilin-anton/urlreducer/internal/app/handlers"
+ "github.com/shilin-anton/urlreducer/internal/app/storage"
+ "github.com/shilin-anton/urlreducer/internal/logger"
+ "log"
+ "net/http"
+)
+
+func main() {
+ config.ParseConfig()
+ err := logger.Initialize(config.LogLevel)
+ if err != nil {
+ log.Fatal("Error initializing logger")
+ }
+
+ fl := filemanager.New()
+ myStorage := storage.New(fl)
+ myHandler := handler.New(myStorage)
+ log.Fatal(http.ListenAndServe(config.RunAddr, myHandler))
+}

go.mod

@@ -0,0 +1,16 @@
+module github.com/shilin-anton/urlreducer
+
+go 1.21.3
+
+require (
+ github.com/go-chi/chi/v5 v5.0.11
+ github.com/stretchr/testify v1.8.1
+ go.uber.org/zap v1.27.0
+)
+
+require (
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ go.uber.org/multierr v1.10.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,25 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA=
+github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/app/config/config.go

@@ -0,0 +1,40 @@
+package config
+
+import (
+ "flag"
+ "os"
+)
+
+var RunAddr string
+var BaseAddr string
+var LogLevel string
+var FilePath string
+
+const (
+ defaultRunURL = "localhost:8080"
+ defaultBaseURL = "http://localhost:8080"
+ defaultLogLevel = "info"
+ defaultFilePath = "/tmp/short-url-db.json"
+)
+
+func ParseConfig() {
+ flag.StringVar(&RunAddr, "a", defaultRunURL, "address and port to run server")
+ flag.StringVar(&BaseAddr, "b", defaultBaseURL, "base URL before short link")
+ flag.StringVar(&LogLevel, "l", defaultLogLevel, "log level")
+ flag.StringVar(&FilePath, "f", defaultFilePath, "file storage path")
+
+ flag.Parse()
+
+ if envRunAddr := os.Getenv("SERVER_ADDRESS"); envRunAddr != "" {
+ RunAddr = envRunAddr
+ }
+ if envBaseAddr := os.Getenv("BASE_URL"); envBaseAddr != "" {
+ BaseAddr = envBaseAddr
+ }
+ if envLogLevel := os.Getenv("LOG_LEVEL"); envLogLevel != "" {
+ LogLevel = envLogLevel
+ }
+ if envFilePath := os.Getenv("FILE_STORAGE_PATH"); envFilePath != "" {
+ FilePath = envFilePath
+ }
+}

internal/app/file-manager/file-manager.go

@@ -0,0 +1,123 @@
+package filemanager
+
+import (
+ "bufio"
+ "encoding/json"
+ "github.com/shilin-anton/urlreducer/internal/app/config"
+ "log"
+ "os"
+)
+
+type record struct {
+ UUID string `json:"uuid"`
+ ShortURL string `json:"short_url"`
+ OriginalURL string `json:"original_url"`
+}
+
+type ExportedManager struct {
+}
+
+type FileWriter struct {
+ file *os.File
+ scanner *bufio.Scanner
+ writer *bufio.Writer
+}
+
+type FileReader struct {
+ file *os.File
+ scanner *bufio.Scanner
+}
+
+func NewWriter() (*FileWriter, error) {
+ file, err := os.OpenFile(config.FilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+ if err != nil {
+ return nil, err
+ }
+
+ return &FileWriter{
+ file: file,
+ scanner: bufio.NewScanner(file),
+ writer: bufio.NewWriter(file),
+ }, nil
+}
+
+func (fw *FileWriter) Close() error {
+ return fw.file.Close()
+}
+
+func NewReader() (*FileReader, error) {
+ file, err := os.OpenFile(config.FilePath, os.O_RDONLY|os.O_CREATE, 0666)
+ if err != nil {
+ return nil, err
+ }
+
+ return &FileReader{
+ file: file,
+ scanner: bufio.NewScanner(file),
+ }, nil
+}
+
+func (fr *FileReader) Close() {
+ fr.file.Close()
+}
+
+func New() *ExportedManager {
+ return &ExportedManager{}
+}
+
+func (em *ExportedManager) ReadFromFile(data map[string]string) {
+ if localStorageDisabled() {
+ return
+ }
+
+ reader, err := NewReader()
+ if err != nil {
+ log.Fatal("Error opening file:", err)
+ }
+ defer reader.Close()
+
+ for reader.scanner.Scan() {
+ line := reader.scanner.Bytes()
+
+ rec := &record{}
+ if err := json.Unmarshal(line, &rec); err != nil {
+ log.Fatal("Error decoding data from file:", err)
+ }
+ data[rec.ShortURL] = rec.OriginalURL
+ }
+
+ if err := reader.scanner.Err(); err != nil {
+ log.Fatal("Error scanning from file:", err)
+ }
+}
+
+func (em *ExportedManager) AddRecord(short string, url string, uuid string) error {
+ if localStorageDisabled() {
+ return nil
+ }
+
+ writer, err := NewWriter()
+ if err != nil {
+ return err
+ }
+ defer writer.Close()
+
+ newRecord := record{
+ UUID: uuid,
+ ShortURL: short,
+ OriginalURL: url,
+ }
+ recordJSON, err := json.Marshal(newRecord)
+ if err != nil {
+ return err
+ }
+ if _, err := writer.file.WriteString(string(recordJSON) + "\n"); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func localStorageDisabled() bool {
+ return config.FilePath == ""
+}

internal/app/gzip/gzip.go

@@ -0,0 +1,71 @@
+package gzip
+
+import (
+ "compress/gzip"
+ "io"
+ "net/http"
+)
+
+// compressWriter реализует интерфейс http.ResponseWriter и позволяет прозрачно для сервера
+// сжимать передаваемые данные и выставлять правильные HTTP-заголовки
+type compressWriter struct {
+ w http.ResponseWriter
+ zw *gzip.Writer
+}
+
+func NewCompressWriter(w http.ResponseWriter) *compressWriter {
+ return &compressWriter{
+ w: w,
+ zw: gzip.NewWriter(w),
+ }
+}
+
+func (c *compressWriter) Header() http.Header {
+ return c.w.Header()
+}
+
+func (c *compressWriter) Write(p []byte) (int, error) {
+ return c.zw.Write(p)
+}
+
+func (c *compressWriter) WriteHeader(statusCode int) {
+ if statusCode < 300 {
+ c.w.Header().Set("Content-Encoding", "gzip")
+ }
+ c.w.WriteHeader(statusCode)
+}
+
+// Close закрывает gzip.Writer и досылает все данные из буфера.
+func (c *compressWriter) Close() error {
+ return c.zw.Close()
+}
+
+// compressReader реализует интерфейс io.ReadCloser и позволяет прозрачно для сервера
+// декомпрессировать получаемые от клиента данные
+type compressReader struct {
+ r io.ReadCloser
+ zr *gzip.Reader
+}
+
+func NewCompressReader(r io.ReadCloser) (*compressReader, error) {
+ zr, err := gzip.NewReader(r)
+ if err != nil {
+ return nil, err
+ }
+
+ return &compressReader{
+ r: r,
+ zr: zr,
+ }, nil
+}
+
+func (c compressReader) Read(p []byte) (n int, err error) {
+ return c.zr.Read(p)
+}
+
+func (c *compressReader) Close() error {
+ if err := c.r.Close(); err != nil {
+ return err
+ }
+ return c.zr.Close()
+}