Changeset 14509

Timestamp:

Apr 22, 2015, 9:04:49 PM (6 years ago)

Author:

mikedld

Message:

Even better (and unified) torrent origin logic for GTK+, Qt and web clients

Location:

trunk

Files:

• gtk/details.c (modified) (1 diff)
• qt/details.cc (modified) (1 diff)
• web/javascript/inspector.js (modified) (1 diff)

trunk/gtk/details.c

@@ -691 +691 @@
         }
 
-      if (mixed_date && mixed_creator)
+      const gboolean empty_creator = !*creator;
+      const gboolean empty_date = date == 0;
+
+      if (mixed_date || mixed_creator)
         {
           str = mixed;
         }
+      else if (empty_date && empty_creator)
+        {
+          str = _("N/A");
+        }
       else
         {
-          if (mixed_date)
+          if (empty_date && !empty_creator)
             g_snprintf (buf, sizeof (buf), _("Created by %1$s"), creator);
-          else if (mixed_creator || !*creator)
+          else if (empty_creator && !empty_date)
             g_snprintf (buf, sizeof (buf), _("Created on %1$s"), datestr);
           else

trunk/qt/details.cc

@@ -749 +749 @@
         }
 
-      if (mixed_creator && mixed_date)
+      const bool empty_creator = creator.isEmpty ();
+      const bool empty_date = date.isEmpty ();
+
+      if (mixed_creator || mixed_date)
         string = mixed;
-      else if (mixed_date && !creator.isEmpty ())
+      else if (empty_creator && empty_date)
+        string = tr ("N/A");
+      else if (empty_date && !empty_creator)
         string = tr ("Created by %1").arg (creator);
-      else if (mixed_creator && !date.isEmpty ())
+      else if (empty_creator && !empty_date)
         string = tr ("Created on %1").arg (date);
-      else if (creator.isEmpty () && date.isEmpty ())
-        string = tr ("N/A");
       else
         string = tr ("Created by %1 on %2").arg (creator).arg (date);

trunk/web/javascript/inspector.js

@@ -425 +425 @@
             var empty_creator = !creator || !creator.length,
                 empty_date = !date;
-            if(mixed_creator && mixed_date)
+            if(mixed_creator || mixed_date)
                 str = mixed;
             else if(empty_creator && empty_date)
                 str = unknown;
-            else if((mixed_date || empty_date) && !empty_creator)
+            else if(empty_date && !empty_creator)
                 str = 'Created by ' + creator;
-            else if((mixed_creator || empty_creator) && !empty_date)
+            else if(empty_creator && !empty_date)
                 str = 'Created on ' + (new Date(date*1000)).toDateString();
             else