2018-01-23 10:48:44 +00:00
|
|
|
package common
|
|
|
|
|
2018-07-28 12:52:23 +00:00
|
|
|
import (
|
|
|
|
"image"
|
2018-07-28 14:51:24 +00:00
|
|
|
"image/gif"
|
2018-07-28 12:52:23 +00:00
|
|
|
"image/jpeg"
|
2019-10-28 07:46:14 +00:00
|
|
|
"image/png"
|
2018-07-28 12:52:23 +00:00
|
|
|
"os"
|
2018-07-29 04:34:28 +00:00
|
|
|
"strconv"
|
|
|
|
|
2019-10-30 03:52:04 +00:00
|
|
|
"golang.org/x/image/tiff"
|
|
|
|
|
|
|
|
qgen "github.com/Azareal/Gosora/query_gen"
|
2018-07-29 04:34:28 +00:00
|
|
|
"github.com/pkg/errors"
|
2018-07-28 12:52:23 +00:00
|
|
|
)
|
|
|
|
|
2018-07-29 04:34:28 +00:00
|
|
|
func ThumbTask(thumbChan chan bool) {
|
|
|
|
for {
|
|
|
|
// Put this goroutine to sleep until we have work to do
|
|
|
|
<-thumbChan
|
|
|
|
|
|
|
|
// TODO: Use a real queue
|
2019-06-09 03:21:48 +00:00
|
|
|
// TODO: Transactions? Self-repairing?
|
2018-08-04 11:46:36 +00:00
|
|
|
acc := qgen.NewAcc()
|
2018-07-29 04:34:28 +00:00
|
|
|
err := acc.Select("users_avatar_queue").Columns("uid").Limit("0,5").EachInt(func(uid int) error {
|
|
|
|
// TODO: Do a bulk user fetch instead?
|
2019-12-07 06:27:01 +00:00
|
|
|
u, err := Users.Get(uid)
|
2018-07-29 04:34:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return errors.WithStack(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Has the avatar been removed or already been processed by the thumbnailer?
|
2019-12-07 06:27:01 +00:00
|
|
|
if len(u.RawAvatar) < 2 || u.RawAvatar[1] == '.' {
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
_, _ = acc.Delete("users_avatar_queue").Where("uid=?").Run(uid)
|
2018-07-29 04:34:28 +00:00
|
|
|
return nil
|
|
|
|
}
|
2019-12-07 06:27:01 +00:00
|
|
|
_, err = os.Stat("./uploads/avatar_" + strconv.Itoa(u.ID) + u.RawAvatar)
|
2019-03-05 04:46:43 +00:00
|
|
|
if os.IsNotExist(err) {
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
_, _ = acc.Delete("users_avatar_queue").Where("uid=?").Run(uid)
|
2019-03-05 04:46:43 +00:00
|
|
|
return nil
|
|
|
|
} else if err != nil {
|
|
|
|
return errors.WithStack(err)
|
|
|
|
}
|
|
|
|
|
2018-07-29 04:34:28 +00:00
|
|
|
// This means it's an external image, they aren't currently implemented, but this is here for when they are
|
2019-12-07 06:27:01 +00:00
|
|
|
if u.RawAvatar[0] != '.' {
|
2018-07-29 04:34:28 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
/*if user.RawAvatar == ".gif" {
|
|
|
|
return nil
|
|
|
|
}*/
|
2021-01-06 06:41:08 +00:00
|
|
|
canResize := func(ext string) bool {
|
|
|
|
// TODO: Fix tif and tiff extensions?
|
|
|
|
return ext == ".png" && ext == ".jpg" && ext == ".jpe" && ext == ".jpeg" && ext == ".jif" && ext == ".jfi" && ext == ".jfif" && ext == ".gif" && ext == ".tiff" && ext == ".tif"
|
|
|
|
}
|
|
|
|
if !canResize(u.RawAvatar) {
|
2018-07-29 04:34:28 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-12-07 06:27:01 +00:00
|
|
|
ap := "./uploads/avatar_"
|
|
|
|
err = Thumbnailer.Resize(u.RawAvatar[1:], ap+strconv.Itoa(u.ID)+u.RawAvatar, ap+strconv.Itoa(u.ID)+"_tmp"+u.RawAvatar, ap+strconv.Itoa(u.ID)+"_w48"+u.RawAvatar, 48)
|
2018-07-29 04:34:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return errors.WithStack(err)
|
|
|
|
}
|
|
|
|
|
2019-12-07 06:27:01 +00:00
|
|
|
err = u.ChangeAvatar("." + u.RawAvatar)
|
2018-07-29 04:34:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return errors.WithStack(err)
|
|
|
|
}
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
_, err = acc.Delete("users_avatar_queue").Where("uid=?").Run(uid)
|
2018-07-29 04:34:28 +00:00
|
|
|
return errors.WithStack(err)
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
LogError(err)
|
|
|
|
}
|
2019-10-28 07:46:14 +00:00
|
|
|
|
|
|
|
/*
|
2019-10-30 03:52:04 +00:00
|
|
|
err := acc.Select("attach_image_queue").Columns("attachID").Limit("0,5").EachInt(func(attachID int) error {
|
|
|
|
return nil
|
2019-10-28 07:46:14 +00:00
|
|
|
|
2019-10-30 03:52:04 +00:00
|
|
|
_, err = acc.Delete("attach_image_queue").Where("attachID = ?").Run(uid)
|
|
|
|
}
|
2019-10-28 07:46:14 +00:00
|
|
|
*/
|
2018-08-04 11:46:36 +00:00
|
|
|
if err = acc.FirstError(); err != nil {
|
|
|
|
LogError(err)
|
|
|
|
}
|
2018-07-29 04:34:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-23 10:48:44 +00:00
|
|
|
var Thumbnailer ThumbnailerInt
|
|
|
|
|
|
|
|
type ThumbnailerInt interface {
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
Resize(format, inPath, tmpPath, outPath string, width int) error
|
2018-01-23 10:48:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type RezThumbnailer struct {
|
|
|
|
}
|
|
|
|
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
func (thumb *RezThumbnailer) Resize(format, inPath, tmpPath, outPath string, width int) error {
|
2018-01-23 10:48:44 +00:00
|
|
|
// TODO: Sniff the aspect ratio of the image and calculate the dest height accordingly, bug make sure it isn't excessively high
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
func (thumb *RezThumbnailer) resize(format, inPath, outPath string, width, height int) error {
|
2018-01-23 10:48:44 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-07-28 12:52:23 +00:00
|
|
|
// ! Note: CaireThumbnailer can't handle gifs, so we'll have to either cap their sizes or have another resizer deal with them
|
|
|
|
type CaireThumbnailer struct {
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewCaireThumbnailer() *CaireThumbnailer {
|
|
|
|
return &CaireThumbnailer{}
|
|
|
|
}
|
|
|
|
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
func precodeImage(format, inPath, tmpPath string) error {
|
2018-07-28 12:52:23 +00:00
|
|
|
imageFile, err := os.Open(inPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer imageFile.Close()
|
|
|
|
|
|
|
|
img, _, err := image.Decode(imageFile)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
outFile, err := os.Create(tmpPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer outFile.Close()
|
2018-01-23 10:48:44 +00:00
|
|
|
|
2018-07-28 14:51:24 +00:00
|
|
|
// TODO: Make sure animated gifs work after being encoded
|
2019-10-30 03:52:04 +00:00
|
|
|
switch format {
|
|
|
|
case "gif":
|
2018-07-28 14:51:24 +00:00
|
|
|
return gif.Encode(outFile, img, nil)
|
2019-10-30 03:52:04 +00:00
|
|
|
case "png":
|
2019-10-28 07:46:14 +00:00
|
|
|
return png.Encode(outFile, img)
|
2019-10-30 03:52:04 +00:00
|
|
|
case "tiff", "tif":
|
|
|
|
return tiff.Encode(outFile, img, nil)
|
2018-07-28 14:51:24 +00:00
|
|
|
}
|
2018-07-28 12:52:23 +00:00
|
|
|
return jpeg.Encode(outFile, img, nil)
|
2018-01-23 10:48:44 +00:00
|
|
|
}
|
|
|
|
|
Cascade delete attachments properly.
Cascade delete replied to topic events for replies properly.
Cascade delete likes on topic posts properly.
Cascade delete replies and their children properly.
Recalculate user stats properly when items are deleted.
Users can now unlike topic opening posts.
Add a recalculator to fix abnormalities across upgrades.
Try fixing a last_ip daily update bug.
Add Existable interface.
Add Delete method to LikeStore.
Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore.
Add CountUser, CountMegaUser, CountBigUser methods to TopicStore.
Add Each method to UserStore.
Add Add, Delete and DeleteResource methods to SubscriptionStore.
Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream.
Add Exists method to ProfileReplyStore.
Add DropColumn, RenameColumn and ChangeColumn to the database adapters.
Shorten ipaddress column names to ip.
- topics table.
- replies table
- users_replies table.
- polls_votes table.
Add extra column to activity_stream table.
Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find.
You need to run the updater / patcher for this commit.
2020-01-31 07:22:08 +00:00
|
|
|
func (thumb *CaireThumbnailer) Resize(format, inPath, tmpPath, outPath string, width int) error {
|
2018-07-28 14:51:24 +00:00
|
|
|
err := precodeImage(format, inPath, tmpPath)
|
2018-07-28 12:52:23 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
|
|
|
|
// TODO: Caire doesn't work. Try something else. Or get them to fix the index out of range. We get enough wins from re-encoding as jpeg anyway
|
|
|
|
/*imageFile, err := os.Open(tmpPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer imageFile.Close()
|
|
|
|
|
|
|
|
outFile, err := os.Create(outPath)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer outFile.Close()
|
|
|
|
|
|
|
|
p := &caire.Processor{NewWidth: width, Scale: true}
|
|
|
|
return p.Process(imageFile, outFile)*/
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
type LilliputThumbnailer struct {
|
2018-01-23 10:48:44 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
*/
|