VLCMediaList: removeMediaAt (closes #182) #34

mkchoi212 · 2018-08-01T03:47:19Z

Reference https://code.videolan.org/videolan/VLCKit/issues/182

- Returns NSUInteger instead of NSInteger - Returns NSNotFound if media is not found

mkchoi212 · 2018-08-01T03:48:24Z

Sources/VLCMediaList.m

 {
+    VLCMedia *target = [_mediaObjects objectAtIndex:index];


objectAtIndex checks if the provided index is in range

This will lead to an out-of-bounds exception and early application termination by the runtime if the index is not in range. Please add sanity checks.

I personally think this is the desirable behavior for the end user. I had a hard time debugging things when removeMediaAtIndex function wasn't critically failing even when an invalid index was passed to it.

No, the library shouldn't crash due to a potentially inconsistent state.

mkchoi212 · 2018-08-01T03:49:20Z

Headers/Public/VLCMediaList.h

 * \note this function silently fails if the list is read-only
 */
- (void)removeMediaAtIndex:(NSUInteger)index;
+- (VLCMedia *)removeMediaAtIndex:(NSUInteger)index;


Replicates Swift STL's func remove(at: Int) -> T

I don't understand why you want to return a VLCMedia instance that is gone from the list.

Swift STL's remove(at:) behaves the same way and if the function doesn't returns void, how do I easily tell if a media had been deleted or not? A way to do is to raise NSRangeException, which leads to the use of indexOf without sanity checks in the function. Sorry if I'm not making sense 😅

Considering BOOL as a return value to expose the successful deletion. This matches typical AppKit behavior.

mkchoi212 · 2018-08-01T04:31:34Z

Sources/VLCMediaList.m

@@ -217,11 +217,6 @@ - (void)insertObject:(VLCMedia *)object inMediaAtIndex:(NSUInteger)i
    [self insertMedia:object atIndex:i];
 }

- (void)removeObjectFromMediaAtIndex:(NSUInteger)i


Seems like it's not being used anywhere

fkuehne · 2018-08-01T12:26:06Z

Sources/VLCMediaList.m

 {
+    VLCMedia *target = [_mediaObjects objectAtIndex:index];


This will lead to an out-of-bounds exception and early application termination by the runtime if the index is not in range. Please add sanity checks.

fkuehne · 2018-08-01T12:26:13Z

Headers/Public/VLCMediaList.h

 * \note this function silently fails if the list is read-only
 */
- (void)removeMediaAtIndex:(NSUInteger)index;
+- (VLCMedia *)removeMediaAtIndex:(NSUInteger)index;


I don't understand why you want to return a VLCMedia instance that is gone from the list.

fkuehne · 2018-08-01T12:27:15Z

Sources/VLCMediaList.m

@@ -217,11 +217,6 @@ - (void)insertObject:(VLCMedia *)object inMediaAtIndex:(NSUInteger)i
    [self insertMedia:object atIndex:i];
 }

- (void)removeObjectFromMediaAtIndex:(NSUInteger)i


fkuehne · 2018-08-01T12:28:35Z

Sources/VLCMediaList.m

    });
-    [self didChange:NSKeyValueChangeRemoval valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];
-
+


Why do you remove support for key-value coding here?

Ah I forgot to ask you about this. I personally didn't know you could do this until I saw the code for it. So, is this a feature that is used by users when they already have Notifications and delegates they can check?

This is a used feature throughout multiple places of VLCKit, notably VLCMedia and VLCMediaPlayer. Especially the VLC-iOS app uses it.

fkuehne · 2018-08-01T12:29:33Z

Sources/VLCMediaList.m

-        if (index >= [_mediaObjects count])
-            return;
-        //remove from cached Media
+        // Remove from cached Media


hmm, why do you remove the sanity check here? This is not a fail-safe operation.

carolanitz · 2018-08-06T10:01:32Z

Headers/Public/VLCMediaList.h

