go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-09-08 05:54:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

add create ebook by default in settings (#761)

Browse source 
* add create ebook by default in settings

* ebook automatic generate for new bookmark

* fix empty ebook for new bookmark
This commit is contained in:
Monirzadeh 2023-10-22 11:25:16 +00:00 • committed by GitHub
parent 106bf163ca
commit f82b97dec5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/swagger/docs.go
View file

@ -252,6 +252,9 @@ const docTemplate = `{
"model.UserConfig": {
"type": "object",
"properties": {
"CreateEbook": {
"type": "boolean"
},
"HideExcerpt": {
"type": "boolean"
},

3
docs/swagger/swagger.json
View file

@ -241,6 +241,9 @@
"model.UserConfig": {
"type": "object",
"properties": {
"CreateEbook": {
"type": "boolean"
},
"HideExcerpt": {
"type": "boolean"
},

2
docs/swagger/swagger.yaml
View file

@ -51,6 +51,8 @@ definitions:
type: object
model.UserConfig:
properties:
CreateEbook:
type: boolean
HideExcerpt:
type: boolean
HideThumbnail:

1
internal/core/processing.go
View file

@ -142,6 +142,7 @@ func ProcessBookmark(req ProcessRequest) (book model.Bookmark, isFatalErr bool,
// If needed, create ebook as well
if book.CreateEbook {
ebookPath := fp.Join(req.DataDir, "ebook", strID+".epub")
req.Bookmark = book
if strings.Contains(contentType, "application/pdf") {
return book, false, errors.Wrap(err, "can't create ebook from pdf")

2
internal/http/routes/api/v1/auth_test.go
View file

@ -253,6 +253,7 @@ func TestSettingsHandler(t *testing.T) {
NightMode: true,
KeepMetadata: true,
UseArchive: true,
CreateEbook: true,
MakePublic: true,
},
}
@ -276,6 +277,7 @@ func TestSettingsHandler(t *testing.T) {
"NightMode": false,
"KeepMetadata": false,
"UseArchive": false,
"CreateEbook": false,
"MakePublic": false
}
}`)

1
internal/model/account.go
View file

@ -23,6 +23,7 @@ type UserConfig struct {
NightMode bool `json:"NightMode"`
KeepMetadata bool `json:"KeepMetadata"`
UseArchive bool `json:"UseArchive"`
CreateEbook bool `json:"CreateEbook"`
MakePublic bool `json:"MakePublic"`
}

6
internal/view/assets/js/page/home.js
View file

@ -382,6 +382,11 @@ export default {
label: "Create archive",
type: "check",
value: this.appOptions.UseArchive,
}, {
name: "createEbook",
label: "Create Ebook",
type: "check",
value: this.appOptions.CreateEbook,
}, {
name: "makePublic",
label: "Make archive publicly available",
@ -417,6 +422,7 @@ export default {
public: data.makePublic ? 1 : 0,
tags: tags,
createArchive: data.createArchive,
createEbook: data.createEbook,
};
this.dialog.loading = true;

5
internal/view/assets/js/page/setting.js
View file

@ -35,6 +35,10 @@ var template = `
<input type="checkbox" v-model="appOptions.UseArchive" @change="saveSetting">
Create archive by default
</label>
<label>
<input type="checkbox" v-model="appOptions.CreateEbook" @change="saveSetting">
Create ebook by default
</label>
<label>
<input type="checkbox" v-model="appOptions.MakePublic" @change="saveSetting">
Make archive publicly available by default
@ -96,6 +100,7 @@ export default {
...options,
KeepMetadata: this.appOptions.KeepMetadata,
UseArchive: this.appOptions.UseArchive,
CreateEbook: this.appOptions.CreateEbook,
MakePublic: this.appOptions.MakePublic,
};
}

2
internal/view/content.html
View file

@ -64,12 +64,14 @@
ListMode = (typeof opts.config.ListMode === "boolean") ? opts.config.ListMode : false,
NightMode = (typeof opts.config.NightMode === "boolean") ? opts.config.NightMode : false,
UseArchive = (typeof opts.config.UseArchive === "boolean") ? opts.config.UseArchive : false;
CreateEbook = (typeof opts.config.CreateEbook === "boolean") ? opts.config.CreateEbook : false;
this.appOptions = {
ShowId: ShowId,
ListMode: ListMode,
NightMode: NightMode,
UseArchive: UseArchive,
CreateEbook: CreateEbook,
};
document.body.className = NightMode ? "night" : "";

2
internal/view/index.html
View file

@ -113,6 +113,7 @@
NightMode = (typeof opts.config.NightMode === "boolean") ? opts.config.NightMode : false,
KeepMetadata = (typeof opts.config.KeepMetadata === "boolean") ? opts.config.KeepMetadata : false,
UseArchive = (typeof opts.config.UseArchive === "boolean") ? opts.config.UseArchive : false,
CreateEbook = (typeof opts.config.CreateEbook === "boolean") ? opts.config.CreateEbook : false,
MakePublic = (typeof opts.config.MakePublic === "boolean") ? opts.config.MakePublic : false;
this.appOptions = {
@ -123,6 +124,7 @@
NightMode: NightMode,
KeepMetadata: KeepMetadata,
UseArchive: UseArchive,
CreateEbook: CreateEbook,
MakePublic: MakePublic,
};

3
internal/webserver/handler-api.go
View file

@ -180,6 +180,7 @@ type apiInsertBookmarkPayload struct {
Excerpt string `json:"excerpt"`
Tags []model.Tag `json:"tags"`
CreateArchive bool `json:"createArchive"`
CreateEbook bool `json:"createEbook"`
MakePublic int `json:"public"`
Async bool `json:"async"`
}
@ -189,6 +190,7 @@ type apiInsertBookmarkPayload struct {
func newAPIInsertBookmarkPayload() *apiInsertBookmarkPayload {
return &apiInsertBookmarkPayload{
CreateArchive: false,
CreateEbook: false,
Async: true,
}
}
@ -213,6 +215,7 @@ func (h *Handler) ApiInsertBookmark(w http.ResponseWriter, r *http.Request, ps h
Tags: payload.Tags,
Public: payload.MakePublic,
CreateArchive: payload.CreateArchive,
CreateEbook: payload.CreateEbook,
}
// Clean up bookmark URL