Skip to content
Merged
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
10 changes: 6 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"log"
"os"
"server/server"
cmd "server/server/terminal_cmd"
api "server/server/api"
)

func main() {
Expand All @@ -23,20 +25,20 @@ func main() {
break
}
if rep == "vfolder" {
server.ChangeVFolder(&cfg)
cmd.ChangeVFolder(&cfg)
fmt.Printf("After change : %+v\n", cfg)
continue
}
if rep == "list" {
server.TakeFolder(&cfg)
cmd.TakeFolder(&cfg)
continue
}
if rep == "config" {
server.ViewConfig(cfg)
cmd.ViewConfig(cfg)
continue
}
if rep == "start" && cfg.StartStatut == 0 {
go server.SimpleHost(cfg)
go api.SimpleHost(cfg)
cfg.StartStatut = 1
continue
}
Expand Down
19 changes: 19 additions & 0 deletions server/api/core.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package api

import (
"fmt"
"net/http"

srv "server/server"
)

func SimpleHost(cfg srv.Conf) {
RequestFolder(cfg) // For take folder
RequestFile(cfg) // take file

fmt.Println("API lancer")
err := http.ListenAndServe(":8000", nil)
if err != nil {
fmt.Println("error server")
}
}
27 changes: 27 additions & 0 deletions server/api/request_file.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package api

import (
"net/http"
"path/filepath"

srv "server/server"
)

func RequestFile(cfg srv.Conf) {
http.HandleFunc("/api/video/{filename}", func(w http.ResponseWriter, r *http.Request) {
// Allow the frontend dev server to stream video from this API.
w.Header().Set("Access-Control-Allow-Origin", "http://localhost:5173")
w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Range")
w.Header().Set("Access-Control-Expose-Headers", "Accept-Ranges, Content-Length, Content-Range")

if r.Method == http.MethodOptions {
w.WriteHeader(http.StatusNoContent)
return
}

filename := r.PathValue("filename")
videoPath := filepath.Join(cfg.Path, cfg.Folder.VideoF, filename)
http.ServeFile(w, r, videoPath)
})
}
14 changes: 6 additions & 8 deletions server/server_request.go → server/api/request_folder.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package server
package api

import (
"encoding/json"
"fmt"
"net/http"
"os"

srv "server/server"
)

type Item struct {
Expand All @@ -22,7 +24,7 @@ var items = []Item{
{ID: 2, Name: "Item B"},
}

func SearchInFolder() ([]Folder) {
func SearchInFolder() []Folder {
entries, err := os.ReadDir(".")
if err != nil {
return nil
Expand All @@ -41,6 +43,7 @@ func SearchInFolder() ([]Folder) {
return folders
}


func itemsHandler(w http.ResponseWriter, r *http.Request) {
// Allow the Vite dev server to read API responses from the browser.
w.Header().Set("Access-Control-Allow-Origin", "http://localhost:5173")
Expand All @@ -66,11 +69,6 @@ func itemsHandler(w http.ResponseWriter, r *http.Request) {
}
}

func SimpleHost(cfg conf) {
func RequestFolder(cfg srv.Conf) {
http.HandleFunc("/", itemsHandler)
fmt.Println("API lancer")
err := http.ListenAndServe(":8000", nil)
if err != nil {
fmt.Println("error server")
}
}
10 changes: 6 additions & 4 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@ type conf struct {
WebtoonF string `toml:"webtoon_f"`
} `toml:"folder"`
Server struct {
Port int `toml:"port"`
Port int `toml:"port"`
Host string `toml:"host"`
} `toml:"server"`
Path string
Path string
StartStatut int
}

func LoadConf(path string) (conf, error) {
type Conf = conf

func LoadConf(path string) (Conf, error) {
var cfg conf
_, err := toml.DecodeFile(path, &cfg)
cfg.Path, err = os.Getwd()
cfg.StartStatut = 0
return cfg, err
}

func ServerStart() conf {
func ServerStart() Conf {
cfg, err := LoadConf("config/config.toml")
if err != nil {
log.Fatalf("error toml")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
package server
package cmd

import (
"fmt"
"os"

srv "server/server"
)

func ChangeVFolder(cfg *conf) {
func ChangeVFolder(cfg *srv.Conf) {
var ChangePath string
fmt.Println("Quelle est le nouveau path ?")
fmt.Scan(&ChangePath)
cfg.Folder.VideoF = ChangePath
}

func TakeFolder(cfg *conf) {
func TakeFolder(cfg *srv.Conf) {
fmt.Printf("Path : %v\n", cfg.Path)
folder, _ := os.ReadDir(cfg.Folder.VideoF)
folder, _ := os.ReadDir(cfg.Folder.VideoF)
fmt.Printf("%+v\n", folder)
}

func ViewConfig(cfg conf) {
func ViewConfig(cfg srv.Conf) {
fmt.Println("\t\tCONFIG")
fmt.Println("Serveur :")
fmt.Printf(" - Port : %v\n", cfg.Server.Port)
fmt.Printf(" - Host : %v\n", cfg.Server.Host)
fmt.Println("Folders :")
fmt.Printf(" - Folder for videos : %v\n", cfg.Folder.VideoF)
fmt.Printf(" - Folder for Webtoon : %v\n", cfg.Folder.WebtoonF)
}
}
2 changes: 1 addition & 1 deletion web-client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
1 change: 1 addition & 0 deletions web-client/src/App.jsx → web-client/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @ts-nocheck
import { useEffect, useState, useRef } from 'react'
import './App.css'
import { Navigate, useNavigate } from 'react-router-dom'
Expand Down
Binary file added web-client/src/assets/camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-client/src/assets/filmclair.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-client/src/assets/homelogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-client/src/assets/maisonclair.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 0 additions & 49 deletions web-client/src/connection.jsx

This file was deleted.

5 changes: 3 additions & 2 deletions web-client/src/main.jsx → web-client/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// @ts-nocheck
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
import { BrowserRouter, Routes, Route } from 'react-router-dom'
import './index.css'
import App from './App.jsx'
import Conn from './connection.jsx'
import App from './App.tsx'
import Conn from './pages/connection.tsx'

createRoot(document.getElementById('root')).render(
<StrictMode>
Expand Down
Loading