breaking out nopub into its own function

bin/_ttbp.py

@@ -483,10 +483,13 @@ def view_feels(townie):
     '''
 
     filenames = []
+    showpub = False
 
     if townie == USER:
         entryDir = DATA
         owner = "your"
+        if core.publishing():
+            showpub = True
     else:
         owner = "~"+townie+"'s"
         entryDir = os.path.join("/home", townie, ".ttbp", "entries")
@@ -497,8 +500,9 @@ def view_feels(townie):
 
     if len(filenames) > 0:
         entries = []
+        pub = ""
         for entry in metas:
-            entries.append(""+entry[4]+" ("+p.no("word", entry[2])+") ")
+            entries.append(""+entry[4]+" ("+p.no("word", entry[2])+") "+"\t"+pub)
 
         return list_entries(metas, entries, owner+" recorded feels, listed by date: \n")
     else:

bin/core.py

@@ -79,15 +79,10 @@ def load_files():
 
     global FILES
 
-    exclude = []
-
-    if os.path.isfile(NOPUB):
-        for line in open(NOPUB, "r"):
-            exclude.append(line.rstrip())
-
     FILES = []
+
     for filename in os.listdir(DATA):
-        if filename in exclude:
+        if nopub(filename):
             continue
         filename = os.path.join(DATA, filename)
         if os.path.isfile(filename) and valid(filename):
@@ -395,6 +390,19 @@ def www_neighbors():
 
     write_global_feed(sortedUsers)
 
+def nopub(filename):
+    '''
+    checks to see if given filename is in user's NOPUB
+    '''
+
+    exclude = []
+
+    if os.path.isfile(NOPUB):
+        for line in open(NOPUB, "r"):
+            exclude.append(line.rstrip())
+
+    return os.path.basename(filename) in exclude
+
 #############
 #############
 #############