From 6139a5c6c4adebe129666842eb91a77674c6d03a Mon Sep 17 00:00:00 2001
From: Andinus <andinus@nand.sh>
Date: Sun, 30 Aug 2020 00:42:01 +0530
Subject: Fix custom feed loading, print feed name, don't omit entries

+            ? do {push @feeds, path("$feeds_dir/$_") foreach @ARGV}

Fixes custom feed loading.

The data structure is hash of
    date mapped to a list of
        entries which is a list of
            $feed_name, $message

This also fixes omitting of entries as we store a list of entries so
we get multiple entries in same date map.
---
 pyxis.pl | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pyxis.pl b/pyxis.pl
index 976ad2e..63ada8a 100755
--- a/pyxis.pl
+++ b/pyxis.pl
@@ -75,7 +75,7 @@ my %dispatch = (
         # timeline f1 f2' & it'll load both `f1' & `f2'. But user can
         # also type `pyxis timeline f1 f1' & it'll load `f1' twice.
         scalar @ARGV
-            ? do {push @feeds, "$feeds_dir/$_" foreach @ARGV}
+            ? do {push @feeds, path("$feeds_dir/$_") foreach @ARGV}
             : push @feeds, path($feeds_dir)->children;
 
         foreach my $feed (@feeds) {
@@ -84,18 +84,22 @@ my %dispatch = (
                 and next
                 unless -e $feed;
 
+            # Get the feed name, $feed is the path, there is no easy
+            # way of keeping it as name so we split here to get feed
+            # name again.
+            my ($dummy_var, $feed_name) = split "$feeds_dir/", $feed;
+
             for my $line ($feed->lines) {
                 chomp $line;
                 next if (substr($line, 0, 1) eq "#"
                              or length $line == 0);
                 my @tmp = split /\t/, $line;
 
-                # Get $date & $entry from @tmp. This can over-write
-                # entries if they were posted at same time, very
-                # unlikely but possible.
                 my $date = shift @tmp;
-                my $entry = join '', @tmp;
-                $twtxt{$date} = $entry;
+                my $message = join '', @tmp;
+
+                # Include feed name in hash.
+                push @{$twtxt{$date}}, [$feed_name, $message];
             }
         }
         # Exit if there are no feeds to load.
@@ -112,10 +116,13 @@ my %dispatch = (
         }
 
         foreach my $epoch (reverse sort keys %epoch_twtxt) {
-            my $tm = Time::Moment->from_epoch($epoch);
-            my $date = LOCALCOLOR MAGENTA $tm->strftime(q{%b %d });
-            $date .= LOCALCOLOR GREEN $tm->strftime(q{%H:%M});
-            say "$date $epoch_twtxt{$epoch}";
+            foreach my $entry (@{$epoch_twtxt{$epoch}}) {
+                my $tm = Time::Moment->from_epoch($epoch);
+                my $date = LOCALCOLOR MAGENTA $tm->strftime(q{%b %d });
+                $date .= LOCALCOLOR GREEN $tm->strftime(q{%H:%M});
+                my $feed_name = LOCALCOLOR CYAN $entry->[0];
+                say "$date $feed_name $entry->[1]";
+            }
         }
     },
 );
-- 
cgit 1.4.1-2-gfad0