Content

mps_youtube/commands/album_search.py

@@ -43,7 +43,7 @@ def _do_query(url, query, err='query failed', report=False):
 
     except (URLError, HTTPError) as e:
         g.message = "%s: %s (%s)" % (err, e, url)
-        g.content = content.logo(c.r)
+        g.content = content.Logo(c.r)
         return None if not report else (None, False)
 
     return wdata if not report else (wdata, False)

mps_youtube/commands/download.py

@@ -11,7 +11,7 @@
 from .. import g, c, screen, streams, content, config, util
 from . import command, PL
 from .search import yt_url, user_pls
-from .songlist import dump, plist
+from .songlist import plist
 
 
 @command(r'(dv|da|d|dl|download)\s*(\d{1,4})')
@@ -20,25 +20,25 @@ def download(dltype, num):
     # This function needs refactoring!
     # pylint: disable=R0912
     # pylint: disable=R0914
-    if g.browse_mode == "ytpl" and dltype in ("da", "dv"):
+    if isinstance(g.content, content.PlistList) and dltype in ("da", "dv"):
         plid = g.ytpls[int(num) - 1]["link"]
         down_plist(dltype, plid)
         return
 
-    elif g.browse_mode == "ytpl":
+    elif isinstance(g.content, content.PlistList):
         g.message = "Use da or dv to specify audio / video playlist download"
         g.message = c.y + g.message + c.w
         g.content = content.generate_songlist_display()
         return
 
-    elif g.browse_mode != "normal":
+    elif not isinstance(g.content, content.PlistList):
         g.message = "Download must refer to a specific video item"
         g.message = c.y + g.message + c.w
         g.content = content.generate_songlist_display()
         return
 
     screen.writestatus("Fetching video info...")
-    song = (g.model[int(num) - 1])
+    song = (g.content[int(num) - 1])
     best = dltype.startswith("dv") or dltype.startswith("da")
 
     if not best:
@@ -146,7 +146,6 @@ def handle_error(message):
 
     try:
         for song in downsongs:
-            g.result_count = len(g.model)
             disp = content.generate_songlist_display()
             title = "Download Queue (%s):%s\n\n" % (av, c.w)
             disp = re.sub(r"(Num\s*?Title.*?\n)", title, disp)
@@ -184,7 +183,6 @@ def handle_error(message):
     finally:
         g.model.songs = temp[::]
         g.message = msg
-        g.result_count = len(g.model)
         g.content = content.generate_songlist_display()
 
 
@@ -193,7 +191,6 @@ def down_plist(dltype, parturl):
     """ Download YouTube playlist. """
 
     plist(parturl)
-    dump(False)
     title = g.pafy_pls[parturl][0].title
     subdir = util.mswinfn(title.replace("/", "-"))
     down_many(dltype, "1-", subdir=subdir)
@@ -206,7 +203,7 @@ def down_plist(dltype, parturl):
 def down_user_pls(dltype, user):
     """ Download all user playlists. """
     user_pls(user)
-    for i in g.ytpls:
+    for i in g.content:
         down_plist(dltype, i.get('link'))
 
     return
@@ -538,7 +535,6 @@ def mbsize(x):
 @command(r'dlurl\s(.*[-_a-zA-Z0-9]{11}.*)')
 def dl_url(url):
     """ Open and prompt for download of youtube video url. """
-    g.browse_mode = "normal"
     yt_url(url)
 
     if len(g.model) == 1:
@@ -551,7 +547,6 @@ def dl_url(url):
 @command(r'daurl\s(.*[-_a-zA-Z0-9]{11}.*)')
 def da_url(url):
     """ Open and prompt for download of youtube best audio from url. """
-    g.browse_mode = "normal"
     yt_url(url)
 
     if len(g.model) == 1:

mps_youtube/commands/misc.py

@@ -24,7 +24,6 @@
 from .. import g, c, __version__, content, screen, cache
 from .. import streams, history, config, util
 from ..helptext import get_help
-from ..content import generate_songlist_display, logo
 from . import command
 from .songlist import paginatesongs
 
@@ -54,9 +53,9 @@ def quits(showlogo=True):
 
     cache.save()
 
-    screen.clear()
-    msg = logo(c.r, version=__version__) if showlogo else ""
-    msg += util.F("exitmsg", 2)
+    g.content = content.Logo(c.r, version=__version__) if showlogo else ""
+    screen.update()
+    msg = util.F("exitmsg", 2)
 
     if config.CHECKUPDATE.get and showlogo:
 
@@ -121,8 +120,8 @@ def fetch_comments(item):
 @command(r'c\s?(\d{1,4})')
 def comments(number):
     """ Receive use request to view comments. """
-    if g.browse_mode == "normal":
-        item = g.model[int(number) - 1]
+    if isinstance(g.content, content.SongList):
+        item = g.content[int(number) - 1]
         fetch_comments(item)
 
     else:
@@ -133,13 +132,12 @@ def comments(number):
 @command(r'x\s*(\d+)')
 def clip_copy(num):
     """ Copy item to clipboard. """
-    if g.browse_mode == "ytpl":
-
-        p = g.ytpls[int(num) - 1]
+    if isinstance(g.content, content.PlistList):
+        p = g.content[int(num) - 1]
         link = "https://youtube.com/playlist?list=%s" % p['link']
 
