yt-grabber 1.8.1 → 1.8.3

package/package.json

@@ -1,7 +1,29 @@
 {
   "name": "yt-grabber",
-  "version": "1.8.1",
-  "description": "Youtube Grabber",
+  "version": "1.8.3",
+  "description": "Youtube Grabber - robust desktop application designed to retrieve multimedia from YouTube and YouTube Music services",
+  "keywords": [
+    "youtube",
+    "youtube music",
+    "grabber",
+    "downloader",
+    "music",
+    "albums",
+    "artists",
+    "album releases",
+    "songs",
+    "discography",
+    "yt-dlp",
+    "youtube playlist",
+    "youtube channel",
+    "youtube video",
+    "youtube audio",
+    "youtube mp3",
+    "youtube mp4",
+    "youtube mpeg",
+    "youtube mkv",
+    "youtube avi"
+  ],
   "main": "./dist/index.js",
   "repository": {
     "url": "https://github.com/karenpommeroy/yt-grabber.git"

package/src/automations/Selectors.ts

@@ -37,3 +37,11 @@ export const YtMusicArtistRelativeNameSelector = ".//div[contains(@class, 'title
 export const YtMusicArtistRelativeLinkSelector = ".//a";
 
 export const getYtMusicSearchResultsArtistsSelector = (artist: string) => `//ytmusic-app-layout//div[@id='content']//ytmusic-search-page//div[@id='contents']//ytmusic-shelf-renderer//div[@id='contents']//ytmusic-responsive-list-item-renderer//div[contains(@class, 'title-column')]/yt-formatted-string//text()[translate(., 'ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉÈÊÀÁÂÒÓÔÙÚÛÇÅÏÕÑŒĄĆĘŁŃÓŚŹŻ', 'abcdefghijklmnopqrstuvwxyzäöüéèêàáâòóôùúûçåïõñœąćęłńóśźż')='${_toLower(artist)}' or translate(., 'ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉÈÊÀÁÂÒÓÔÙÚÛÇÅÏÕÑŒĄĆĘŁŃÓŚŹŻ', 'abcdefghijklmnopqrstuvwxyzäöüéèêàáâòóôùúûçåïõñœąćęłńóśźż')='the ${_toLower(artist)}']//ancestor::ytmusic-responsive-list-item-renderer`;
+
+export const getYtMusicAlbumsDirectLinkSelectorFilteredByDate = (fromYear = 0, untilYear = 9999) => `//ytmusic-app-layout//div[@id='content']/ytmusic-browse-response//ytmusic-section-list-renderer//div[@id='content-group']//div[contains(@class, 'header-renderer')]/yt-formatted-string[contains(text(), 'Album')]//ancestor::div[contains(@class, 'ytmusic-shelf')]//div[@id='items-wrapper']/ul/*[contains(@class, 'ytmusic-carousel')]//div[contains(@class, 'details')]/span/yt-formatted-string[number(text()) >= ${fromYear} and number(text()) <= ${untilYear}]//ancestor::div[contains(@class, 'details')]//a[contains(@class, 'yt-simple-endpoint') and contains(@class, 'yt-formatted-string')]`;
+
+export const getYtMusicSinglesDirectLinkSelectorFilteredByDate = (fromYear = 0, untilYear = 9999) => `//ytmusic-app-layout//div[@id='content']/ytmusic-browse-response//ytmusic-section-list-renderer//div[@id='content-group']//div[contains(@class, 'header-renderer')]/yt-formatted-string[contains(text(), 'Single')]//ancestor::div[contains(@class, 'ytmusic-shelf')]//div[@id='items-wrapper']/ul/*[contains(@class, 'ytmusic-carousel')]//div[contains(@class, 'details')]/span/yt-formatted-string[number(text()) >= ${fromYear} and number(text()) <= ${untilYear}]//ancestor::div[contains(@class, 'details')]//a[contains(@class, 'yt-simple-endpoint') and contains(@class, 'yt-formatted-string')]`;
+
+export const getYtMusicAlbumLinkSelectorFilteredByDate = (fromYear = 0, untilYear = 9999) => `//ytmusic-app-layout//div[@id='content']/ytmusic-browse-response//ytmusic-section-list-renderer/div[@id='contents']/ytmusic-grid-renderer/div[@id='items']/*[contains(@class, 'ytmusic-grid-renderer')]//div[contains(@class, 'details')]/span/yt-formatted-string/span[number(text()) >= ${fromYear} and number(text()) <= ${untilYear}]//ancestor::div[contains(@class, 'details')]//a[contains(@class, 'yt-simple-endpoint') and contains(@class, 'yt-formatted-string')]`;
+
+export const getYtMusicSingleLinkSelectorFilteredByDate = (fromYear = 0, untilYear = 9999) => `//ytmusic-app-layout//div[@id='content']/ytmusic-browse-response//ytmusic-section-list-renderer/div[@id='contents']/ytmusic-grid-renderer/div[@id='items']/*[contains(@class, 'ytmusic-grid-renderer')]//div[contains(@class, 'details')]/span/yt-formatted-string/span[number(text()) >= ${fromYear} and number(text()) <= ${untilYear}]//ancestor::div[contains(@class, 'details')]//a[contains(@class, 'yt-simple-endpoint') and contains(@class, 'yt-formatted-string')]`;

package/src/automations/YoutubeArtists.ts

@@ -18,7 +18,9 @@ import {MessageHandlerParams} from "../messaging/MessageChannel";
 import {clearInput, navigateToPage, setCookies} from "./Helpers";
 import {
     AlbumFilterSelector, AlbumLinkSelector, AlbumsDirectLinkSelector, AlbumsHrefSelector,
-    getYtMusicSearchResultsArtistsSelector, SingleFilterSelector, SingleLinkSelector,
+    getYtMusicAlbumLinkSelectorFilteredByDate, getYtMusicAlbumsDirectLinkSelectorFilteredByDate,
+    getYtMusicSearchResultsArtistsSelector, getYtMusicSingleLinkSelectorFilteredByDate,
+    getYtMusicSinglesDirectLinkSelectorFilteredByDate, SingleFilterSelector, SingleLinkSelector,
     SinglesDirectLinkSelector, SinglesHrefSelector, YtMusicArtistBestResultLinkSelector,
     YtMusicArtistRelativeLinkSelector, YtMusicArtistRelativeNameSelector,
     YtMusicArtistRelativeThumbnailSelector, YtMusicArtistsChipSelector, YtMusicSearchInputSelector,
@@ -90,9 +92,11 @@ const run = async (
         await navigateToPage(artistChannelUrl, page);
         await page.waitForNetworkIdle();
 
-        const albums = await getAlbums(params);
-        results.push(...albums);
-    
+        if (params.options?.downloadAlbums) {
+            const albums = await getAlbums(params);
+            results.push(...albums);
+        }
+
         if (params.options?.downloadSinglesAndEps) {
             await navigateToPage(artistChannelUrl, page);
             await page.waitForNetworkIdle();
@@ -168,6 +172,7 @@ const getArtistUrl = async (params: GetYoutubeParams, artist: string, onPause?:
 
 const getAlbums = async (params: GetYoutubeParams): Promise<string[]> => {
     const results: string[] = [];
+    const {fromYear, untilYear} = params.options;
 
     try {
         const element = await page.waitForSelector(`::-p-xpath(${AlbumsHrefSelector})`, {timeout: 1000});
@@ -184,16 +189,19 @@ const getAlbums = async (params: GetYoutubeParams): Promise<string[]> => {
         } catch (e) {
             console.log("Albums already filtered");
         } finally {
-            const items = await page.$$eval(`xpath/${AlbumLinkSelector}`, (elements) => elements.map((el) => el.getAttribute("href")));
+            const selector =  fromYear || untilYear ? getYtMusicAlbumLinkSelectorFilteredByDate(fromYear, untilYear) : AlbumLinkSelector;
+            const items = await page.$$eval(`xpath/${selector}`, (elements) => elements.map((el) => el.getAttribute("href")));
 
             for (const item of items) {
                 results.push(`${params.url}/${item}`);
             }
 
+            // eslint-disable-next-line no-unsafe-finally
             return results;
         }
     } catch (error) {
-        const albums = await page.$$eval(`xpath/${AlbumsDirectLinkSelector}`, (elements) => elements.map((el) => el.getAttribute("href")));
+        const selector =  fromYear || untilYear ? getYtMusicAlbumsDirectLinkSelectorFilteredByDate(fromYear, untilYear) : AlbumsDirectLinkSelector;
+        const albums = await page.$$eval(`xpath/${selector}`, (elements) => elements.map((el) => el.getAttribute("href")));
 
         for (const item of albums) {
             results.push(`${params.url}/${item}`);
@@ -205,6 +213,7 @@ const getAlbums = async (params: GetYoutubeParams): Promise<string[]> => {
 
 const getSingles = async (params: GetYoutubeParams): Promise<string[]> => {
     const results: string[] = [];
+    const {fromYear, untilYear} = params.options;
 
     try {
         const element = await page.waitForSelector(`::-p-xpath(${SinglesHrefSelector})`, {timeout: 1000});
@@ -221,16 +230,19 @@ const getSingles = async (params: GetYoutubeParams): Promise<string[]> => {
         } catch (e) {
             console.log("Singles already filtered");
         } finally {
-            const items = await page.$$eval(`xpath/${SingleLinkSelector}`, (elements) => elements.map((el) => el.getAttribute("href")));
+            const selector =  fromYear || untilYear ? getYtMusicSingleLinkSelectorFilteredByDate(fromYear, untilYear) : SingleLinkSelector;
+            const items = await page.$$eval(`xpath/${selector}`, (elements) => elements.map((el) => el.getAttribute("href")));
 
             for (const item of items) {
                 results.push(`${params.url}/${item}`);
             }
 
+            // eslint-disable-next-line no-unsafe-finally
             return results;
         }
     } catch (error) {
-        const singles = await page.$$eval(`xpath/${SinglesDirectLinkSelector}`, (elements) => elements.map((el) => el.getAttribute("href")));
+        const selector =  fromYear || untilYear ? getYtMusicSinglesDirectLinkSelectorFilteredByDate(fromYear, untilYear) : SinglesDirectLinkSelector;
+        const singles = await page.$$eval(`xpath/${selector}`, (elements) => elements.map((el) => el.getAttribute("href")));
 
         for (const item of singles) {
             results.push(`${params.url}/${item}`);

package/src/common/Messaging.ts

@@ -20,6 +20,7 @@ export type OpenUrlInBrowserParams = {
 
 export type GetYoutubeParams = {
     values?: string[];
+    fromYear?: string;
     lang: string;
     url: string;
     options?: Record<string, any>;

package/src/common/Store.ts

@@ -25,6 +25,8 @@ export type ApplicationOptions = {
     alwaysOverwrite?: boolean;
     mergeParts?: boolean;
     downloadSinglesAndEps?: boolean;
+    downloadAlbums?: boolean;
+    showAdvancedSearchOptions?: boolean;
     inputMode?: InputMode;
     tabsOrder?: [TabsOrderKey, SortOrder];
 };
@@ -134,10 +136,18 @@ export const StoreSchema: Schema<IStore> = {
                 type: "boolean",
                 default: true
             },
+            downloadAlbums: {
+                type: "boolean",
+                default: true
+            },
             downloadSinglesAndEps: {
                 type: "boolean",
                 default: false
             },
+            showAdvancedSearchOptions: {
+                type: "boolean",
+                default: false
+            },
             inputMode: {
                 type: "string",
                 default: InputMode.Auto,

package/src/common/YtdplUtils.ts

@@ -27,6 +27,7 @@ export const getYtdplRequestParams = (track: TrackInfo, album: AlbumInfo, trackC
         "--progress",
         ...getCutArgs(track, trackCuts),
         appOptions.alwaysOverwrite ? "--force-overwrite" : "",
+        "--extractor-args", "youtube:player-client=default,-tv_simply",
         "--postprocessor-args", getPostProcessorArgs(track, album),
         "--output", getOutput(track, album, format, trackCuts)
     ];

package/src/components/youtube/formatSelector/FormatSelector.tsx

@@ -151,7 +151,7 @@ export const FormatSelector: React.FC<FormatSelectorProps> = (props) => {
 
     return (
         <Grid className={Styles.formatSelector} container spacing={2} padding={2}>
-            <Grid size={4}>
+            <Grid size="grow">
                 <FormControl fullWidth disabled={disabled} data-help="mediaType">
                     <InputLabel id="media-type-label">{t("mediaType")}</InputLabel>
                     <Select<MediaFormat>
@@ -167,7 +167,7 @@ export const FormatSelector: React.FC<FormatSelectorProps> = (props) => {
                     </Select>
                 </FormControl>
             </Grid>
-            <Grid size={4}>
+            <Grid size="grow">
                 <FormControl fullWidth disabled={disabled} data-help="format">
                     <InputLabel id="format-label">{t("format")}</InputLabel>
                     <Select<string>
@@ -181,7 +181,7 @@ export const FormatSelector: React.FC<FormatSelectorProps> = (props) => {
                 </FormControl>
             </Grid>
             {selectedMediaType === MediaFormat.Video &&
-                <Grid size={4}>
+                <Grid size="grow">
                     <FormControl fullWidth disabled={disabled} data-help="resolution">
                         <InputLabel id="resolution-label">{t("resolution")}</InputLabel>
                         <Select<string>
@@ -196,7 +196,7 @@ export const FormatSelector: React.FC<FormatSelectorProps> = (props) => {
                 </Grid>
             }
             {selectedMediaType === MediaFormat.Audio &&
-                <Grid size={4}>
+                <Grid size="grow">
                     <NumberField
                         data-help="audioQuality"
                         disabled={disabled}

package/src/components/youtube/inputPanel/InputPanel.styl

@@ -9,6 +9,41 @@
                 display: flex;
             }
         }
+    }
+
+    .accordion {
+        background: transparent;
+        background-image: none;
+
+        .accordion-summary {
+            border-radius: 8px;
+            background-color: var(--theme-palette-background-paper);
+            background-color: var(--theme-palette-primary-dark);
+            background-image: var(--Paper-overlay);
+            border: 1px solid var(--theme-palette-divider);
+        }
+
+        &:global(.Mui-expanded) {
+            .accordion-summary {
+                border-bottom-left-radius: 0;
+                border-bottom-right-radius: 0;
+            }
+        }
+
+        .accordion-details {
+            border-radius: 8px;
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+            border: 1px solid var(--theme-palette-divider);
+            border-top: none;
+        }
+    }
+
+    .text-input-group {
+        gap: var(--Grid-rowSpacing) var(--Grid-columnSpacing);
 
+        .control-group {
+            gap: var(--Grid-rowSpacing) var(--Grid-columnSpacing);
+        }
     }
 }

package/src/components/youtube/inputPanel/InputPanel.tsx

@@ -8,17 +8,20 @@ import _replace from "lodash/replace";
 import _truncate from "lodash/truncate";
 import _uniq from "lodash/uniq";
 import _without from "lodash/without";
-import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
+import React, {ChangeEvent, useCallback, useEffect, useMemo, useRef, useState} from "react";
 import {useTranslation} from "react-i18next";
 import {useDebounceValue} from "usehooks-ts";
 
 import ClearIcon from "@mui/icons-material/Clear";
 import DownloadIcon from "@mui/icons-material/Download";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import FolderIcon from "@mui/icons-material/Folder";
 import ReplayIcon from "@mui/icons-material/Replay";
 import SearchIcon from "@mui/icons-material/Search";
 import {
-    Autocomplete, AutocompleteRenderInputParams, Button, Chip, Grid, Stack, TextField, Tooltip
+    Accordion, AccordionDetails, AccordionSummary, Autocomplete, AutocompleteRenderInputParams,
+    Button, Checkbox, Chip, FormControl, FormControlLabel, FormGroup, FormLabel, Grid, Stack,
+    TextField, Tooltip, Typography
 } from "@mui/material";
 
 import {getUrlType} from "../../../common/Helpers";
@@ -40,14 +43,16 @@ export type InputPanelProps = {
 
 export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) => {
     const {loading, onDownload, onCancel, onDownloadFailed, onChange, onLoadInfo} = props;
-    const [options] = useState<ApplicationOptions>(global.store.get("application"));
-    const [debouncedOptions] = useDebounceValue(options, 500, {leading: true});
+    const [applicationOptions, setApplicationOptions] = useState<ApplicationOptions>(global.store.get("application"));
+    const [debouncedApplicationOptions] = useDebounceValue(applicationOptions, 500, {leading: true, trailing: true});
     const {trackStatus, urls, setUrls} = useDataState();
     const {t} = useTranslation();
     const fileInputRef = useRef<HTMLInputElement>(null);
     const valueCount = urls.length;
+    const [fromYear, setFromYear] = useState<string>();
+    const [untilYear, setUntilYear] = useState<string>();
     const [inputMode, setInputMode] = useState<InputMode>(global.store.get("application.inputMode"));
-    
+
     const truncateRegex = /^(?:https?:\/\/)?(?:www\.)?(?:m\.)?(?:music\.)?(?:youtube\.com\/(?:watch\?v=|embed\/|browse\/|channel\/|shorts\/|live\/|playlist\?list=)|youtu\.be\/)/;
     const validateRegex = /^(?:https?:\/\/)?(?:www\.)?(?:m\.)?(?:music\.)?(?:youtube\.com\/(?:watch\?v=|embed\/|browse\/|channel\/|shorts\/|live\/|playlist\?list=)|youtu\.be\/)([\w-]{11})/;
 
@@ -61,10 +66,6 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
         return options.debugMode ? true : validateRegex.test(value);
     };
 
-    useEffect(() => {
-        global.store.set("application", debouncedOptions);
-    }, [debouncedOptions]);
-
     useEffect(() => {
         const unsubscribeInputMode = global.store.onDidChange<any>("application.inputMode", (newInputMode: InputMode) => {
             setInputMode(newInputMode);
@@ -73,24 +74,24 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
         return () => {
             unsubscribeInputMode();
         };
-    },  []);
+    }, []);
 
     const handleDelete = useCallback((valueToDelete: string) => {
         const newUrls = _without(urls, valueToDelete);
 
         setUrls((prev) => _without(prev, valueToDelete));
-        
+
         if (_isFunction(onChange)) {
             onChange(newUrls);
         }
     }, [urls]);
-    
+
     const handleOpenFromFile = () => {
         fileInputRef.current?.click();
     };
 
     const handleLoadInfo = () => {
-        onLoadInfo(urls);
+        onLoadInfo(urls, fromYear, untilYear);
     };
 
     const containsInvalidValues = useMemo(() => {
@@ -102,10 +103,10 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
     }, [trackStatus]);
 
     const onMultiValueChange = (value: React.ChangeEvent<HTMLInputElement>, newValue: []) => {
-        const newUrls = _uniq(_filter(newValue, isValid)); 
+        const newUrls = _uniq(_filter(newValue, isValid));
 
         setUrls(newUrls);
-        
+
         if (_isFunction(onChange)) {
             onChange(newUrls);
         }
@@ -121,9 +122,9 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
 
     const onSelectFile = (event: React.ChangeEvent<HTMLInputElement>) => {
         const file = event.target.files?.[0];
-        
+
         if (!file) return;
-        
+
         const reader = new FileReader();
 
         reader.onload = (e) => {
@@ -138,18 +139,42 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
         event.target.value = "";
     };
 
+    const onShowAdvancedSearchOptionsChange = (e: React.SyntheticEvent<HTMLDivElement>, isExpanded: boolean) => {
+        setApplicationOptions((prev) => ({...prev, showAdvancedSearchOptions: isExpanded}));
+    };
+
+    const onDownloadSinglesAndEpsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        setApplicationOptions((prev) => ({...prev, downloadSinglesAndEps: e.target.checked}));
+    };
+    
+    const onDownloadAlbumsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        setApplicationOptions((prev) => ({...prev, downloadAlbums: e.target.checked}));
+    };
+    
+    const onFromYearChanged = (event: ChangeEvent<HTMLInputElement>) => {
+        const value = parseInt(event.target.value);
+
+        setFromYear(isNaN(value) ? undefined : event.target.value);
+    };
+
+    const onUntilYearChanged = (event: ChangeEvent<HTMLInputElement>) => {
+        const value = parseInt(event.target.value);
+
+        setUntilYear(isNaN(value) ? undefined : event.target.value);
+    };
+
     const getInputLabel = () => {
         switch (inputMode) {
-        case InputMode.Auto:
-            return t("youtubeUrl");
-        case InputMode.Artists:
-            return t("artistOrArtists");
-        case InputMode.Albums:
-            return t("albumOrAlbums");
-        case InputMode.Songs:
-            return t("songOrSongs");
-        default:
-            return t("youtubeUrl");
+            case InputMode.Auto:
+                return t("youtubeUrl");
+            case InputMode.Artists:
+                return t("artistOrArtists");
+            case InputMode.Albums:
+                return t("albumOrAlbums");
+            case InputMode.Songs:
+                return t("songOrSongs");
+            default:
+                return t("youtubeUrl");
         }
     };
 
@@ -183,7 +208,11 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
             </Tooltip>
         );
     }, [inputMode]);
-    
+
+    useEffect(() => {
+        global.store.set("application", debouncedApplicationOptions);
+    }, [debouncedApplicationOptions]);
+
     return (
         <Grid className={Styles.inputPanel} container spacing={2} padding={2} paddingBottom={1}>
             <Grid size="grow">
@@ -226,7 +255,7 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
                     <Tooltip title={t("loadFromFile")} arrow enterDelay={2000} leaveDelay={100} enterNextDelay={500} placement="bottom">
                         <div>
                             <Button data-help="loadFromFile" disabled={loading} variant="contained" disableElevation color="secondary" onClick={() => handleOpenFromFile()}>
-                                <FolderIcon/>
+                                <FolderIcon />
                             </Button>
                         </div>
                     </Tooltip>
@@ -264,6 +293,58 @@ export const InputPanel: React.FC<InputPanelProps> = (props: InputPanelProps) =>
                     }
                 </Stack>
             </Grid>
+            {global.store.get("application.inputMode") === InputMode.Artists &&
+                <Grid size={12}>
+                    <Accordion
+                        elevation={0}
+                        className={Styles.accordion}
+                        data-help="showAdvancedSearchOptions"
+                        disableGutters
+                        expanded={applicationOptions.showAdvancedSearchOptions}
+                        onChange={onShowAdvancedSearchOptionsChange}
+                    >
+                        <AccordionSummary expandIcon={<ExpandMoreIcon />} className={Styles.accordionSummary}>
+                            <Typography variant="body1">{t("showAdvancedSearchOptions")}</Typography>
+                        </AccordionSummary>
+                        <AccordionDetails className={Styles.accordionDetails}>
+                            <Stack direction="column" spacing={1} paddingX={0} paddingY={2} paddingBottom={0}>  
+                                <FormControl className={Styles.textInputGroup} data-help="downloadReleaseDate">
+                                    <FormLabel component="legend">{t("releaseDate")}</FormLabel>
+                                    <FormGroup row className={Styles.controlGroup}>
+                                        <TextField data-help="downloadReleaseDateFrom" label={t("fromYear")} variant="outlined" value={fromYear} onChange={onFromYearChanged} />
+                                        <TextField data-help="downloadReleaseDateUntil" label={t("untilYear")} variant="outlined" value={untilYear} onChange={onUntilYearChanged}/>
+                                    </FormGroup>
+                                </FormControl>
+                                <FormControl data-help="downloadReleaseType">
+                                    <FormLabel component="legend">{t("download")}</FormLabel>
+                                    <FormGroup row>
+                                        <FormControlLabel
+                                            data-help="downloadAlbums"
+                                            label={t("downloadAlbums")}
+                                            control={
+                                                <Checkbox
+                                                    checked={applicationOptions.downloadAlbums}
+                                                    onChange={onDownloadAlbumsChange}
+                                                />
+                                            }
+                                        />
+                                        <FormControlLabel
+                                            data-help="downloadSinglesAndEps"
+                                            label={t("downloadSinglesAndEps")}
+                                            control={
+                                                <Checkbox
+                                                    checked={applicationOptions.downloadSinglesAndEps}
+                                                    onChange={onDownloadSinglesAndEpsChange}
+                                                />
+                                            }
+                                        />
+                                    </FormGroup>
+                                </FormControl>
+                            </Stack>
+                        </AccordionDetails>
+                    </Accordion>
+                </Grid>
+            }
         </Grid>
     );
 };

package/src/components/youtube/playlistTabs/PlaylistTabs.styl

@@ -50,6 +50,7 @@ progress-bg-color = var(--theme-palette-primary-light)
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
+            font-size: 0.8rem;
         }
 
         .tab-icon {

package/src/components/youtube/playlistTabs/PlaylistTabs.tsx

@@ -15,7 +15,6 @@ import _size from "lodash/size";
 import _some from "lodash/some";
 import path from "path";
 import React, {MouseEvent, useCallback, useEffect} from "react";
-import {useTranslation} from "react-i18next";
 
 import CloseIcon from "@mui/icons-material/Close";
 import TabContext from "@mui/lab/TabContext";
@@ -48,7 +47,6 @@ export const PlaylistTabs: React.FC<PlaylistTabsProps> = (props: PlaylistTabsPro
     const {queue, onDownloadTrack, onDownloadPlaylist, onCancelPlaylist, onCancelTrack} = props;
     const {trackStatus, playlists, activeTab, setActiveTab, setTrackStatus, setPlaylists, setTracks} = useDataState();
     const {state} = useAppContext();
-    const {t} = useTranslation();
     const tabWidth = window.innerWidth / (playlists.length + playlists.length) - 30; 
 
     useEffect(() => {
@@ -196,6 +194,7 @@ export const PlaylistTabs: React.FC<PlaylistTabsProps> = (props: PlaylistTabsPro
                             return <Tab
                                 key={item.album.id}
                                 className={Styles.tab}
+                                
                                 icon={
                                     <Badge
                                         className={Styles.tabRemoveButton}

package/src/resources/locales/de-DE/help.json

@@ -146,7 +146,7 @@
     "tabsOrderContent": "Ascending or descending order.",
     "editTrackHeader": "Trackdaten bearbeiten",
     "editTrackContent": "Ermöglicht das Bearbeiten von Trackdaten wie dem Titel.",
-    "downloadSinglesAndEpsHeader": "Download Singles und EPs",
+    "downloadSinglesAndEpsHeader": "Singles und EPs",
     "downloadSinglesAndEpsContent": "Schließen Sie beim Herunterladen von Künstleralben auch Singles und EPs ein.",
     "tabsOrderFieldHeader": "Tabs Reihenfolge Attribut",
     "tabsOrderFieldContent": "Gibt das Attribut an, das zum Sortieren der Registerkarten verwendet wird.",
@@ -163,5 +163,17 @@
     "ytdlpVersionHeader": "Informationen zur Version der yt-dlp",
     "ytdlpVersionContent": "Zeigt die Version der yt-dlp an und ermöglicht deren Aktualisierung.",
     "chromeExecutablePathHeader": "Pfad zur ausführbaren Datei chrome",
-    "chromeExecutablePathContent": "Pfad zur ausführbaren Chrome-Datei (leer lassen, um gebündeltes Chromium zu verwenden)."
+    "chromeExecutablePathContent": "Pfad zur ausführbaren Chrome-Datei (leer lassen, um gebündeltes Chromium zu verwenden).",
+    "showAdvancedSearchOptionsHeader": "Erweiterte Suchoptionen",
+    "showAdvancedSearchOptionsContent": "Zeigt das Feld mit den erweiterten Suchoptionen an.",
+    "downloadReleaseTypeHeader": "Veröffentlichungstyp herunterladen",
+    "downloadReleaseTypeContent": "Geben Sie die Typen der Elemente an, die heruntergeladen werden sollen.",
+    "downloadReleaseDateHeader": "Veröffentlichungsdatum herunterladen",
+    "downloadReleaseDateContent": "Geben Sie den Veröffentlichungszeitraum der herunterzuladenden Elemente an.",
+    "downloadReleaseDateFromHeader": "Ab Jahr",
+    "downloadReleaseDateFromContent": "Elemente mit einem Veröffentlichungsdatum vor diesem Jahr werden ausgelassen.",
+    "downloadReleaseDateUntilHeader": "Bis Jahr",
+    "downloadReleaseDateUntilContent": "Elemente mit einem Veröffentlichungsdatum nach diesem Jahr werden ausgelassen.",
+    "downloadAlbumsHeader": "Alben",
+    "downloadAlbumsContent": "Schließen Sie beim Herunterladen der Alben des Künstlers vollständige Albumveröffentlichungen ein."
 }

package/src/resources/locales/de-DE/translation.json

@@ -22,13 +22,14 @@
     "detailsModalTitle": "Mediendetails bearbeiten",
     "done": "Fertig",
     "download": "Herunterladen",
+    "downloadAlbums": "Alben",
     "downloadAll": "Alles herunterladen",
     "downloadedPlaylistsCount": "Heruntergeladene Wiedergabelisten: {{num}}",
     "downloadedTracksCount": "Heruntergeladene Spuren: {{num}}",
     "downloadFailed": "Falsch Herunterladen",
     "downloading": "Herunterladen läuft",
     "downloadPlaylist": "Playlist herunterladen",
-    "downloadSinglesAndEps": "Download Singles und EPs",
+    "downloadSinglesAndEps": "Singles und EPs",
     "duration": "Dauer",
     "edit": "Bearbeiten",
     "errors": "Fehler",
@@ -47,6 +48,7 @@
     "formatScopeTab": "Für jeden Tab unterschiedlich",
     "foundDeletedOrPrivateMedia": "Einige gelöschte oder private Medien wurden gefunden. Sie wurden übersprungen und werden in den Ergebnissen nicht angezeigt.",
     "from": "von",
+    "fromYear": "Von (Jahr)",
     "invalidTemplateKeys": "Ungültige Vorlagenschlüssel: {{invalidKeys}}",
     "langName": "Deutsch",
     "loadFromFile": "Aus Datei laden",
@@ -74,11 +76,13 @@
     "playlistOutputTemplate": "Ausgabevorlage (Wiedergabeliste)",
     "playlists": "Wiedergabelisten",
     "reading": "Lesen",
+    "releaseDate": "Veröffentlichungsdatum",
     "releaseYear": "Erscheinungsjahr",
     "resolution": "Qualität",
     "retry": "Wiederholen",
     "selectArtist": "Künstler auswählen",
     "selectInputMode": "Eingabemodus",
+    "showAdvancedSearchOptions": "Erweiterte Suchoptionen",
     "showBrowser": "Webbrowser anzeigen",
     "songOrSongs": "Liedtitel",
     "songs": "Lieder",
@@ -92,6 +96,7 @@
     "totalTracksCount": "Alle Spuren: {{num}}",
     "trackOutputTemplate": "Ausgabevorlage (Audiospuren)",
     "tracks": "Spuren",
+    "untilYear": "Bis (Jahr)",
     "update": "Aktualisierung",
     "videoOutputTemplate": "Ausgabevorlage (videos)",
     "warnings": "Warnungen",

package/src/resources/locales/en-GB/help.json

@@ -146,7 +146,7 @@
     "tabsOrderContent": "Ascending or descending order.",
     "editTrackHeader": "Edit track info",
     "editTrackContent": "Allows to edit track details such as title.",
-    "downloadSinglesAndEpsHeader": "Download singles and eps",
+    "downloadSinglesAndEpsHeader": "Singles and EPs",
     "downloadSinglesAndEpsContent": "Include singles and EPs when downloading artist's albums.",
     "tabsOrderFieldHeader": "Tabs order attribute",
     "tabsOrderFieldContent": "Specifies attribute used to order tabs.",
@@ -163,5 +163,17 @@
     "ytdlpVersionHeader": "Info about yt-dlp library version",
     "ytdlpVersionContent": "Displays version of yt-dlp library and allows to update it.",
     "chromeExecutablePathHeader": "Path to chrome executable",
-    "chromeExecutablePathContent": "Path to chrome executable (leave empty to used bundled chromium)."
+    "chromeExecutablePathContent": "Path to chrome executable (leave empty to used bundled chromium).",
+    "showAdvancedSearchOptionsHeader": "Advanced search options",
+    "showAdvancedSearchOptionsContent": "Displays advanced search options panel.",
+    "downloadReleaseTypeHeader": "Download release type",
+    "downloadReleaseTypeContent": "Specify types of items to be downloaded.",
+    "downloadReleaseDateHeader": "Download release date",
+    "downloadReleaseDateContent": "Specify release date range of items to be downloaded.",
+    "downloadReleaseDateFromHeader": "From year",
+    "downloadReleaseDateFromContent": "Items with release date prior to this year will be omitted",
+    "downloadReleaseDateUntilHeader": "Until year",
+    "downloadReleaseDateUntilContent": "Items with release date after this year will be omitted.",
+    "downloadAlbumsHeader": "Albums",
+    "downloadAlbumsContent": "Include full album releases when downloading artist's albums."
 }

package/src/resources/locales/en-GB/translation.json

@@ -22,13 +22,14 @@
     "detailsModalTitle": "Edit media details",
     "done": "Done",
     "download": "Download",
+    "downloadAlbums": "Albums",
     "downloadAll": "Download All",
     "downloadedPlaylistsCount": "Downloaded playlists: {{num}}",
     "downloadedTracksCount": "Downloaded tracks: {{num}}",
     "downloadFailed": "Download Failed",
     "downloading": "Downloading",
     "downloadPlaylist": "Download Playlist",
-    "downloadSinglesAndEps": "Download singles and eps",
+    "downloadSinglesAndEps": "Singles and EPs",
     "duration": "Duration",
     "edit": "Edit",
     "errors": "Errors",
@@ -47,6 +48,7 @@
     "formatScopeTab": "Different for each tab",
     "foundDeletedOrPrivateMedia": "Encountered some deleted or private media. They were skipped and won't be show in results.",
     "from": "from",
+    "fromYear": "From (year)",
     "invalidTemplateKeys": "Invalid template keys: {{invalidKeys}}",
     "langName": "English",
     "loadFromFile": "Load from file",
@@ -74,11 +76,13 @@
     "playlistOutputTemplate": "Output template (playlists)",
     "playlists": "Playlists",
     "reading": "Reading",
+    "releaseDate": "Release Date",
     "releaseYear": "Release Year",
     "resolution": "Quality",
     "retry": "Retry",
     "selectArtist": "Select artists",
     "selectInputMode": "Input mode",
+    "showAdvancedSearchOptions": "Advanced Search Options",
     "showBrowser": "Show web browser",
     "songOrSongs": "Song title/titles",
     "songs": "Songs",
@@ -92,6 +96,7 @@
     "totalTracksCount": "Total tracks: {{num}}",
     "trackOutputTemplate": "Output template (audio tracks)",
     "tracks": "Tracks",
+    "untilYear": "Until (year)",
     "update": "Update",
     "videoOutputTemplate": "Output template (videos)",
     "warnings": "Warnings",

package/src/resources/locales/pl-PL/help.json

@@ -146,7 +146,7 @@
     "tabsOrderContent": "Rosnąca lub malejąca kolejność.",
     "editTrackHeader": "Edycja danych ścieżki",
     "editTrackContent": "Pozwala na edycję danych ścieżki takich jak tytuł.",
-    "downloadSinglesAndEpsHeader": "Pobieraj single i epki",
+    "downloadSinglesAndEpsHeader": "Single i epki",
     "downloadSinglesAndEpsContent": "Uwzględnij single i epki podczas pobierania dyskografii artysty.",
     "tabsOrderFieldHeader": "Atrybut sortowania zakładek",
     "tabsOrderFieldContent": "Określa atrybut używany do sortowania zakładek.",
@@ -163,5 +163,17 @@
     "ytdlpVersionHeader": "Informacje o bibliotece yt-dlp",
     "ytdlpVersionContent": "Wyświetla wersję biblioteki yt-dlp i umożliwia jej aktualizację.",
     "chromeExecutablePathHeader": "Ścieżka do pliku wykonywalnego chrome",
-    "chromeExecutablePathContent": "Ścieżka do pliku wykonywalnego chrome (pozostaw puste aby użyć chromium dostarczonego razem z aplikacją)."
+    "chromeExecutablePathContent": "Ścieżka do pliku wykonywalnego chrome (pozostaw puste aby użyć chromium dostarczonego razem z aplikacją).",
+    "showAdvancedSearchOptionsHeader": "Zaawansowane opcje wyszukiwania",
+    "showAdvancedSearchOptionsContent": "Panel zaawansowanych opcji wyszukiwania.",
+    "downloadReleaseTypeHeader": "Rodzaj pobieranych elementów",
+    "downloadReleaseTypeContent": "Określa rodzaj elementów, które będą pobrane.",
+    "downloadReleaseDateHeader": "Data wydania",
+    "downloadReleaseDateContent": "Określa przedział lat dla daty wydania elementów, które będą pobrane.",
+    "downloadReleaseDateFromHeader": "Od",
+    "downloadReleaseDateFromContent": "Elementy z datą wydania wcześniejszą niż ten rok zostaną pominięte.",
+    "downloadReleaseDateUntilHeader": "Do",
+    "downloadReleaseDateUntilContent": "Elementy z datą wydania późniejszą niż ten rok zostaną pominięte.",
+    "downloadAlbumsHeader": "Albumy",
+    "downloadAlbumsContent": "Uwzględnij pełne wydania albumów podczas pobierania dyskografii artysty."
 }

package/src/resources/locales/pl-PL/translation.json

@@ -22,13 +22,14 @@
     "detailsModalTitle": "Edycja danych",
     "done": "Gotowe",
     "download": "Pobierz",
+    "downloadAlbums": "Albumy",
     "downloadAll": "Pobierz wszystko",
     "downloadedPlaylistsCount": "Pobrane playlisty: {{num}}",
     "downloadedTracksCount": "Pobrane utwory: {{num}}",
     "downloadFailed": "Pobierz błędne",
     "downloading": "Pobieranie",
     "downloadPlaylist": "Pobierz playlistę",
-    "downloadSinglesAndEps": "Pobieraj single i epki",
+    "downloadSinglesAndEps": "Single i epki",
     "duration": "Czas trwania",
     "edit": "Edytuj",
     "errors": "Błędy",
@@ -47,6 +48,7 @@
     "formatScopeTab": "Oddzielny dla każdej zakładki",
     "foundDeletedOrPrivateMedia": "Napotkano usunięte lub prywatne media. Zostały one pominięte i nie będą wyświetlane w wynikach.",
     "from": "start",
+    "fromYear": "Od (rok)",
     "invalidTemplateKeys": "Nieprawidłowe wartości: {{invalidKeys}}",
     "langName": "Polski",
     "loadFromFile": "Wczytaj z pliku",
@@ -74,11 +76,13 @@
     "playlistOutputTemplate": "Szablon wyjściowy (playlisty)",
     "playlists": "Playlisty",
     "reading": "Odczytywanie",
+    "releaseDate": "Data wydania",
     "releaseYear": "Rok wydania",
     "resolution": "Jakość",
     "retry": "Ponów",
     "selectArtist": "Wybierz wykonawcę",
     "selectInputMode": "Tryb wprowadzania",
+    "showAdvancedSearchOptions": "Zaawansowane opcje wyszukiwania",
     "showBrowser": "Pokaż przeglądarkę",
     "songOrSongs": "Tytuł lub tytuły utworów",
     "songs": "Utwory",
@@ -92,6 +96,7 @@
     "totalTracksCount": "Dostepne utwory: {{num}}",
     "trackOutputTemplate": "Szablon wyjściowy (pliki audio)",
     "tracks": "Ścieżki",
+    "untilYear": "Do (rok)",
     "update": "Aktualizuj",
     "videoOutputTemplate": "Szablon wyjściowy (pliki wideo)",
     "warnings": "Ostrzeżenia",

package/src/views/home/HomeView.tsx

@@ -232,7 +232,7 @@ export const HomeView: React.FC = () => {
         }
     }, [playlists]);
 
-    const loadInfo = (urls: string[]) => {
+    const loadInfo = (urls: string[], fromYear: string, untilYear: string) => {
         clear();
         setPlaylists(_map(urls, (v) => ({url: v, album: {}, tracks: []} as PlaylistInfo)));
         
@@ -244,7 +244,7 @@ export const HomeView: React.FC = () => {
         const basic = [...lists, ...vids];
 
         if (inputMode === InputMode.Artists) {
-            loadArtists(urls);
+            loadArtists(urls, fromYear, untilYear);
             return;
         }
 
@@ -287,15 +287,18 @@ export const HomeView: React.FC = () => {
         }
     };
 
-    const loadArtists = (artists: string[]) => {
+    const loadArtists = (artists: string[], fromYear: string, untilYear: string) => {
         const options: LaunchOptions = global.store.get("options");
         const params: GetYoutubeParams = {
             values: artists,
             lang: i18n.language,
             url: appOptions.youtubeUrl,
             options: {
+                downloadAlbums: appOptions.downloadAlbums,
                 downloadSinglesAndEps: appOptions.downloadSinglesAndEps,
                 multiMatchAction: appOptions.multiMatchAction,
+                fromYear,
+                untilYear
             },
         };
 
@@ -411,12 +414,12 @@ export const HomeView: React.FC = () => {
         }
     };
 
-    const download = async (urls: string[]) => {
+    const download = async (urls: string[], fromYear?: string, untilYear?: string) => {
         const albums = _map(playlists, "album");
         const albumUrls = _map(albums, "url");
 
         if (_isEmpty(playlists) || !_difference(albumUrls, urls)) {
-            loadInfo(urls);
+            loadInfo(urls, fromYear, untilYear);
             setAutoDownload(true);
         } else if (_some(albums, (album) => _some(album, v => _isNil(v)))) {
             setError(true);
@@ -853,7 +856,7 @@ export const HomeView: React.FC = () => {
                         onDownloadFailed={downloadFailed}
                         onLoadInfo={loadInfo}
                     />
-                    <FormatSelector disabled={_isEmpty(playlists) || _isEmpty(tracks)} />
+                    {!_isEmpty(playlists) && <FormatSelector disabled={_isEmpty(playlists) || _isEmpty(tracks)} />}
                 </div>
                 <Grid className={Styles.content} container spacing={2} padding={2}>
                     {error && <Alert className={Styles.error} severity="error">{t("missingMediaInfoError")}</Alert>}

package/src/views/settings/SettingsView.tsx

@@ -17,8 +17,9 @@ import versionInfo from "win-version-info";
 import NorthIcon from "@mui/icons-material/North";
 import SouthIcon from "@mui/icons-material/South";
 import {
-    Box, Button, FormControl, FormControlLabel, FormLabel, Grid, InputLabel, MenuItem, Paper, Radio,
-    RadioGroup, Select, SelectChangeEvent, Stack, Switch, TextField, Typography
+    Box, Button, Checkbox, FormControl, FormControlLabel, FormGroup, FormLabel, Grid, InputLabel,
+    MenuItem, Paper, Radio, RadioGroup, Select, SelectChangeEvent, Stack, Switch, TextField,
+    Typography
 } from "@mui/material";
 
 import {getBinPath} from "../../common/FileSystem";
@@ -159,6 +160,10 @@ export const SettingsView: React.FC = () => {
         setApplicationOptions((prev) => ({...prev, downloadSinglesAndEps: e.target.checked}));
     };
     
+    const onDownloadAlbumsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        setApplicationOptions((prev) => ({...prev, downloadAlbums: e.target.checked}));
+    };
+    
     const onOverwriteChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         setApplicationOptions((prev) => ({...prev, alwaysOverwrite: e.target.checked}));
     };
@@ -188,7 +193,7 @@ export const SettingsView: React.FC = () => {
         setYtDlpVersion(info.FileVersion);
     };
 
-    const onUpdateYtDlpClick = async (event: React.MouseEvent<HTMLButtonElement>) => {       
+    const onUpdateYtDlpClick = async () => {       
         const child = spawn(global.store.get("application.ytdlpExecutablePath") || `${getBinPath()}/yt-dlp.exe`, ["-U"], {shell: true});
         
         setUpdatingYtDlp(true);
@@ -285,8 +290,14 @@ export const SettingsView: React.FC = () => {
                                 </Grid>
                             }
                         </Grid>
-                        <Grid size={12} data-help="downloadSinglesAndEps">
-                            <FormControlLabel control={<Switch checked={applicationOptions.downloadSinglesAndEps} onChange={onDownloadSinglesAndEpsChange} />} label={t("downloadSinglesAndEps")} />
+                        <Grid size={12} data-help="downloadReleaseType">
+                            <FormControl>
+                                <FormLabel component="legend">{t("download")}</FormLabel>
+                                <FormGroup row>
+                                    <FormControlLabel data-help="downloadAlbums" control={<Checkbox checked={applicationOptions.downloadAlbums} onChange={onDownloadAlbumsChange} />} label={t("downloadAlbums")} />
+                                    <FormControlLabel data-help="downloadSinglesAndEps" control={<Checkbox checked={applicationOptions.downloadSinglesAndEps} onChange={onDownloadSinglesAndEpsChange} />} label={t("downloadSinglesAndEps")} />
+                                </FormGroup>
+                            </FormControl>
                         </Grid>
                         <Grid size={12} data-help="alwaysOverwrite">
                             <FormControlLabel control={<Switch checked={applicationOptions.alwaysOverwrite} onChange={onOverwriteChange} />} label={t("alwaysOverwrite")} />