Merge branch 'master' into new-torrent

web/src/components/Add/AddDialog.jsx

@@ -67,7 +67,10 @@ export default function AddDialog({
 
     const allHashes = torrents.map(({ hash }) => hash)
     allHashes.includes(currentSourceHash) && handleClose()
-  }, [isSaving, torrents, currentSourceHash, handleClose])
+    // FIXME! check api reply on add links
+    const linkRegex = /^(http(s?)):\/\/.*/i
+    torrentSource.match(linkRegex) !== null && handleClose()
+  }, [isSaving, torrents, torrentSource, currentSourceHash, handleClose])
 
   const fullScreen = useMediaQuery('@media (max-width:930px)')
 

web/src/components/App/index.jsx

@@ -95,8 +95,16 @@ export default function App() {
                       )}
                     </HeaderToggle>
 
-                    <HeaderToggle onClick={() => (currentLang === 'en' ? changeLang('ru') : changeLang('en'))}>
-                      {currentLang === 'en' ? 'EN' : 'RU'}
+                    <HeaderToggle
+                      onClick={() =>
+                        currentLang === 'en'
+                          ? changeLang('ru')
+                          : currentLang === 'ru'
+                          ? changeLang('ua')
+                          : changeLang('en')
+                      }
+                    >
+                      {currentLang.toUpperCase()}
                     </HeaderToggle>
                   </div>
                 </AppHeader>

web/src/components/DialogTorrentDetailsContent/Table/style.js

@@ -1,11 +1,11 @@
 import styled, { css } from 'styled-components'
 
-const viewedPrimaryColor = '#bdbdbd'
-const viewedSecondaryColor = '#c4c4c4'
-const viewedTertiaryColor = '#c9c9c9'
-const bigTableDividerColor = '#ddd'
-const bigTableDefaultRowColor = '#fff'
-const bigTableViewedRowColor = '#f3f3f3'
+const viewedPrimaryColor = '#858c90'
+const viewedSecondaryColor = '#8c9498'
+const viewedTertiaryColor = '#949ca0'
+const bigTableDividerColor = '#d2d2d2'
+const bigTableDefaultRowColor = '#f3f3f3'
+const bigTableViewedRowColor = '#ddd'
 
 const viewedIndicator = css`
   ${({
@@ -187,7 +187,7 @@ export const ShortTable = styled.div`
         grid-template-columns: repeat(3, 1fr);
         align-items: center;
         gap: 20px;
-        background: #fff;
+        background: #f3f3f3;
 
         @media (max-width: 410px) {
           gap: 10px;

web/src/components/DialogTorrentDetailsContent/TorrentCache/index.jsx

@@ -93,7 +93,7 @@ const TorrentCache = ({ cache, isMini, isSnakeDebugMode }) => {
 
       if (isSnakeDebugMode && priority > 0) {
         let info = ''
-        if (priority === 1) info = '*'
+        if (priority === 1) info = ''
         else if (priority === 2) info = 'H'
         else if (priority === 3) info = 'R'
         else if (priority === 4) info = 'N'

web/src/components/DialogTorrentDetailsContent/TorrentCache/snakeSettings.js

@@ -7,10 +7,10 @@ export const snakeSettings = {
       borderWidth: 1,
       pieceSize: 14,
       gapBetweenPieces: 3,
-      borderColor: rgba('#949ca0', 0.25),
+      borderColor: rgba('#fff', 0.2),
       completeColor: rgba(mainColors.dark.primary, 0.5),
-      backgroundColor: '#f1eff3',
-      progressColor: mainColors.dark.secondary,
+      backgroundColor: '#949ca0',
+      progressColor: rgba('#fff', 0.2),
       readerColor: '#8f0405',
       rangeColor: '#cda184',
     },

web/src/components/DialogTorrentDetailsContent/TorrentFunctions/index.jsx

@@ -28,13 +28,16 @@ const TorrentFunctions = memo(
           <>
             <SmallLabel>{t('DownloadPlaylist')}</SmallLabel>
             <SectionSubName mb={10}>
-              <strong>{t('LatestFilePlayed')}</strong> {latestViewedFileData?.title}.
-              {latestViewedFileData?.season && (
-                <>
-                  {' '}
-                  {t('Season')}: {latestViewedFileData?.season}. {t('Episode')}: {latestViewedFileData?.episode}.
-                </>
-              )}
+              {t('LatestFilePlayed')}{' '}
+              <strong>
+                {latestViewedFileData?.title}.
+                {latestViewedFileData?.season && (
+                  <>
+                    {' '}
+                    {t('Season')}: {latestViewedFileData?.season}. {t('Episode')}: {latestViewedFileData?.episode}.
+                  </>
+                )}
+              </strong>
             </SectionSubName>
 
             <MainSectionButtonGroup>

web/src/components/DialogTorrentDetailsContent/style.js

@@ -289,7 +289,7 @@ export const LoadingProgress = styled.div.attrs(
     return {
       // this block is here according to styled-components recomendation about fast changable components
       style: {
-        background: `linear-gradient(to right, ${gradientStartColor} 0%, ${gradientEndColor} ${percentage}%, #fff ${percentage}%, #fff 100%)`,
+        background: `linear-gradient(to right, ${gradientStartColor} 0%, ${gradientEndColor} ${percentage}%, #eee ${percentage}%, #fff 100%)`,
       },
     }
   },

web/src/components/Settings/SecondarySettingsComponent.jsx

@@ -10,6 +10,7 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
   const {
     RetrackersMode,
     TorrentDisconnectTimeout,
+    EnableDLNA,
     EnableIPv6,
     ForceEncrypt,
     DisableTCP,
@@ -133,6 +134,11 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
         label='UPnP (Universal Plug and Play)'
         labelPlacement='start'
       />
+      <FormControlLabel
+        control={<Switch checked={EnableDLNA} onChange={inputForm} id='EnableDLNA' color='secondary' />}
+        label={t('SettingsDialog.DLNA')}
+        labelPlacement='start'
+      />
       <br />
       <InputLabel htmlFor='RetrackersMode'>{t('SettingsDialog.RetrackersMode')}</InputLabel>
       <Select