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
15 changes: 10 additions & 5 deletions drivers/mediafire/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,24 @@ func (d *Mediafire) GetAddition() driver.Additional {

// Init initializes the MediaFire driver with session token and cookie validation
func (d *Mediafire) Init(ctx context.Context) error {
if d.SessionToken == "" {
return fmt.Errorf("Init :: [MediaFire] {critical} missing sessionToken")
}

if d.Cookie == "" {
return fmt.Errorf("Init :: [MediaFire] {critical} missing Cookie")
}

// If SessionToken is empty, try to get it from cookie
if d.SessionToken == "" {
if _, err := d.getSessionToken(ctx); err != nil {
return fmt.Errorf("Init :: [MediaFire] {critical} failed to get session token from cookie: %w", err)
}
}

// Setup rate limiter if rate limit is configured
if d.LimitRate > 0 {
d.limiter = rate.NewLimiter(rate.Limit(d.LimitRate), 1)
}

// Validate and refresh session token if needed
if _, err := d.getSessionToken(ctx); err != nil {

d.renewToken(ctx)

// Avoids 10 mins token expiry (6- 9)
Expand Down Expand Up @@ -429,3 +433,4 @@ func (d *Mediafire) GetDetails(ctx context.Context) (*model.StorageDetails, erro
}

var _ driver.Driver = (*Mediafire)(nil)

5 changes: 3 additions & 2 deletions drivers/mediafire/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ type Addition struct {
driver.RootPath
//driver.RootID

SessionToken string `json:"session_token" required:"true" type:"string" help:"Required for MediaFire API"`
Cookie string `json:"cookie" required:"true" type:"string" help:"Required for navigation"`
SessionToken string `json:"session_token" required:"false" type:"string" help:"Optional for MediaFire API, can be auto-acquired from cookie"`
Cookie string `json:"cookie" required:"true" type:"string" help:"Required for MediaFire API authentication"`

OrderBy string `json:"order_by" type:"select" options:"name,time,size" default:"name"`
OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
Expand Down Expand Up @@ -59,3 +59,4 @@ func init() {
}
})
}

1 change: 1 addition & 0 deletions drivers/mediafire/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,4 @@ type MediafireUserInfoResponse struct {
CurrentAPIVersion string `json:"current_api_version"`
} `json:"response"`
}

18 changes: 16 additions & 2 deletions drivers/mediafire/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Final opts by @Suyunjing @j2rong4cn @KirCute @Da3zKi7
*/

import (
"compress/gzip"
"context"
"encoding/json"
"fmt"
Expand Down Expand Up @@ -60,7 +61,7 @@ func (d *Mediafire) getSessionToken(ctx context.Context) (string, error) {
}

req.Header.Set("Accept", "*/*")
req.Header.Set("Accept-Encoding", "gzip, deflate, br, zstd")
req.Header.Set("Accept-Encoding", "gzip")
req.Header.Set("Accept-Language", "en-US,en;q=0.9")
req.Header.Set("Content-Length", "0")
req.Header.Set("Cookie", d.Cookie)
Expand All @@ -83,7 +84,19 @@ func (d *Mediafire) getSessionToken(ctx context.Context) (string, error) {
}
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
var body []byte
// Handle gzip decompression if needed
if resp.Header.Get("Content-Encoding") == "gzip" {
gzipReader, err := gzip.NewReader(resp.Body)
if err != nil {
return "", fmt.Errorf("failed to create gzip reader: %w", err)
}
defer gzipReader.Close()
body, _ = io.ReadAll(gzipReader)
} else {
body, err = io.ReadAll(resp.Body)
}

if err != nil {
return "", err
}
Expand Down Expand Up @@ -727,3 +740,4 @@ func (d *Mediafire) getFileByHash(ctx context.Context, hash string) (*model.ObjT
file := resp.Response.FileInfo[0]
return d.fileToObj(file), nil
}