From a7d3e6e1f1d168d74b42151b8a776240af9e3734 Mon Sep 17 00:00:00 2001 From: Deluan Date: Fri, 10 Mar 2023 23:01:03 -0500 Subject: [PATCH] Add option to allow share to be downloaded --- conf/configuration.go | 2 ++ core/share.go | 2 +- core/share_test.go | 2 +- .../20230310222612_add_download_to_share.go | 23 +++++++++++++++++++ model/share.go | 1 + resources/i18n/pt.json | 3 ++- server/serve_index.go | 1 + server/serve_index_test.go | 11 +++++++++ ui/src/config.js | 1 + ui/src/dialogs/ShareDialog.js | 17 +++++++++++++- ui/src/i18n/en.json | 1 + ui/src/share/ShareEdit.js | 2 ++ ui/src/share/ShareList.js | 11 ++++++--- 13 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 db/migration/20230310222612_add_download_to_share.go diff --git a/conf/configuration.go b/conf/configuration.go index 159a4788e..7525b16e8 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -59,6 +59,7 @@ type configOptions struct { EnableStarRating bool EnableUserEditing bool EnableSharing bool + DefaultDownloadableShare bool DefaultTheme string DefaultLanguage string DefaultUIVolume int @@ -306,6 +307,7 @@ func init() { viper.SetDefault("devautologinusername", "") viper.SetDefault("devactivitypanel", true) viper.SetDefault("enablesharing", false) + viper.SetDefault("defaultdownloadableshare", false) viper.SetDefault("devenablebufferedscrobble", true) viper.SetDefault("devsidebarplaylists", true) viper.SetDefault("devshowartistpage", true) diff --git a/core/share.go b/core/share.go index 3eb95ca40..6f025bf1b 100644 --- a/core/share.go +++ b/core/share.go @@ -125,7 +125,7 @@ func (r *shareRepositoryWrapper) Save(entity interface{}) (string, error) { } func (r *shareRepositoryWrapper) Update(id string, entity interface{}, _ ...string) error { - cols := []string{"description"} + cols := []string{"description", "downloadable"} // TODO Better handling of Share expiration if !entity.(*model.Share).ExpiresAt.IsZero() { diff --git a/core/share_test.go b/core/share_test.go index 2c353bb7a..21069bb59 100644 --- a/core/share_test.go +++ b/core/share_test.go @@ -45,7 +45,7 @@ var _ = Describe("Share", func() { entity := &model.Share{} err := repo.Update("id", entity) Expect(err).ToNot(HaveOccurred()) - Expect(mockedRepo.(*tests.MockShareRepo).Cols).To(ConsistOf("description")) + Expect(mockedRepo.(*tests.MockShareRepo).Cols).To(ConsistOf("description", "downloadable")) }) }) }) diff --git a/db/migration/20230310222612_add_download_to_share.go b/db/migration/20230310222612_add_download_to_share.go new file mode 100644 index 000000000..5c982d6b4 --- /dev/null +++ b/db/migration/20230310222612_add_download_to_share.go @@ -0,0 +1,23 @@ +package migrations + +import ( + "database/sql" + + "github.com/pressly/goose" +) + +func init() { + goose.AddMigration(upAddDownloadToShare, downAddDownloadToShare) +} + +func upAddDownloadToShare(tx *sql.Tx) error { + _, err := tx.Exec(` +alter table share + add downloadable bool not null default false; +`) + return err +} + +func downAddDownloadToShare(tx *sql.Tx) error { + return nil +} diff --git a/model/share.go b/model/share.go index 6d6767618..4486fdf44 100644 --- a/model/share.go +++ b/model/share.go @@ -12,6 +12,7 @@ type Share struct { UserID string `structs:"user_id" json:"userId,omitempty" orm:"column(user_id)"` Username string `structs:"-" json:"username,omitempty" orm:"-"` Description string `structs:"description" json:"description,omitempty"` + Downloadable bool `structs:"downloadable" json:"downloadable"` ExpiresAt time.Time `structs:"expires_at" json:"expiresAt,omitempty"` LastVisitedAt time.Time `structs:"last_visited_at" json:"lastVisitedAt,omitempty"` ResourceIDs string `structs:"resource_ids" json:"resourceIds,omitempty" orm:"column(resource_ids)"` diff --git a/resources/i18n/pt.json b/resources/i18n/pt.json index ef1b76563..8c2629305 100644 --- a/resources/i18n/pt.json +++ b/resources/i18n/pt.json @@ -183,6 +183,7 @@ "username": "Compartilhado por", "url": "Link", "description": "Descrição", + "downloadable": "Permitir Baixar?", "contents": "Conteúdo", "expiresAt": "Dt. Expiração", "lastVisitedAt": "Última visita", @@ -452,4 +453,4 @@ "current_song": "Vai para música atual" } } -} \ No newline at end of file +} diff --git a/server/serve_index.go b/server/serve_index.go index 0489ad820..192b8257e 100644 --- a/server/serve_index.go +++ b/server/serve_index.go @@ -58,6 +58,7 @@ func serveIndex(ds model.DataStore, fs fs.FS, shareInfo *model.Share) http.Handl "devActivityPanel": conf.Server.DevActivityPanel, "enableUserEditing": conf.Server.EnableUserEditing, "enableSharing": conf.Server.EnableSharing, + "defaultDownloadableShare": conf.Server.DefaultDownloadableShare, "devSidebarPlaylists": conf.Server.DevSidebarPlaylists, "lastFMEnabled": conf.Server.LastFM.Enabled, "lastFMApiKey": conf.Server.LastFM.ApiKey, diff --git a/server/serve_index_test.go b/server/serve_index_test.go index 4a417b48d..95a351263 100644 --- a/server/serve_index_test.go +++ b/server/serve_index_test.go @@ -245,6 +245,17 @@ var _ = Describe("serveIndex", func() { Expect(config).To(HaveKeyWithValue("enableSharing", false)) }) + It("sets the defaultDownloadableShare", func() { + conf.Server.DefaultDownloadableShare = true + r := httptest.NewRequest("GET", "/index.html", nil) + w := httptest.NewRecorder() + + serveIndex(ds, fs, nil)(w, r) + + config := extractAppConfig(w.Body.String()) + Expect(config).To(HaveKeyWithValue("defaultDownloadableShare", true)) + }) + It("sets the defaultDownsamplingFormat", func() { r := httptest.NewRequest("GET", "/index.html", nil) w := httptest.NewRecorder() diff --git a/ui/src/config.js b/ui/src/config.js index abf409868..7548ab134 100644 --- a/ui/src/config.js +++ b/ui/src/config.js @@ -22,6 +22,7 @@ const defaultConfig = { defaultUIVolume: 100, enableUserEditing: true, enableSharing: true, + defaultDownloadableShare: true, devSidebarPlaylists: true, lastFMEnabled: true, lastFMApiKey: '9b94a5515ea66b2da3ec03c12300327e', diff --git a/ui/src/dialogs/ShareDialog.js b/ui/src/dialogs/ShareDialog.js index 05e74c425..fc877234d 100644 --- a/ui/src/dialogs/ShareDialog.js +++ b/ui/src/dialogs/ShareDialog.js @@ -8,6 +8,7 @@ import { import { SimpleForm, TextInput, + BooleanInput, useCreate, useNotify, useTranslate, @@ -17,6 +18,7 @@ import { shareUrl } from '../utils' import { useTranscodingOptions } from './useTranscodingOptions' import { useDispatch, useSelector } from 'react-redux' import { closeShareMenu } from '../actions' +import config from '../config' export const ShareDialog = () => { const { @@ -30,6 +32,9 @@ export const ShareDialog = () => { const notify = useNotify() const translate = useTranslate() const [description, setDescription] = useState('') + const [downloadable, setDownloadable] = useState( + config.defaultDownloadableShare + ) useEffect(() => { setDescription('') }, [ids]) @@ -41,6 +46,7 @@ export const ShareDialog = () => { resourceType: resource, resourceIds: ids?.join(','), description, + downloadable, ...(!originalFormat && { format }), ...(!originalFormat && { maxBitRate }), }, @@ -105,12 +111,21 @@ export const ShareDialog = () => { { setDescription(event.target.value) }} /> + { + setDownloadable(value) + }} + /> { {url} + diff --git a/ui/src/share/ShareList.js b/ui/src/share/ShareList.js index d9512c271..8b8f235e9 100644 --- a/ui/src/share/ShareList.js +++ b/ui/src/share/ShareList.js @@ -1,6 +1,7 @@ import { Datagrid, FunctionField, + BooleanField, List, NumberField, SimpleList, @@ -24,6 +25,7 @@ export const FormatInfo = ({ record, size }) => { const ShareList = (props) => { const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs')) + const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('lg')) const translate = useTranslate() const notify = useNotify() @@ -101,10 +103,13 @@ const ShareList = (props) => { /> - - + {isDesktop && } + {isDesktop && } + - + {isDesktop && ( + + )} )}