- gtk: sort channels case-insensitively in "Saved channels"

- Added a few more default channels. - gtk: update `%channels` by reading the channels file, before overwriting the file.
trizen · Oct 12, 2020 · e7446a4 · e7446a4
1 parent ac35014
commit e7446a4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/bin/gtk2-youtube-viewer b/bin/gtk2-youtube-viewer
@@ -1881,7 +1881,6 @@ sub set_youtube_tops {
                          'UCUHW94eEFW7hkUMVaZz4eDg' => 'MinutePhysics',
                          'UCYeF244yNGuFefuFKqxIAXw' => 'The Royal Institution',
                          'UCX6b17PVsYBQ0ip5gyeme-Q' => 'CrashCourse',
-                         'UCwbsWIWfcOL2FiUZ2hKNJHQ' => 'UCBerkeley',
                          'UCEBb1b_L6zDS3xTUrIALZOw' => 'MIT OpenCourseWare',
                          'UCAuUUnT6oDeKwE6v1NGQxug' => 'TED',
                          'UCvBqzzvUBLCs8Y7Axb-jZew' => 'Sixty Symbols',
@@ -1894,10 +1893,15 @@ sub set_youtube_tops {
                          'UC0wbcfzV-bHhABbWGXKHwdg' => 'Utah Open Source',
                          'UCotwjyJnb-4KW7bmsOoLfkg' => 'Art of the Problem',
                          'UC7y4qaRSb5w2O8cCHOsKZDw' => 'YAPC NA',
+                         'UC1t6kKXoBvjdr8m9KJ2Fx7A' => 'Gresham College',
+                         'UCGHZpIpAWJQ-Jy_CeCdXhMA' => 'Cool Worlds',
+                         'UCXZIDlJ_DgzrEwYop2s3JOQ' => 'National Museum of Mathematics',
+                         'UCLnGGRG__uGSPLBLzyhg8dQ' => 'Oxford Mathematics',
+                         'UCmG6gHgD8JaEZVxuHWJijGQ' => 'UConn Mathematics',
                         );
         }
 
-        foreach my $channel (sort { ($channels{$a} // lc($a)) cmp($channels{$b} // lc($b)) } keys %channels) {
+        foreach my $channel (sort { CORE::fc($channels{$a} // $a) cmp CORE::fc($channels{$b} // $b) } keys %channels) {
             my $iter = $users_liststore->append;
 
             if (defined $channels{$channel}) {
@@ -1995,6 +1999,9 @@ sub set_youtube_tops {
     }
 
     sub save_usernames_to_file {
+
+        set_usernames();    # update %channels
+
         open(my $fh, '>:utf8', $CONFIG{youtube_users_file}) or return;
         foreach my $channel (
                              sort { ($channels{$a} // $a) cmp($channels{$b} // $b) }

diff --git a/bin/gtk3-youtube-viewer b/bin/gtk3-youtube-viewer
@@ -1977,7 +1977,6 @@ sub set_youtube_tops {
                          'UCUHW94eEFW7hkUMVaZz4eDg' => 'MinutePhysics',
                          'UCYeF244yNGuFefuFKqxIAXw' => 'The Royal Institution',
                          'UCX6b17PVsYBQ0ip5gyeme-Q' => 'CrashCourse',
-                         'UCwbsWIWfcOL2FiUZ2hKNJHQ' => 'UCBerkeley',
                          'UCEBb1b_L6zDS3xTUrIALZOw' => 'MIT OpenCourseWare',
                          'UCAuUUnT6oDeKwE6v1NGQxug' => 'TED',
                          'UCvBqzzvUBLCs8Y7Axb-jZew' => 'Sixty Symbols',
@@ -1990,10 +1989,15 @@ sub set_youtube_tops {
                          'UC0wbcfzV-bHhABbWGXKHwdg' => 'Utah Open Source',
                          'UCotwjyJnb-4KW7bmsOoLfkg' => 'Art of the Problem',
                          'UC7y4qaRSb5w2O8cCHOsKZDw' => 'YAPC NA',
+                         'UC1t6kKXoBvjdr8m9KJ2Fx7A' => 'Gresham College',
+                         'UCGHZpIpAWJQ-Jy_CeCdXhMA' => 'Cool Worlds',
+                         'UCXZIDlJ_DgzrEwYop2s3JOQ' => 'National Museum of Mathematics',
+                         'UCLnGGRG__uGSPLBLzyhg8dQ' => 'Oxford Mathematics',
+                         'UCmG6gHgD8JaEZVxuHWJijGQ' => 'UConn Mathematics',
                         );
         }
 
-        foreach my $channel (sort { ($channels{$a} // lc($a)) cmp($channels{$b} // lc($b)) } keys %channels) {
+        foreach my $channel (sort { CORE::fc($channels{$a} // $a) cmp CORE::fc($channels{$b} // $b) } keys %channels) {
             my $iter = $users_liststore->append;
 
             if (defined $channels{$channel}) {
@@ -2101,6 +2105,9 @@ sub set_youtube_tops {
     }
 
     sub save_usernames_to_file {
+
+        set_usernames();    # update %channels
+
         open(my $fh, '>:utf8', $CONFIG{youtube_users_file}) or return;
         foreach my $channel (
                              sort { ($channels{$a} // $a) cmp($channels{$b} // $b) }

diff --git a/bin/youtube-viewer b/bin/youtube-viewer
@@ -2813,8 +2813,7 @@ sub save_channel_to_file {
         return;
     };
 
-    print $fh "$channel_id $channel_title\n";
-
+    say $fh "$channel_id $channel_title";
     close $fh;
 }