From 1bb57bc94afa3a5f2b664fb9c0be3f6d29cee422 Mon Sep 17 00:00:00 2001 From: kenneth Date: Fri, 1 Dec 2023 02:46:50 +0000 Subject: [PATCH] v0.1 --- internal/db/models.go | 16 + internal/db/querier.go | 8 + internal/db/query/video.sql | 58 +++ .../db/schema/000001_init_schema.down.sql | 1 + internal/db/schema/000001_init_schema.up.sql | 38 +- internal/db/video.sql.go | 337 ++++++++++++++++++ internal/handlers/base.go | 6 +- internal/handlers/home.go | 27 +- internal/handlers/middleware.go | 20 +- internal/handlers/server.go | 14 +- internal/handlers/upload.go | 71 +++- internal/handlers/user.go | 3 +- internal/handlers/video.go | 271 +++++++++++++- internal/pkg/fileutil/fileutil.go | 81 ++++- main.go | 4 + web/statics/css/index.css | 34 +- web/statics/js/jquery.min.js | 2 + web/templates/base/footer.html.tmpl | 2 +- web/templates/base/header.html.tmpl | 11 +- web/templates/home.html.tmpl | 60 +--- web/templates/me/videos.html.tmpl | 73 ++++ web/templates/user/login.html.tmpl | 56 +-- web/templates/user/register.html.tmpl | 75 ++-- web/templates/video/edit.html.tmpl | 126 +++++++ web/templates/video/play.html.tmpl | 44 ++- web/templates/video/transfer.html.tmpl | 43 +++ 26 files changed, 1312 insertions(+), 169 deletions(-) create mode 100644 internal/db/query/video.sql create mode 100644 internal/db/video.sql.go create mode 100644 web/statics/js/jquery.min.js create mode 100644 web/templates/me/videos.html.tmpl create mode 100644 web/templates/video/edit.html.tmpl create mode 100644 web/templates/video/transfer.html.tmpl diff --git a/internal/db/models.go b/internal/db/models.go index bb95f3d..d735d91 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -15,3 +15,19 @@ type User struct { Email string `json:"email"` CreatedAt time.Time `json:"created_at"` } + +type Video struct { + ID string `json:"id"` + Title string `json:"title"` + Description string `json:"description"` + Images string `json:"images"` + OriginLink string `json:"origin_link"` + PlayLink string `json:"play_link"` + Status int32 `json:"status"` + IsDeleted bool `json:"is_deleted"` + UserID string `json:"user_id"` + CreateAt time.Time `json:"create_at"` + CreateBy string `json:"create_by"` + UpdateAt time.Time `json:"update_at"` + UpdateBy string `json:"update_by"` +} diff --git a/internal/db/querier.go b/internal/db/querier.go index 9384c95..058f681 100644 --- a/internal/db/querier.go +++ b/internal/db/querier.go @@ -10,12 +10,20 @@ import ( type Querier interface { CreateUser(ctx context.Context, arg CreateUserParams) (User, error) + CreateVideo(ctx context.Context, arg CreateVideoParams) (Video, error) DeleteUser(ctx context.Context, id string) error + DeleteVideo(ctx context.Context, id string) error GetUser(ctx context.Context, id string) (User, error) GetUserByEmail(ctx context.Context, email string) (User, error) GetUserByName(ctx context.Context, username string) (User, error) + GetVideo(ctx context.Context, id string) (Video, error) ListUsers(ctx context.Context, arg ListUsersParams) ([]User, error) + ListVideos(ctx context.Context, arg ListVideosParams) ([]Video, error) + ListVideosByUser(ctx context.Context, arg ListVideosByUserParams) ([]Video, error) + SetVideoPlay(ctx context.Context, arg SetVideoPlayParams) (Video, error) UpdateUser(ctx context.Context, arg UpdateUserParams) (User, error) + UpdateVideo(ctx context.Context, arg UpdateVideoParams) (Video, error) + UpdateVideoStatus(ctx context.Context, arg UpdateVideoStatusParams) (Video, error) } var _ Querier = (*Queries)(nil) diff --git a/internal/db/query/video.sql b/internal/db/query/video.sql new file mode 100644 index 0000000..6ef89ee --- /dev/null +++ b/internal/db/query/video.sql @@ -0,0 +1,58 @@ +-- name: CreateVideo :one +INSERT INTO videos ( + id, title, description, images, origin_link, play_link, user_id, create_by +) VALUES ( + $1, $2, $3, $4, $5, $6, $7, $8 +) +RETURNING *; + +-- name: DeleteVideo :exec +UPDATE videos +SET is_deleted = TRUE +WHERE id = $1; + +-- name: UpdateVideoStatus :one +UPDATE videos +SET status = $2, + update_at = $3, + update_by = $4 +WHERE id = $1 +RETURNING *; + +-- name: SetVideoPlay :one +UPDATE videos +SET status = $2, + play_link = $3, + update_at = $4, + update_by = $5 +WHERE id = $1 +RETURNING *; + +-- name: UpdateVideo :one +UPDATE videos +SET title = $2, + description = $3, + images = $4, + status = $5, + update_at = $6, + update_by = $7 +WHERE id = $1 +RETURNING *; + +-- name: GetVideo :one +SELECT * FROM videos +WHERE id = $1 LIMIT 1; + +-- name: ListVideos :many +SELECT * FROM videos +WHERE is_deleted = FALSE AND status=200 +ORDER BY id DESC +LIMIT $1 +OFFSET $2; + +-- name: ListVideosByUser :many +SELECT * FROM videos +WHERE is_deleted = FALSE AND user_id = $1 +ORDER BY id DESC +LIMIT $2 +OFFSET $3; \ No newline at end of file diff --git a/internal/db/schema/000001_init_schema.down.sql b/internal/db/schema/000001_init_schema.down.sql index ca6df84..8607dc0 100644 --- a/internal/db/schema/000001_init_schema.down.sql +++ b/internal/db/schema/000001_init_schema.down.sql @@ -1 +1,2 @@ +DROP TABLE "videos"; DROP TABLE "users"; \ No newline at end of file diff --git a/internal/db/schema/000001_init_schema.up.sql b/internal/db/schema/000001_init_schema.up.sql index 2ba3064..42d5470 100644 --- a/internal/db/schema/000001_init_schema.up.sql +++ b/internal/db/schema/000001_init_schema.up.sql @@ -1,7 +1,39 @@ CREATE TABLE "users" ( "id" varchar NOT NULL PRIMARY KEY, - "username" varchar NOT NULL UNIQUE, + "username" varchar NOT NULL, "hashed_password" varchar NOT NULL, - "email" varchar NOT NULL UNIQUE, + "email" varchar NOT NULL, "created_at" timestamptz NOT NULL DEFAULT (now()) -); \ No newline at end of file +); + +ALTER TABLE "users" ADD CONSTRAINT "username_key" UNIQUE ("username"); +ALTER TABLE "users" ADD CONSTRAINT "email_key" UNIQUE ("email"); +CREATE INDEX ON "users" ("username"); +CREATE INDEX ON "users" ("email"); + +CREATE TABLE "videos" ( + "id" varchar NOT NULL PRIMARY KEY, + "title" varchar NOT NULL, + "description" varchar NOT NULL, + "images" varchar NOT NULL, + "origin_link" varchar NOT NULL, + "play_link" varchar NOT NULL, + -- 100: 下架 + -- 0: 添加视频 + -- 1: 视频转码中 + -- 2: 视频转码失败 + -- 200: 视频正常显示播放 + "status" int NOT NULL DEFAULT (0), + "is_deleted" boolean NOT NULL DEFAULT false, -- 删除 + "user_id" varchar NOT NULL, + "create_at" timestamptz NOT NULL DEFAULT (now()), + "create_by" varchar NOT NULL, + "update_at" timestamptz NOT NULL DEFAULT('0001-01-01 00:00:00Z'), + "update_by" varchar NOT NULL DEFAULT ('') +); + +ALTER TABLE "videos" ADD FOREIGN KEY ("user_id") REFERENCES "users" ("id"); +CREATE INDEX ON "videos" ("status"); +CREATE INDEX ON "videos" ("user_id", "status", "create_at"); +CREATE INDEX ON "videos" ("title"); +CREATE INDEX ON "videos" ("user_id", "title"); \ No newline at end of file diff --git a/internal/db/video.sql.go b/internal/db/video.sql.go new file mode 100644 index 0000000..ae82de7 --- /dev/null +++ b/internal/db/video.sql.go @@ -0,0 +1,337 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.24.0 +// source: video.sql + +package db + +import ( + "context" + "time" +) + +const createVideo = `-- name: CreateVideo :one +INSERT INTO videos ( + id, title, description, images, origin_link, play_link, user_id, create_by +) VALUES ( + $1, $2, $3, $4, $5, $6, $7, $8 +) +RETURNING id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by +` + +type CreateVideoParams struct { + ID string `json:"id"` + Title string `json:"title"` + Description string `json:"description"` + Images string `json:"images"` + OriginLink string `json:"origin_link"` + PlayLink string `json:"play_link"` + UserID string `json:"user_id"` + CreateBy string `json:"create_by"` +} + +func (q *Queries) CreateVideo(ctx context.Context, arg CreateVideoParams) (Video, error) { + row := q.db.QueryRowContext(ctx, createVideo, + arg.ID, + arg.Title, + arg.Description, + arg.Images, + arg.OriginLink, + arg.PlayLink, + arg.UserID, + arg.CreateBy, + ) + var i Video + err := row.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ) + return i, err +} + +const deleteVideo = `-- name: DeleteVideo :exec +UPDATE videos +SET is_deleted = TRUE +WHERE id = $1 +` + +func (q *Queries) DeleteVideo(ctx context.Context, id string) error { + _, err := q.db.ExecContext(ctx, deleteVideo, id) + return err +} + +const getVideo = `-- name: GetVideo :one +SELECT id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by FROM videos +WHERE id = $1 LIMIT 1 +` + +func (q *Queries) GetVideo(ctx context.Context, id string) (Video, error) { + row := q.db.QueryRowContext(ctx, getVideo, id) + var i Video + err := row.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ) + return i, err +} + +const listVideos = `-- name: ListVideos :many +SELECT id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by FROM videos +WHERE is_deleted = FALSE AND status=200 +ORDER BY id DESC +LIMIT $1 +OFFSET $2 +` + +type ListVideosParams struct { + Limit int32 `json:"limit"` + Offset int32 `json:"offset"` +} + +func (q *Queries) ListVideos(ctx context.Context, arg ListVideosParams) ([]Video, error) { + rows, err := q.db.QueryContext(ctx, listVideos, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + items := []Video{} + for rows.Next() { + var i Video + if err := rows.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const listVideosByUser = `-- name: ListVideosByUser :many +SELECT id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by FROM videos +WHERE is_deleted = FALSE AND user_id = $1 +ORDER BY id DESC +LIMIT $2 +OFFSET $3 +` + +type ListVideosByUserParams struct { + UserID string `json:"user_id"` + Limit int32 `json:"limit"` + Offset int32 `json:"offset"` +} + +func (q *Queries) ListVideosByUser(ctx context.Context, arg ListVideosByUserParams) ([]Video, error) { + rows, err := q.db.QueryContext(ctx, listVideosByUser, arg.UserID, arg.Limit, arg.Offset) + if err != nil { + return nil, err + } + defer rows.Close() + items := []Video{} + for rows.Next() { + var i Video + if err := rows.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const setVideoPlay = `-- name: SetVideoPlay :one +UPDATE videos +SET status = $2, + play_link = $3, + update_at = $4, + update_by = $5 +WHERE id = $1 +RETURNING id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by +` + +type SetVideoPlayParams struct { + ID string `json:"id"` + Status int32 `json:"status"` + PlayLink string `json:"play_link"` + UpdateAt time.Time `json:"update_at"` + UpdateBy string `json:"update_by"` +} + +func (q *Queries) SetVideoPlay(ctx context.Context, arg SetVideoPlayParams) (Video, error) { + row := q.db.QueryRowContext(ctx, setVideoPlay, + arg.ID, + arg.Status, + arg.PlayLink, + arg.UpdateAt, + arg.UpdateBy, + ) + var i Video + err := row.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ) + return i, err +} + +const updateVideo = `-- name: UpdateVideo :one +UPDATE videos +SET title = $2, + description = $3, + images = $4, + status = $5, + update_at = $6, + update_by = $7 +WHERE id = $1 +RETURNING id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by +` + +type UpdateVideoParams struct { + ID string `json:"id"` + Title string `json:"title"` + Description string `json:"description"` + Images string `json:"images"` + Status int32 `json:"status"` + UpdateAt time.Time `json:"update_at"` + UpdateBy string `json:"update_by"` +} + +func (q *Queries) UpdateVideo(ctx context.Context, arg UpdateVideoParams) (Video, error) { + row := q.db.QueryRowContext(ctx, updateVideo, + arg.ID, + arg.Title, + arg.Description, + arg.Images, + arg.Status, + arg.UpdateAt, + arg.UpdateBy, + ) + var i Video + err := row.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ) + return i, err +} + +const updateVideoStatus = `-- name: UpdateVideoStatus :one +UPDATE videos +SET status = $2, + update_at = $3, + update_by = $4 +WHERE id = $1 +RETURNING id, title, description, images, origin_link, play_link, status, is_deleted, user_id, create_at, create_by, update_at, update_by +` + +type UpdateVideoStatusParams struct { + ID string `json:"id"` + Status int32 `json:"status"` + UpdateAt time.Time `json:"update_at"` + UpdateBy string `json:"update_by"` +} + +func (q *Queries) UpdateVideoStatus(ctx context.Context, arg UpdateVideoStatusParams) (Video, error) { + row := q.db.QueryRowContext(ctx, updateVideoStatus, + arg.ID, + arg.Status, + arg.UpdateAt, + arg.UpdateBy, + ) + var i Video + err := row.Scan( + &i.ID, + &i.Title, + &i.Description, + &i.Images, + &i.OriginLink, + &i.PlayLink, + &i.Status, + &i.IsDeleted, + &i.UserID, + &i.CreateAt, + &i.CreateBy, + &i.UpdateAt, + &i.UpdateBy, + ) + return i, err +} diff --git a/internal/handlers/base.go b/internal/handlers/base.go index 70d8561..1035537 100644 --- a/internal/handlers/base.go +++ b/internal/handlers/base.go @@ -14,9 +14,9 @@ const ( type CtxTypeUser string -type authorize struct { - AuthID string `json:"auth_id"` - AuthName string `json:"auth_name"` +type Authorize struct { + ID string `json:"id"` + Name string `json:"name"` } func genId() string { diff --git a/internal/handlers/home.go b/internal/handlers/home.go index 5c81696..1d5daaf 100644 --- a/internal/handlers/home.go +++ b/internal/handlers/home.go @@ -1,20 +1,39 @@ package handlers import ( + "log" "net/http" + "strings" + + "github.com/zhang2092/mediahls/internal/db" ) type pageData struct { - AuthID string - AuthName string + Authorize + Videos []db.Video } func (server *Server) home(w http.ResponseWriter, r *http.Request) { pd := pageData{} auth, err := server.withCookie(r) if err == nil { - pd.AuthID = auth.AuthID - pd.AuthName = auth.AuthName + pd.Authorize = *auth + } + + ctx := r.Context() + videos, err := server.store.ListVideos(ctx, db.ListVideosParams{ + Limit: 100, + Offset: 0, + }) + if err == nil { + for _, item := range videos { + if len(item.Description) > 65 { + temp := strings.TrimSpace(item.Description[0:65]) + "..." + item.Description = temp + log.Println(item.Description) + } + pd.Videos = append(pd.Videos, item) + } } renderHome(w, pd) } diff --git a/internal/handlers/middleware.go b/internal/handlers/middleware.go index 10222ac..b92ff11 100644 --- a/internal/handlers/middleware.go +++ b/internal/handlers/middleware.go @@ -30,14 +30,14 @@ func (server *Server) authorizeMiddleware(next http.Handler) http.Handler { }) } -func (server *Server) withCookie(r *http.Request) (*authorize, error) { +func (server *Server) withCookie(r *http.Request) (*Authorize, error) { cookie, err := r.Cookie(AuthorizeCookie) if err != nil { log.Printf("get cookie: %v", err) return nil, err } - u := &authorize{} + u := &Authorize{} err = server.secureCookie.Decode(AuthorizeCookie, cookie.Value, u) if err != nil { log.Printf("secure decode cookie: %v", err) @@ -47,19 +47,13 @@ func (server *Server) withCookie(r *http.Request) (*authorize, error) { return u, nil } -func withUser(ctx context.Context) *authorize { - var result authorize +func withUser(ctx context.Context) Authorize { + var result Authorize ctxValue, err := convert.ToByteE(ctx.Value(ContextUser)) - log.Printf("ctx: %s", ctxValue) if err != nil { - log.Printf("1: %v", err) - return nil - } - err = json.Unmarshal(ctxValue, &result) - if err != nil { - log.Printf("2: %v", err) - return nil + return result } - return &result + json.Unmarshal(ctxValue, &result) + return result } diff --git a/internal/handlers/server.go b/internal/handlers/server.go index 2b2a023..069e2ad 100644 --- a/internal/handlers/server.go +++ b/internal/handlers/server.go @@ -55,6 +55,7 @@ func (server *Server) setupRouter() { router := mux.NewRouter() router.Use(mux.CORSMethodMiddleware(router)) router.PathPrefix("/statics/").Handler(http.StripPrefix("/statics/", http.FileServer(http.Dir("web/statics")))) + router.PathPrefix("/upload/imgs").Handler(http.StripPrefix("/upload/imgs/", http.FileServer(http.Dir("upload/imgs")))) router.HandleFunc("/register", server.registerView).Methods(http.MethodGet) router.HandleFunc("/register", server.register).Methods(http.MethodPost) @@ -68,8 +69,17 @@ func (server *Server) setupRouter() { subRouter := router.PathPrefix("/").Subrouter() subRouter.Use(server.authorizeMiddleware) - subRouter.HandleFunc("/upload", server.uploadView).Methods(http.MethodGet) - subRouter.HandleFunc("/upload", server.upload).Methods(http.MethodPost) + subRouter.HandleFunc("/me/videos", server.videosView).Methods(http.MethodGet) + subRouter.HandleFunc("/me/videos/p{page}", server.videosView).Methods(http.MethodGet) + + subRouter.HandleFunc("/me/videos/create", server.createVideoView).Methods(http.MethodGet) + subRouter.HandleFunc("/me/videos/create/{xid}", server.createVideoView).Methods(http.MethodGet) + subRouter.HandleFunc("/me/videos/create", server.createVideo).Methods(http.MethodPost) + + subRouter.HandleFunc("/upload_image", server.uploadImage).Methods(http.MethodPost) + subRouter.HandleFunc("/upload_file", server.uploadVideo).Methods(http.MethodPost) + subRouter.HandleFunc("/transfer/{xid}", server.transferView).Methods(http.MethodGet) + subRouter.HandleFunc("/transfer/{xid}", server.transfer).Methods(http.MethodPost) server.router = router } diff --git a/internal/handlers/upload.go b/internal/handlers/upload.go index 146bee3..ada9043 100644 --- a/internal/handlers/upload.go +++ b/internal/handlers/upload.go @@ -1,6 +1,8 @@ package handlers import ( + "bufio" + "errors" "io" "log" "net/http" @@ -13,17 +15,7 @@ import ( "github.com/zhang2092/mediahls/internal/pkg/fileutil" ) -func (server *Server) uploadView(w http.ResponseWriter, r *http.Request) { - user := withUser(r.Context()) - log.Printf("%v", user) - renderUpload(w, nil) -} - -func renderUpload(w http.ResponseWriter, data any) { - render(w, data, "web/templates/me/upload.html.tmpl", "web/templates/base/header.html.tmpl", "web/templates/base/footer.html.tmpl") -} - -func (server *Server) upload(w http.ResponseWriter, r *http.Request) { +func (server *Server) uploadVideo(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() file, fileHeader, err := r.FormFile("file") @@ -56,7 +48,8 @@ func (server *Server) upload(w http.ResponseWriter, r *http.Request) { return } - dir := path.Join("upload", time.Now().Format("20060102")) + curTime := time.Now() + dir := path.Join("upload", "files", curTime.Format("2006"), curTime.Format("01"), curTime.Format("02")) exist, _ := fileutil.PathExists(dir) if !exist { err := os.MkdirAll(dir, os.ModePerm) @@ -87,6 +80,60 @@ func (server *Server) upload(w http.ResponseWriter, r *http.Request) { return } + w.WriteHeader(http.StatusOK) + _, err = w.Write([]byte("/" + filePath)) + if err != nil { + log.Printf("%v", err) + } +} + +func (server *Server) uploadImage(w http.ResponseWriter, r *http.Request) { + defer func(Body io.ReadCloser) { + _ = Body.Close() + }(r.Body) + + _, fh, err := r.FormFile("file") + if err != nil { + w.WriteHeader(http.StatusBadRequest) + _, err = w.Write([]byte(err.Error())) + if err != nil { + log.Printf("%v", err) + } + return + } + + f, err := fh.Open() + if err != nil { + log.Printf("%v", err) + w.WriteHeader(http.StatusInternalServerError) + _, err = w.Write([]byte("读取图片失败")) + if err != nil { + log.Printf("%v", err) + } + return + } + reader := bufio.NewReader(f) + filePath, err := fileutil.UploadImage(reader) + if errors.Is(err, fileutil.ErrUnsupportedFileFormat) { + log.Printf("%v", err) + w.WriteHeader(http.StatusUnsupportedMediaType) + _, err = w.Write([]byte(fileutil.ErrUnsupportedFileFormat.Error())) + if err != nil { + log.Printf("%v", err) + } + return + } + + if err != nil { + log.Printf("%v", err) + w.WriteHeader(http.StatusInternalServerError) + _, err = w.Write([]byte(err.Error())) + if err != nil { + log.Printf("%v", err) + } + return + } + w.WriteHeader(http.StatusOK) _, err = w.Write([]byte(filePath)) if err != nil { diff --git a/internal/handlers/user.go b/internal/handlers/user.go index 13d27a4..3cc44c9 100644 --- a/internal/handlers/user.go +++ b/internal/handlers/user.go @@ -61,6 +61,7 @@ func viladatorRegister(email, username, password string) (*respErrs, bool) { } type respErrs struct { + Authorize Summary string Email string Username string @@ -191,7 +192,7 @@ func (server *Server) login(w http.ResponseWriter, r *http.Request) { return } - encoded, err := server.secureCookie.Encode(AuthorizeCookie, &authorize{AuthID: user.ID, AuthName: user.Username}) + encoded, err := server.secureCookie.Encode(AuthorizeCookie, &Authorize{ID: user.ID, Name: user.Username}) if err != nil { errs.Summary = "请求网络错误,请刷新重试(cookie)" renderLogin(w, errs) diff --git a/internal/handlers/video.go b/internal/handlers/video.go index 17f34a6..b5cf4a2 100644 --- a/internal/handlers/video.go +++ b/internal/handlers/video.go @@ -1,28 +1,36 @@ package handlers import ( + "context" "fmt" "net/http" + "strconv" + "strings" + "time" "github.com/gorilla/mux" + "github.com/zhang2092/mediahls/internal/db" + "github.com/zhang2092/mediahls/internal/pkg/convert" + "github.com/zhang2092/mediahls/internal/pkg/fileutil" + "github.com/zhang2092/mediahls/internal/pkg/logger" ) type playData struct { - AuthID string - AuthName string - Url string + Authorize + Url string + Video db.Video } func (server *Server) play(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) xid := vars["xid"] + video, _ := server.store.GetVideo(r.Context(), xid) data := playData{ - Url: "/media/" + xid + "/stream/", + Video: video, } auth, err := server.withCookie(r) if err == nil { - data.AuthID = auth.AuthID - data.AuthName = auth.AuthName + data.Authorize = *auth } render(w, data, "web/templates/video/play.html.tmpl", "web/templates/base/header.html.tmpl", "web/templates/base/footer.html.tmpl") } @@ -43,10 +51,7 @@ http.ServeContent(w, r, "git", time.Now(), video) func (server *Server) stream(response http.ResponseWriter, request *http.Request) { vars := mux.Vars(request) mId := vars["xid"] - fmt.Println(mId) - segName, ok := vars["segName"] - if !ok { mediaBase := getMediaBase(mId) m3u8Name := "index.m3u8" @@ -55,29 +60,261 @@ func (server *Server) stream(response http.ResponseWriter, request *http.Request mediaBase := getMediaBase(mId) serveHlsTs(response, request, mediaBase, segName) } - } + func getMediaBase(mId string) string { mediaRoot := "media" return fmt.Sprintf("%s/%s", mediaRoot, mId) } func serveHlsM3u8(w http.ResponseWriter, r *http.Request, mediaBase, m3u8Name string) { - fmt.Println("serveHlsM3u8...") - mediaFile := fmt.Sprintf("%s/%s", mediaBase, m3u8Name) - fmt.Println(mediaFile) http.ServeFile(w, r, mediaFile) w.Header().Set("Content-Type", "application/x-mpegURL") } func serveHlsTs(w http.ResponseWriter, r *http.Request, mediaBase, segName string) { - fmt.Println("serveHlsTs...") - mediaFile := fmt.Sprintf("%s/%s", mediaBase, segName) - fmt.Println(mediaFile) - http.ServeFile(w, r, mediaFile) w.Header().Set("Content-Type", "video/MP2T") } + +type meVideoData struct { + Authorize + Videos []db.Video +} + +func (server *Server) videosView(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + data := meVideoData{ + Authorize: withUser(ctx), + } + + vars := mux.Vars(r) + page, err := strconv.Atoi(vars["page"]) + if err != nil { + page = 1 + } + videos, err := server.store.ListVideosByUser(ctx, db.ListVideosByUserParams{ + UserID: data.Authorize.ID, + Limit: 16, + Offset: int32((page - 1) * 16), + }) + if err == nil { + for _, item := range videos { + if len(item.Description) > 65 { + temp := strings.TrimSpace(item.Description[0:65]) + "..." + item.Description = temp + } + data.Videos = append(data.Videos, item) + } + } + + render(w, data, "web/templates/me/videos.html.tmpl", "web/templates/base/header.html.tmpl", "web/templates/base/footer.html.tmpl") +} + +func (server *Server) createVideoView(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + xid := vars["xid"] + vm := videoCreateResp{ + Authorize: withUser(r.Context()), + } + if len(xid) > 0 { + if v, err := server.store.GetVideo(r.Context(), xid); err == nil { + vm.ID = v.ID + vm.Title = v.Title + vm.Images = v.Images + vm.Description = v.Description + vm.OriginLink = v.OriginLink + vm.Status = int(v.Status) + } + } + renderCreateVideo(w, vm) +} + +func renderCreateVideo(w http.ResponseWriter, data any) { + render(w, data, "web/templates/video/edit.html.tmpl", "web/templates/base/header.html.tmpl", "web/templates/base/footer.html.tmpl") +} + +type videoCreateResp struct { + Authorize + Summary string + ID string + IDErr string + Title string + TitleErr string + Images string + ImagesErr string + Description string + DescriptionErr string + OriginLink string + OriginLinkErr string + Status int + StatusErr string +} + +func viladatorCreateVedio(r *http.Request) (*videoCreateResp, bool) { + ok := true + status, _ := strconv.Atoi(r.PostFormValue("status")) + errs := &videoCreateResp{ + Authorize: withUser(r.Context()), + ID: r.PostFormValue("id"), + Title: r.PostFormValue("title"), + Images: r.PostFormValue("images"), + Description: r.PostFormValue("description"), + OriginLink: r.PostFormValue("origin_link"), + Status: status, + } + + if len(errs.Title) == 0 { + errs.TitleErr = "请填写正确的标题" + ok = false + } + + exist, _ := fileutil.PathExists(strings.TrimPrefix(errs.Images, "/")) + if !exist { + errs.ImagesErr = "请先上传图片" + ok = false + } + + if len(errs.Description) == 0 { + errs.DescriptionErr = "请填写描述" + ok = false + } + + exist, _ = fileutil.PathExists(strings.TrimPrefix(errs.OriginLink, "/")) + if !exist { + errs.OriginLinkErr = "请先上传视频" + ok = false + } + + return errs, ok +} + +func (server *Server) createVideo(w http.ResponseWriter, r *http.Request) { + defer r.Body.Close() + + if err := r.ParseForm(); err != nil { + renderCreateVideo(w, videoCreateResp{Summary: "请求网络错误, 请刷新重试"}) + return + } + + vm, ok := viladatorCreateVedio(r) + if !ok { + renderCreateVideo(w, vm) + return + } + + curTime := time.Now() + ctx := r.Context() + u := withUser(ctx) + if len(vm.ID) == 0 { + _, err := server.store.CreateVideo(ctx, db.CreateVideoParams{ + ID: genId(), + Title: vm.Title, + Description: vm.Description, + Images: vm.Images, + OriginLink: vm.OriginLink, + PlayLink: "", + UserID: u.ID, + CreateBy: u.Name, + }) + if err != nil { + vm.Summary = "添加视频失败" + renderCreateVideo(w, vm) + return + } + } else { + _, err := server.store.UpdateVideo(ctx, db.UpdateVideoParams{ + ID: vm.ID, + Title: vm.Title, + Description: vm.Description, + Images: vm.Images, + Status: int32(vm.Status), + UpdateAt: curTime, + UpdateBy: u.Name, + }) + if err != nil { + vm.Summary = "更新视频失败" + renderCreateVideo(w, vm) + return + } + } + + http.Redirect(w, r, "/me/videos", http.StatusFound) +} + +type transferData struct { + Authorize + Video db.Video +} + +func (server *Server) transferView(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + xid := vars["xid"] + v, _ := server.store.GetVideo(r.Context(), xid) + data := transferData{ + Video: v, + } + u, err := server.withCookie(r) + if err == nil { + data.Authorize = *u + } + render(w, data, "web/templates/video/transfer.html.tmpl", "web/templates/base/header.html.tmpl", "web/templates/base/footer.html.tmpl") +} + +func (server *Server) transfer(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + xid := vars["xid"] + ctx := r.Context() + v, err := server.store.GetVideo(ctx, xid) + if err != nil { + http.Error(w, "视频信息错误", http.StatusInternalServerError) + return + } + + u := withUser(ctx) + v, err = server.store.UpdateVideoStatus(ctx, db.UpdateVideoStatusParams{ + ID: v.ID, + Status: 1, + UpdateAt: time.Now(), + UpdateBy: u.Name, + }) + if err != nil { + http.Error(w, "视频转码错误", http.StatusInternalServerError) + return + } + + go func(v db.Video, name string) { + ctx := context.Background() + err := convert.ConvertHLS("media/"+v.ID+"/", strings.TrimPrefix(v.OriginLink, "/")) + if err != nil { + logger.Logger.Errorf("Convert HLS [%s]-[%s]: %v", v.ID, v.OriginLink, err) + _, _ = server.store.UpdateVideoStatus(ctx, db.UpdateVideoStatusParams{ + ID: v.ID, + Status: 2, + UpdateAt: time.Now(), + UpdateBy: name, + }) + return + } + + // 转码成功 + if _, err = server.store.SetVideoPlay(ctx, db.SetVideoPlayParams{ + ID: v.ID, + Status: 200, + PlayLink: "/media/" + v.ID + "/stream/", + UpdateAt: time.Now(), + UpdateBy: name, + }); err != nil { + logger.Logger.Errorf("Set Video Play [%s]-[%s]: %v", v.ID, v.OriginLink, err) + return + } + + logger.Logger.Infof("[%s]-[%s] 转码完成", v.ID, v.OriginLink) + }(v, u.Name) + + w.WriteHeader(http.StatusOK) + w.Write([]byte("视频正在转码中, 请稍后刷新页面")) +} diff --git a/internal/pkg/fileutil/fileutil.go b/internal/pkg/fileutil/fileutil.go index 96820c7..7cc4d8c 100644 --- a/internal/pkg/fileutil/fileutil.go +++ b/internal/pkg/fileutil/fileutil.go @@ -1,6 +1,28 @@ package fileutil -import "os" +import ( + "errors" + "fmt" + "image" + "image/gif" + "image/jpeg" + "image/png" + "io" + "os" + "path" + "time" + + nanoId "github.com/matoous/go-nanoid" +) + +var ( + // 图片最大数量 + MaxImageSize = 10 << 20 + ErrUnsupportedFileFormat = errors.New("图片格式不支持") + ErrFileStorePath = errors.New("文件存储路径异常") + ErrFileGenerateName = errors.New("文件名称生成异常") + ErrFileSaveFailed = errors.New("文件保存失败") +) func PathExists(path string) (bool, error) { _, err := os.Stat(path) @@ -12,3 +34,60 @@ func PathExists(path string) (bool, error) { } return false, err } + +func Mkdir(path string) error { + return os.MkdirAll(path, os.ModePerm) +} + +func UploadImage(r io.Reader) (string, error) { + img, format, err := image.Decode(r) + if err != nil { + return "", fmt.Errorf("读取图片错误") + } + if errors.Is(err, image.ErrFormat) { + return "", ErrUnsupportedFileFormat + } + if format != "png" && format != "jpeg" && format != "gif" { + return "", ErrUnsupportedFileFormat + } + + // 存放目录 + curTime := time.Now() + dir := path.Join("upload", "imgs", curTime.Format("2006"), curTime.Format("01"), curTime.Format("02")) + exist, _ := PathExists(dir) + if !exist { + err := Mkdir(dir) + if err != nil { + return "", ErrFileStorePath + } + } + + filename, err := nanoId.Nanoid() + if err != nil { + return "", ErrFileGenerateName + } + + filePath := path.Join("", dir, filename+"."+format) + f, err := os.Create(filePath) + if err != nil { + return "", ErrFileStorePath + } + defer func(f *os.File) { + _ = f.Close() + }(f) + + var e error + switch format { + case "png": + e = png.Encode(f, img) + case "jpeg": + e = jpeg.Encode(f, img, nil) + case "gif": + e = gif.Encode(f, img, nil) + } + if e != nil { + return "", ErrFileSaveFailed + } + + return "/" + filePath, nil +} diff --git a/main.go b/main.go index a53c0ff..6fa88a3 100644 --- a/main.go +++ b/main.go @@ -11,6 +11,10 @@ import ( ) func main() { + // filename, _ := nanoId.Nanoid() + // log.Println(filename) + // return + config, err := config.LoadConfig(".") if err != nil { log.Fatal("cannot load config: ", err) diff --git a/web/statics/css/index.css b/web/statics/css/index.css index 85d8fc5..58f9107 100644 --- a/web/statics/css/index.css +++ b/web/statics/css/index.css @@ -1,5 +1,11 @@ @charset "utf-8"; +html, +body { + /* 禁用空格键的滚动 */ + scroll-behavior: auto; +} + .flex { display: flex; } @@ -22,7 +28,7 @@ .navbar-wh { padding: 0.2rem 1.6rem; - border-bottom: 1px solid rgba(0,0,0,.12); + border-bottom: 1px solid rgba(0, 0, 0, .12); } .navbar-brand-fs { @@ -54,6 +60,17 @@ padding-bottom: 60px; } +.main .title{ + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 30px; +} + +.main .title a{ + height: 35px; +} + .tip-box { width: 100%; background-color: rgb(229, 246, 253); @@ -68,7 +85,7 @@ margin-right: 12px; } -.tip-box .tip-icon svg{ +.tip-box .tip-icon svg { fill: currentColor; color: #007bff; } @@ -77,7 +94,18 @@ letter-spacing: 0.00938em; font-size: 13px; font-weight: 400; - color:rgb(1, 67, 97); + color: rgb(1, 67, 97); margin-bottom: 0; line-height: 24px; +} + +.video-list { + display: grid; + /* 声明列的宽度 */ + grid-template-columns: repeat(4, 305px); + /* 声明行间距和列间距 */ + grid-gap: 20px; + /* 声明行的高度 */ + /* grid-template-rows: 360px; */ + margin-top: 25px; } \ No newline at end of file diff --git a/web/statics/js/jquery.min.js b/web/statics/js/jquery.min.js new file mode 100644 index 0000000..b061403 --- /dev/null +++ b/web/statics/js/jquery.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 --> {{define "footer"}} - + {{block "js" .}}{{end}} diff --git a/web/templates/base/header.html.tmpl b/web/templates/base/header.html.tmpl index 3c071b4..b110741 100644 --- a/web/templates/base/header.html.tmpl +++ b/web/templates/base/header.html.tmpl @@ -21,11 +21,14 @@ HLS流媒体
    - {{if .AuthID}} -
  • - 欢迎您: {{.AuthName}} + {{if .Authorize.ID}} +
  • + 欢迎您: {{.Authorize.Name}}
    • -
  • +
  • + 我的视频 +
    • +
  • 退出
    • {{else}} diff --git a/web/templates/home.html.tmpl b/web/templates/home.html.tmpl index a8a1e5c..c4597b5 100644 --- a/web/templates/home.html.tmpl +++ b/web/templates/home.html.tmpl @@ -1,51 +1,23 @@ - - {{template "header" .}}

    视频列表

    - +
    + {{range .Videos}} +
    + {{.Title}} +
    +
    {{.Title}}
    +

    {{.Description}}

    + 播放 +
    +
    + {{end}} +
    +{{define "js"}} + +{{end}} {{template "footer" .}} \ No newline at end of file diff --git a/web/templates/me/videos.html.tmpl b/web/templates/me/videos.html.tmpl new file mode 100644 index 0000000..e0402b8 --- /dev/null +++ b/web/templates/me/videos.html.tmpl @@ -0,0 +1,73 @@ +{{template "header" .}} +
    +
    +
    +

    我的视频

    + 添加 +
    +
    + {{range .Videos}} +
    + {{.Title}} +
    +
    {{.Title}}
    +

    {{.Description}}

    + + 编辑 + + + {{if eq .Status 0}} + + {{else if eq .Status 200}} + 播放 + {{end}} + +
    + {{if eq .Status 1}} +

    转码中...

    + {{else if eq .Status 2}} +

    转码失败

    + {{end}} +

    +
    +
    +
    + {{end}} +
    +
    +
    +{{define "js"}} + +{{end}} +{{template "footer" .}} \ No newline at end of file diff --git a/web/templates/user/login.html.tmpl b/web/templates/user/login.html.tmpl index 02b5cd9..81b5f3d 100644 --- a/web/templates/user/login.html.tmpl +++ b/web/templates/user/login.html.tmpl @@ -1,31 +1,41 @@ {{template "header" .}}
    -
    -

    登录

    -
    -
    -
    - - - {{if .EmailErr}} - {{.EmailErr}} - {{end}} +
    +

    登录

    +
    + +
    +
    +
    + 邮箱
    -
    - - - {{if .PasswordErr}} - {{.PasswordErr}} - {{end}} -
    - - - {{if .Summary}} -
    - {{.Summary}} + +
    + {{if .EmailErr}} + {{.EmailErr}} + {{end}}
    - {{end}} +
    +
    +
    + 密码 +
    + +
    + {{if .PasswordErr}} + {{.PasswordErr}} + {{end}} +
    + + + {{if .Summary}} +
    + {{.Summary}}
    + {{end}}
    +
    {{template "footer" .}} \ No newline at end of file diff --git a/web/templates/user/register.html.tmpl b/web/templates/user/register.html.tmpl index b96f58f..0f2e68b 100644 --- a/web/templates/user/register.html.tmpl +++ b/web/templates/user/register.html.tmpl @@ -1,38 +1,53 @@ {{template "header" .}}
    -
    -

    注册

    -
    -
    -
    - - - {{if .EmailErr}} - {{.EmailErr}} - {{end}} +
    +

    注册

    +
    + +
    +
    +
    + 邮箱
    -
    - - - {{if .UsernameErr}} - {{.UsernameErr}} - {{end}} -
    -
    - - - {{if .PasswordErr}} - {{.PasswordErr}} - {{end}} -
    - - - {{if .Summary}} -
    - {{.Summary}} + +
    + {{if .EmailErr}} + {{.EmailErr}} + {{end}}
    - {{end}} +
    +
    +
    + 名称 +
    + +
    + {{if .UsernameErr}} + {{.UsernameErr}} + {{end}} +
    +
    +
    +
    + 密码 +
    + +
    + {{if .PasswordErr}} + {{.PasswordErr}} + {{end}} +
    + + + {{if .Summary}} +
    + {{.Summary}}
    + {{end}}
    +
    {{template "footer" .}} \ No newline at end of file diff --git a/web/templates/video/edit.html.tmpl b/web/templates/video/edit.html.tmpl new file mode 100644 index 0000000..19d3c6a --- /dev/null +++ b/web/templates/video/edit.html.tmpl @@ -0,0 +1,126 @@ +{{template "header" .}} +
    +
    +
    +

    上传视频

    + 返回列表 +
    +
    +
    + {{if .ID}} +
    +
    +
    + ID +
    + + +
    +
    + {{end}} +
    +
    +
    + 标题 +
    + +
    + {{if .TitleErr}} + {{.TitleErr}} + {{end}} +
    +
    +
    +
    + 图片 +
    + + + +
    +
    + {{if .Images}} + + {{end}} +
    + {{if .ImagesErr}} + {{.ImagesErr}} + {{end}} +
    +
    +
    +
    + 描述 +
    + +
    + {{if .DescriptionErr}} + {{.DescriptionErr}} + {{end}} +
    +
    +
    +
    + 视频 +
    + + + +
    +
    + {{if .OriginLink}} +

    {{.OriginLink}}

    + {{end}} +
    + + {{.OriginLinkErr}} + +
    + +
    +
    +
    +
    +{{define "js"}} + +{{end}} +{{template "footer" .}} \ No newline at end of file diff --git a/web/templates/video/play.html.tmpl b/web/templates/video/play.html.tmpl index 94a83e0..9f9ffa1 100644 --- a/web/templates/video/play.html.tmpl +++ b/web/templates/video/play.html.tmpl @@ -1,14 +1,25 @@ {{template "header" .}}
    -
    正在播放 + {{if eq .Video.Status 200}} +
    正在播放 - - Git - Div Rhino - + + + {{.Video.Title}} + +
    - +

    如果播放遇到问题，请尝试切换播放源。

    +
    + {{else}} +
    该视频目前还不能播放!
    + {{end}}
    +{{define "js"}} +{{end}} {{template "footer" .}} \ No newline at end of file diff --git a/web/templates/video/transfer.html.tmpl b/web/templates/video/transfer.html.tmpl new file mode 100644 index 0000000..adb1c40 --- /dev/null +++ b/web/templates/video/transfer.html.tmpl @@ -0,0 +1,43 @@ +{{template "header" .}} +
    +
    +
    +

    视频转码

    +
    +
    +
    {{.Video.Title}}
    +

    {{.Video.Description}}

    +

    + {{if eq .Video.Status 0}} +

    该视频需要转码才能播放

    + + {{else if eq .Video.Status 1}} +

    转码中...

    + {{else if eq .Video.Status 2}} +

    转码失败, 请联系管理员

    + {{else if eq .Video.Status 200}} +

    恭喜您, 转码成功!

    + {{end}} +

    +
    +
    +
    +{{define "js"}} + +{{end}} +{{template "footer" .}} \ No newline at end of file