@@ -104,12 +104,13 @@ extern NSString *const VLCMediaListItemDeleted;
 - (void)insertMedia:(VLCMedia *)media atIndex:(NSUInteger)index;

 /**
- * remove a media from a given position
+ * remove and return the boolean result of the operation


remove media at position index and return true if the operation was successful. An unsuccessful operation occurs when the index is greater than the medialists count

Well said 👍

carolanitz · 2018-08-06T10:10:09Z

Sources/VLCMedia.m

+- (BOOL)isEqual:(id)other
+{
+    return ([other isKindOfClass: [VLCMedia class]] &&
+            [other libVLCMediaDescriptor] == p_md);


carolanitz · 2018-08-06T10:31:19Z

Sources/VLCMediaList.m

 {
-    NSInteger result = libvlc_media_list_index_of_item(p_mlist, [media libVLCMediaDescriptor]);
-    return result;
+    return [_mediaObjects indexOfObject:media];


Do all these changes to indexOfMedia and removeMediaAtIndex work with discovered media in a network as well? Being in a WLAN with a NAS or twonky server for example should be enough to test these changes

I think so. There is no reason why it shouldn't. And not really sure how to test

Being in a WLAN with a NAS or twonky server

😅

you can try it for 30 days :) https://twonky.com/

and then you set it up build vlc ios with the custom vlckit and just check as it discovers files that all files are discovered and that it doesn't crash somewhere unexpected and when you delete one out of the discovered folder that it all works as expected

Just confirmed it still works and found a bug while at it :D

carolanitz · 2018-08-06T10:33:59Z

Sources/VLCMediaList.m

 {
+    NSNumber *index = arguments[0][@"index"];
+    VLCMedia *deleted = arguments[0][@"media"];


can you use .first or firstobject instead of [0]?

carolanitz

looks really good!

carolanitz · 2018-08-23T15:08:23Z

this was merged with 005bcd7 & 759bad2 & 0735d2b & 6413080

mkchoi212 added 2 commits August 1, 2018 12:45

VLCMedia: Add isEqual

d928543

VLCMediaList: Update indexOfMedia

e40b9da

- Returns NSUInteger instead of NSInteger - Returns NSNotFound if media is not found

mkchoi212 commented Aug 1, 2018

View reviewed changes

mkchoi212 force-pushed the medialist-fix branch from a129215 to d2eaa5b Compare August 1, 2018 04:31

mkchoi212 commented Aug 1, 2018

View reviewed changes

mkchoi212 mentioned this pull request Aug 1, 2018

Tests: VLCMediaList #35

Open

fkuehne self-requested a review August 1, 2018 12:22

fkuehne reviewed Aug 1, 2018

View reviewed changes

mkchoi212 force-pushed the medialist-fix branch from d2eaa5b to 1ae63ef Compare August 3, 2018 05:06

carolanitz reviewed Aug 6, 2018

View reviewed changes

mkchoi212 added 2 commits August 7, 2018 14:23

VLCMediaList: Fix removeMediaAtIndex (closes #182)

aa1c6a8

VLCMediaList: Remove removeObjectFromMediaAtIndex

14c309c

mkchoi212 force-pushed the medialist-fix branch from 1ae63ef to 14c309c Compare August 7, 2018 05:23

carolanitz self-requested a review August 23, 2018 09:40

carolanitz approved these changes Aug 23, 2018

View reviewed changes

carolanitz closed this Aug 23, 2018

mkchoi212 deleted the medialist-fix branch August 23, 2018 15:08

VLCMediaList: removeMediaAt (closes #182) #34

VLCMediaList: removeMediaAt (closes #182) #34

mkchoi212 commented Aug 1, 2018

mkchoi212 Aug 1, 2018

fkuehne Aug 1, 2018

mkchoi212 Aug 2, 2018

fkuehne Aug 2, 2018

mkchoi212 Aug 1, 2018

fkuehne Aug 1, 2018

mkchoi212 Aug 2, 2018

fkuehne Aug 2, 2018

mkchoi212 Aug 1, 2018

fkuehne Aug 1, 2018

fkuehne Aug 1, 2018

fkuehne Aug 1, 2018

fkuehne Aug 1, 2018

fkuehne Aug 1, 2018

mkchoi212 Aug 2, 2018

fkuehne Aug 2, 2018

fkuehne Aug 1, 2018

carolanitz Aug 6, 2018

mkchoi212 Aug 7, 2018

carolanitz Aug 6, 2018

carolanitz Aug 6, 2018

mkchoi212 Aug 7, 2018

carolanitz Aug 7, 2018

carolanitz Aug 7, 2018

mkchoi212 Aug 10, 2018

carolanitz Aug 6, 2018

carolanitz left a comment

carolanitz commented Aug 23, 2018

		});
		[self didChange:NSKeyValueChangeRemoval valuesAtIndexes:[NSIndexSet indexSetWithIndex:[index intValue]] forKey:@"media"];

VLCMediaList: removeMediaAt (closes #182) #34

VLCMediaList: removeMediaAt (closes #182) #34

Conversation

mkchoi212 commented Aug 1, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carolanitz left a comment

Choose a reason for hiding this comment

carolanitz commented Aug 23, 2018