Skip to content

Commit

Permalink
rename files to tunarr to avoid confusion (#149)
Browse files Browse the repository at this point in the history
  • Loading branch information
markdavella authored Mar 6, 2024
1 parent bfe3d04 commit 67edef5
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion web/public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
4 changes: 2 additions & 2 deletions web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import { Outlet, Link as RouterLink } from 'react-router-dom';
import './App.css';
import ServerEvents from './components/ServerEvents.tsx';
import VersionFooter from './components/VersionFooter.tsx';
import { useVersion } from './hooks/useVersion.ts';
import useStore from './store/index.ts';
import { setDarkModeState } from './store/themeEditor/actions.ts';
import { useVersion } from './hooks/useVersion.ts';

interface NavItem {
name: string;
Expand Down Expand Up @@ -156,7 +156,7 @@ export function Root() {
>
<img
style={{ width: '2rem', height: '2rem', marginTop: '0.4em' }}
src="/dizquetv.png"
src="/tunarr.png"
/>
</Link>
<Typography
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function ChannelProgrammingOrganizeOptions({
</MenuItem>
</Tooltip>
<Tooltip
title="Makes multiple copies of the schedule and plays them in sequence. Normally this isn't necessary, because dizqueTV will always play the schedule back from the beginning when it finishes. But creating replicas is a useful intermediary step sometimes before applying other transformations. Note that because very large channels can be problematic, the number of replicas will be limited to avoid creating really large channels."
title="Makes multiple copies of the schedule and plays them in sequence. Normally this isn't necessary, because Tunarr will always play the schedule back from the beginning when it finishes. But creating replicas is a useful intermediary step sometimes before applying other transformations. Note that because very large channels can be problematic, the number of replicas will be limited to avoid creating really large channels."
placement="right"
>
<MenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function ChannelPropertiesEditor() {
useEffect(() => {
if (!prevChannel && channel) {
const url = isEmpty(channel.icon.path)
? `/dizquetv.png`
? `/tunarr.png`
: channel.icon.path;
setChannelIcon(url);
setChannelIconPreview(url);
Expand Down
2 changes: 1 addition & 1 deletion web/src/generated/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const createChannelV2_Body = z.object({
position: z.string(),
}),
guideMinimumDurationSeconds: z.number().optional().default(300),
groupTitle: z.string().optional().default('dizqueTV'),
groupTitle: z.string().optional().default('Tunarr'),
disableFillerOverlay: z.boolean().optional(),
offline: z
.object({
Expand Down
11 changes: 7 additions & 4 deletions web/src/helpers/plexLogin.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { compact, partition } from 'lodash-es';
import { apiClient } from '../external/api.ts';
import { AsyncInterval } from './AsyncInterval.ts';
import { sequentialPromises } from './util.ts';
import { apiClient } from '../external/api.ts';

// From Plex: The Client Identifier identifies the specific instance of your app. A random string or UUID is sufficient here. There are no hard requirements for Client Identifier length or format, but once one is generated the client should store and re-use this identifier for subsequent requests.
const ClientIdentifier = 'p86cy1w47clco3ro8t92nfy1';

const PlexLoginHeaders = {
Accept: 'application/json',
'X-Plex-Product': 'dizqueTV',
'X-Plex-Product': 'Tunarr',
'X-Plex-Version': 'Plex OAuth',
'X-Plex-Client-Identifier': 'rg14zekk3pa5zp4safjwaa8z',
'X-Plex-Client-Identifier': ClientIdentifier,
'X-Plex-Model': 'Plex OAuth',
};

Expand Down Expand Up @@ -83,7 +86,7 @@ export const plexLoginFlow = async () => {
};

const authWindow = window.open(
`https://app.plex.tv/auth/#!?clientID=rg14zekk3pa5zp4safjwaa8z&context[device][version]=Plex OAuth&context[device][model]=Plex OAuth&code=${initialResponseBody.code}&context[device][product]=Plex Web`,
`https://app.plex.tv/auth/#!?clientID=${ClientIdentifier}&context[device][version]=Plex OAuth&context[device][model]=Plex OAuth&code=${initialResponseBody.code}&context[device][product]=Plex Web`,
'_blank',
`height=${plexWindowSizes.height}, width=${plexWindowSizes.width}, top=${plexWindowPosition.height}, left=${plexWindowPosition.width}`,
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/channels/ChannelsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default function ChannelsPage() {
<img
style={{ maxHeight: '40px' }}
src={
isEmpty(channel.icon.path) ? '/dizquetv.png' : channel.icon.path
isEmpty(channel.icon.path) ? '/tunarr.png' : channel.icon.path
}
/>
</TableCell>
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/guide/GuidePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import { isEmpty, round } from 'lodash-es';
import { Fragment, useCallback, useEffect, useState } from 'react';
import { useInterval } from 'usehooks-ts';
import PaddedPaper from '../../components/base/PaddedPaper.tsx';
import { formatProgramDuration } from '../../helpers/util.ts';
import { prefetchAllTvGuides, useAllTvGuides } from '../../hooks/useTvGuide.ts';
import useStore from '../../store/index.ts';
import { setGuideDurationState } from '../../store/themeEditor/actions.ts';
import { formatProgramDuration } from '../../helpers/util.ts';

dayjs.extend(duration);
dayjs.extend(isBetween);
Expand Down Expand Up @@ -656,7 +656,7 @@ export default function GuidePage() {
style={{ maxHeight: '40px' }}
src={
isEmpty(channel.icon?.path)
? '/dizquetv.png'
? '/tunarr.png'
: channel.icon?.path
}
/>
Expand Down
14 changes: 7 additions & 7 deletions web/src/pages/settings/XmlTvSettingsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React, { useEffect } from 'react';
import {
Alert,
Button,
Expand All @@ -10,10 +9,11 @@ import {
Stack,
TextField,
} from '@mui/material';
import { useXmlTvSettings } from '../../hooks/settingsHooks.ts';
import { hasOnlyDigits } from '../../helpers/util.ts';
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { XmlTvSettings, defaultXmlTvSettings } from '@tunarr/types';
import React, { useEffect } from 'react';
import { hasOnlyDigits } from '../../helpers/util.ts';
import { useXmlTvSettings } from '../../hooks/settingsHooks.ts';

export default function XmlTvSettingsPage() {
const { data, isPending, error } = useXmlTvSettings();
Expand Down Expand Up @@ -182,10 +182,10 @@ export default function XmlTvSettingsPage() {
/>
<FormHelperText>
If enabled the pictures used for Movie and TV Show posters will be
cached in dizqueTV's .dizqueTV folder and will be delivered by
dizqueTV's server instead of requiring calls to Plex. Note that using
fixed xmltv location in Plex (as opposed to url) will not work
correctly in this case.
cached in Tunarr's .tunarr folder and will be delivered by Tunarr's
server instead of requiring calls to Plex. Note that using fixed xmltv
location in Plex (as opposed to url) will not work correctly in this
case.
</FormHelperText>
</FormControl>
<Stack spacing={2} direction="row" justifyContent="right" sx={{ mt: 2 }}>
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/welcome/WelcomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default function WelcomePage() {
margin: '0 auto',
textAlign: 'center',
}}
src="/dizquetv.png"
src="/tunarr.png"
/>
<Typography variant="h3">Welcome to Tunarr!</Typography>
</>
Expand Down

0 comments on commit 67edef5

Please sign in to comment.