Fix: importing subscriptions with terminated channels #3816

ChunkyProgrammer · 2023-07-26T19:27:35Z

Fix: importing subscriptions with terminated channels

Pull Request Type

Bugfix

Related issue

closes #3735

Description

Import subscriptions when terminated channels found, etc.

Testing

See: #3735 (comment)

Change file extension .txt to .db

Desktop

OS: Windows
OS Version: 10
FreeTube version: 0.18.0

Additional context

@efb4f5ff-1298-471a-8973-3d47447115dc I could not find the freetube-subscriptions.json that you mentioned

src/renderer/components/data-settings/data-settings.js

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-07-27T00:43:19Z

@ChunkyProgrammer ah sorry about that. See #3735 (comment) to get json file

PikachuEXE · 2023-07-27T00:52:56Z

When I import that freetube-subscriptions.json from #3735 (comment)
FT does nothing beside this message (no channel imported)

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-07-27T01:00:43Z

That matches with my foundlings when looking at latest dev branch in #3735 (comment)

But idk why it does nothing

PikachuEXE · 2023-07-27T01:07:12Z

Tested [SubscriptionsError.csv](https://github.com/FreeTubeApp/FreeTube/files/12018412/SubscriptionsError.csv)

ChunkyProgrammer · 2023-07-27T01:20:42Z

freetube-subscriptions.json should work now

src/renderer/components/data-settings/data-settings.js

PikachuEXE · 2023-07-27T01:34:39Z

Can someone explain what's channel.service_id === 0?

ChunkyProgrammer · 2023-07-27T01:38:39Z

Can someone explain what's channel.service_id === 0?

Newpipe has different services (bandcamp, youtube, etc.). 0 is the id for youtube but it can probably be removed so we check the url instead

PikachuEXE · 2023-07-27T01:40:40Z

Yes please
Or at least add a code comment about it (very confusing when reading the code)

PikachuEXE · 2023-07-27T01:42:57Z

freetube-subscriptions.json now works (but no error, expected?)

ChunkyProgrammer · 2023-07-27T01:47:38Z

freetube-subscriptions.json now works (but no error, expected?)

I believe so (that file was only erroring because there was no service id in it so all subscriptions were filtered out)

only check url, not service_id

absidue · 2023-07-28T22:52:34Z

src/renderer/components/data-settings/data-settings.js

@@ -1056,7 +1055,7 @@ export default defineComponent({
        const channel = await getLocalChannel(channelId)

        if (channel.alert) {
-          return undefined
+          return []


I know that returning an empty array is inline with the other parts of this file, however I think we should change that in all places, because we don't check for the empty array anywhere.

e.g. on this line we check if the author property of the return value is undefined, so when we return an empty array we are checking if [].author is undefined, as that property never exists, the check succeeds. Checking an array for a property that never exists seems wrong to me, either we should be checking for an empty array, or change the return values to be something other than an empty array, so that the checks make more sense.

FreeTube/src/renderer/components/data-settings/data-settings.js

Line 1112 in 4a86fa1

if (typeof channelInfo.author !== 'undefined') {

Separate PR? (Since I have no idea what do you mean

Also more difficult to review with more changes, this is just to fix importing

Doing it in a separate pull request sounds good to me. The current solution works, so technically the bug is fixed, it's just that the way it's done in the whole file, including this pull request, is bad and makes the code confusing. I suspect it's leftover from a previous refactoring.

Hopefully chunky understands what I mean, otherwise I can do it myself.

absidue

Approving as per discussion above.

efb4f5ff-1298-471a-8973-3d47447115dc

profiles.txt imported successfully without any errors
subscriptions.csv imported successfully but i did get an error in the console but i think that was expected
SubscriptionsError.csv imported successfully but i did get an error in the console but i think that was expected
SubscriptionsNoError.csv imported successfully without any errors
Test.Subscriptions.txt imported successfully without any errors
https://jumpshare.com/v/hrxb5KFMfmqOda4egFFN imported successfully without any errors

If those errors are indeed expected, i'll approve.

ChunkyProgrammer · 2023-08-01T01:10:11Z

@efb4f5ff-1298-471a-8973-3d47447115dc those errors are expected

* development: (33 commits) Miscellaneous CSS cleanup (FreeTubeApp#3847) Fix empty channels showing up as errored with RSS (FreeTubeApp#3824) Fix author for album playlists on the playlist page (FreeTubeApp#3838) Update Snap Source Host Location (FreeTubeApp#3844) * Show error message in popular tab when instance does not support it (FreeTubeApp#3841) Use video durations from the watch history for RSS (FreeTubeApp#3839) ! Fix unnecessary error message display in toast when paused before video started playing on load (FreeTubeApp#3835) Use emit and props instead of $parent (FreeTubeApp#3834) Add custom toast event bus for Vue 3 compatiblity (FreeTubeApp#3833) Fix handling of DeArrow titles (FreeTubeApp#3825) * Update top nav bar icon to remove focus state style (FreeTubeApp#3792) Update ft-input for top navbar search input to behave more like Youtube one (FreeTubeApp#3793) Translated using Weblate (Hungarian) Fix: importing subscriptions with terminated channels (FreeTubeApp#3816) Fix outdated subscription cache clearing code when "Remove All Subscriptions / Profiles" performed (FreeTubeApp#3817) Translated using Weblate (Croatian) Bump eslint-plugin-import from 2.27.5 to 2.28.0 (FreeTubeApp#3827) Bump eslint from 8.45.0 to 8.46.0 (FreeTubeApp#3829) Bump eslint-plugin-unicorn from 48.0.0 to 48.0.1 (FreeTubeApp#3828) Bump lefthook from 1.4.6 to 1.4.7 (FreeTubeApp#3830) ... # Conflicts: # src/renderer/components/ft-list-video/ft-list-video.js # src/renderer/components/playlist-info/playlist-info.js # src/renderer/components/playlist-info/playlist-info.vue # src/renderer/components/watch-video-info/watch-video-info.js

* feature/playlist-2023-05: (31 commits) Miscellaneous CSS cleanup (FreeTubeApp#3847) Fix empty channels showing up as errored with RSS (FreeTubeApp#3824) Fix author for album playlists on the playlist page (FreeTubeApp#3838) Update Snap Source Host Location (FreeTubeApp#3844) * Show error message in popular tab when instance does not support it (FreeTubeApp#3841) Use video durations from the watch history for RSS (FreeTubeApp#3839) ! Fix unnecessary error message display in toast when paused before video started playing on load (FreeTubeApp#3835) Use emit and props instead of $parent (FreeTubeApp#3834) Add custom toast event bus for Vue 3 compatiblity (FreeTubeApp#3833) Fix handling of DeArrow titles (FreeTubeApp#3825) * Update top nav bar icon to remove focus state style (FreeTubeApp#3792) Update ft-input for top navbar search input to behave more like Youtube one (FreeTubeApp#3793) Translated using Weblate (Hungarian) Fix: importing subscriptions with terminated channels (FreeTubeApp#3816) Fix outdated subscription cache clearing code when "Remove All Subscriptions / Profiles" performed (FreeTubeApp#3817) Translated using Weblate (Croatian) Bump eslint-plugin-import from 2.27.5 to 2.28.0 (FreeTubeApp#3827) Bump eslint from 8.45.0 to 8.46.0 (FreeTubeApp#3829) Bump eslint-plugin-unicorn from 48.0.0 to 48.0.1 (FreeTubeApp#3828) Bump lefthook from 1.4.6 to 1.4.7 (FreeTubeApp#3830) ...

Fix: Cannot read properties of undefined (reading 'author')

1d3d9df

ChunkyProgrammer requested review from PikachuEXE, absidue and efb4f5ff-1298-471a-8973-3d47447115dc July 26, 2023 19:27

FreeTubeBot enabled auto-merge (squash) July 26, 2023 19:27

github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Jul 26, 2023

absidue reviewed Jul 26, 2023

View reviewed changes

src/renderer/components/data-settings/data-settings.js Show resolved Hide resolved

PikachuEXE mentioned this pull request Jul 27, 2023

Fix outdated subscription cache clearing code when "Remove All Subscriptions / Profiles" performed #3817

Merged

4 tasks

PikachuEXE previously approved these changes Jul 27, 2023

View reviewed changes

ChunkyProgrammer dismissed PikachuEXE’s stale review via 146c75e July 27, 2023 01:20

ChunkyProgrammer requested review from PikachuEXE and absidue July 27, 2023 01:20

github-advanced-security bot found potential problems Jul 27, 2023

View reviewed changes

src/renderer/components/data-settings/data-settings.js Fixed Show fixed Hide fixed

fix importing some newpipe subscriptions

4a86fa1

only check url, not service_id

ChunkyProgrammer force-pushed the fix-subscriptions branch from b3700ae to 4a86fa1 Compare July 27, 2023 01:48

PikachuEXE approved these changes Jul 27, 2023

View reviewed changes

absidue reviewed Jul 28, 2023

View reviewed changes

absidue approved these changes Jul 29, 2023

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc reviewed Jul 29, 2023

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc approved these changes Aug 1, 2023

View reviewed changes

FreeTubeBot merged commit 2296e3a into FreeTubeApp:development Aug 1, 2023
5 checks passed

github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Aug 1, 2023

ChunkyProgrammer deleted the fix-subscriptions branch August 15, 2023 19:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: importing subscriptions with terminated channels #3816

Fix: importing subscriptions with terminated channels #3816

ChunkyProgrammer commented Jul 26, 2023 •

edited by efb4f5ff-1298-471a-8973-3d47447115dc

Loading

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

absidue Jul 28, 2023

PikachuEXE Jul 28, 2023

PikachuEXE Jul 28, 2023

absidue Jul 29, 2023

absidue left a comment

efb4f5ff-1298-471a-8973-3d47447115dc left a comment •

edited

Loading

ChunkyProgrammer commented Aug 1, 2023

Fix: importing subscriptions with terminated channels #3816

Fix: importing subscriptions with terminated channels #3816

Conversation

ChunkyProgrammer commented Jul 26, 2023 • edited by efb4f5ff-1298-471a-8973-3d47447115dc Loading

Fix: importing subscriptions with terminated channels

Pull Request Type

Related issue

Description

Testing

Desktop

Additional context

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

PikachuEXE commented Jul 27, 2023

ChunkyProgrammer commented Jul 27, 2023

absidue Jul 28, 2023

Choose a reason for hiding this comment

PikachuEXE Jul 28, 2023

Choose a reason for hiding this comment

PikachuEXE Jul 28, 2023

Choose a reason for hiding this comment

absidue Jul 29, 2023

Choose a reason for hiding this comment

absidue left a comment

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc left a comment • edited Loading

Choose a reason for hiding this comment

ChunkyProgrammer commented Aug 1, 2023

ChunkyProgrammer commented Jul 26, 2023 •

edited by efb4f5ff-1298-471a-8973-3d47447115dc

Loading

efb4f5ff-1298-471a-8973-3d47447115dc left a comment •

edited

Loading