-    elif g.browse_mode == "normal":
-        item = (g.model[int(num) - 1])
+    elif isinstance(g.content, content.SongList):
+        item = g.content[int(num) - 1]
         link = "https://youtube.com/watch?v=%s" % item.ytid
 
     else:
@@ -148,7 +146,6 @@ def clip_copy(num):
         return
 
     if has_pyperclip:
-
         try:
             pyperclip.copy(link)
             g.message = c.y + link + c.w + " copied"
@@ -168,14 +165,14 @@ def clip_copy(num):
 @command(r'i\s*(\d{1,4})')
 def info(num):
     """ Get video description. """
-    if g.browse_mode == "ytpl":
-        p = g.ytpls[int(num) - 1]
+    if isinstance(g.content, content.PlistList):
+        p = g.content[int(num) - 1]
 
         # fetch the playlist item as it has more metadata
         if p['link'] in g.pafy_pls:
             ytpl = g.pafy_pls[p['link']][0]
         else:
-            g.content = logo(col=c.g)
+            g.content = Logo(col=c.g)
             g.message = "Fetching playlist info.."
             screen.update()
             util.dbg("%sFetching playlist using pafy%s", c.y, c.w)
@@ -198,11 +195,11 @@ def info(num):
         out += ("\n\n%s[%sPress enter to go back%s]%s" % (c.y, c.w, c.y, c.w))
         g.content = out
 
-    elif g.browse_mode == "normal":
-        g.content = logo(c.b)
+    elif isinstance(g.content, content.SongList):
+        item = g.content[int(num) - 1]
+        g.content = Logo(c.b)
         screen.update()
         screen.writestatus("Fetching video metadata..")
-        item = (g.model[int(num) - 1])
         streams.get(item)
         p = util.get_pafy(item)
         pub = time.strptime(str(p.published), "%Y-%m-%d %H:%M:%S")
@@ -240,7 +237,7 @@ def view_history(duplicates=True):
         g.message = message
 
     except AttributeError:
-        g.content = logo(c.r)
+        g.content = Logo(c.r)
         g.message = "History empty"
 
 
@@ -256,4 +253,4 @@ def clear_history():
     g.userhist['history'].songs = []
     history.save()
     g.message = "History cleared"
-    g.content = logo()
+    g.content = Logo()

mps_youtube/commands/play.py

@@ -38,20 +38,15 @@ def play(pre, choice, post=""):
     # pylint: disable=R0914
     # too many local variables
 
-    if g.browse_mode == "ytpl":
-
+    if isinstance(g.content, content.PlistList):
         if choice.isdigit():
-            return plist(g.ytpls[int(choice) - 1]['link'])
+            return plist(g.content[int(choice) - 1]['link'])
         else:
             g.message = "Invalid playlist selection: %s" % c.y + choice + c.w
             g.content = content.generate_songlist_display()
             return
 
-    if not g.model:
-        g.message = c.r + "There are no tracks to select" + c.w
-        g.content = g.content or content.generate_songlist_display()
-
-    else:
+    elif isinstance(g.content, content.SongList):
         shuffle = "shuffle" in pre + post
         repeat = "repeat" in pre + post
         novid = "-a" in pre + post
@@ -72,36 +67,38 @@ def play(pre, choice, post=""):
             override = "forcevid" if forcevid else override
 
         selection = util.parse_multi(choice)
-        songlist = [g.model[x - 1] for x in selection]
+        songlist = [g.content[x - 1] for x in selection]
 
         # cache next result of displayed items
         # when selecting a single item
         if len(songlist) == 1:
             chosen = selection[0] - 1
 
-            if len(g.model) > chosen + 1:
-                streams.preload(g.model[chosen + 1], override=override)
+            if len(g.content) > chosen + 1:
+                streams.preload(g.content[chosen + 1], override=override)
 
         play_range(songlist, shuffle, repeat, override)
-        g.content = content.generate_songlist_display()
+
+    else:
+        g.message = c.r + "There are no tracks to select" + c.w
+        g.content = g.content or content.generate_songlist_display()
 
 
 @command(r'(%s{0,3})(?:\*|all)\s*(%s{0,3})' %
         (RS, RS))
 def play_all(pre, choice, post=""):
     """ Play all tracks in model (last displayed). shuffle/repeat if req'd."""
     options = pre + choice + post
-    play(options, "1-" + str(len(g.model)))
+    play(options, "1-")
 
 
 @command(r'playurl\s(.*[-_a-zA-Z0-9]{11}[^\s]*)(\s-(?:f|a|w))?')
 def play_url(url, override):
     """ Open and play a youtube video url. """
     override = override if override else "_"
-    g.browse_mode = "normal"
     yt_url(url, print_title=1)
 
-    if len(g.model) == 1:
+    if len(g.content) == 1:
         play(override, "1", "_")
 
     if g.command_line:
@@ -113,7 +110,7 @@ def browser_play(number):
     """Open a previously searched result in the browser."""
     if (len(g.model) == 0):
         g.message = c.r + "No previous search." + c.w
-        g.content = content.logo(c.r)
+        g.content = content.Logo(c.r)
         return
 
     try: