ltc u.c.

sources/ltc.py

@@ -462,8 +462,24 @@ X-Requested-With: XMLHttpRequest
             r = self._http_request(url,headers=self.headers2)
             if not r:
                 return content
-            m = re.search('<div class="movie_titles"><div class="en">([^<]+)</div>', r)
-            raidijums = m.group(1) if m else "Series"
+            m = re.search(r'data-movieid=\d+><div class="lv">([^<]+)</div><div[^>]+>([^<]+)<', r)
+            if m:
+                title1 = unescape(m.group(1))
+                title2 = unescape(m.group(2))
+            else:
+                m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
+                title1 = title2 = unescape(m.group(1)) if m else "Video"
+            if 'episode_switcher_title' in r:
+                set1 = title1.replace("\xe2\x80\x93", "-")
+                if " - " in set1:
+                    set1 = set1.split(" - ")[0]
+                set2 = title2.replace("\xe2\x80\x93", "-")
+                if " - " in set2:
+                    set2 = set2.split(" - ")[0]
+                raidijums = "%s ~ %s" % (set1, set2)
+            else:
+                m = re.search('<div class="movie_titles"><div class="en">([^<]+)</div>', r)
+                raidijums = m.group(1) if m else "Series"
             img0 = re.search('<meta name="og:image" content="([^"]+)">', r).group(1) if re.search('<meta name="dr:say:img" content="([^"]+)">', r) else ""
             m = re.search('season_choice', r)
 
@@ -497,7 +513,7 @@ X-Requested-With: XMLHttpRequest
                         raise Exception("Error getting episode list")
                     result = re.findall(r'class="" href="([^"]+)".+?image:url\(([^ \)]+)\); "></div><div class="episode_titlez_design17">([^<]+)</div><div class="episode_number_design17">([^<]+)</div></a>', js["data"])
                     for item in result:
-                        title = "%s - %s(%s)"%(raidijums,item[2],item[3])
+                        title = "%s - %s (%s)"%(raidijums,item[2],item[3])
                         data2 = item[0][1:]
                         img = "https://www.shortcut.lv"+item[1]
                         desc = title
@@ -911,33 +927,31 @@ Host: manstv.lattelecom.tv
         tt = lambda p,r,d: re.search(p,r).group(1) if re.search(p,r) else d
         tt2 = lambda p,r,d: (re.sub("[\.]","",re.search(p,r).group(1))).split(", ") if re.search(p,r) else d
         r = self.call2(data)
-        m = re.search(r'"movie_titles" data-movieid=(\d+)><div class="en">([^<]+)</div><div class="lv translated">([^<]+)</div>', r)
+        m = re.search(r'data-movieid=\d+><div class="lv">([^<]+)</div><div[^>]+>([^<]+)<', r)
         if m:
-            title1 = unescape(m.group(2))
-            title2 = unescape(m.group(3))
+            title1 = unescape(m.group(1))
+            title2 = unescape(m.group(2))
         else:
             m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
             title1 = title2 = unescape(m.group(1)) if m else "Video"
-        nfo["title"] = title2
-        nfo["originaltitle"] = title1
+        nfo["title"] = title1
+        nfo["originaltitle"] = title2
         if nfo["originaltitle"] and not nfo["title"]:
             nfo["title"] = nfo["originaltitle"]
         if 'episode_switcher_title' in r:
-            title2 = title2.replace("\xe2\x80\x93", "-")
-            if " - " in title2:
-                nfo["set"] = title2.split(" - ")[0]
-            else:
-                nfo["set"] = tt('<div class="movie_titles"><div class="en">(.+?)<', r, title2)
-            m = re.search('<div class="serial_switcher_banner active".+?<div class="episode_titlez_design17">([^<]+)</div><div class="episode_number_design17">([^<]+)</div>', r)
-            if m:
-                ep1 = m.group(1)
-                ep2 = m.group(2)
-                nfo["title"] = "%s - %s(%s)"%(nfo["set"], ep1, ep2)
-                nfo["originaltitle"] = nfo["originaltitle"] + "(%s)" % ep2
-            m = re.search("S(\d+)E(\d+)", ep2)
+            set1 = title1.replace("\xe2\x80\x93", "-")
+            if " - " in set1:
+                set1 = set1.split(" - ")[0]
+            set2 = title2.replace("\xe2\x80\x93", "-")
+            if " - " in set2:
+                set2 = set2.split(" - ")[0]
+            nfo["set"] = "%s ~ %s" % (set1, set2)
+            m = re.search(r"<br>(S(\d+)E(\d+))<", r, re.IGNORECASE | re.DOTALL)
             if m:
-                nfo["season"] = m.group(1)
-                nfo["eposode"] = m.group(2)
+                #nfo["title"] = nfo["title"] + " (%s)" % m.group(1)
+                #nfo["originaltitle"] = nfo["originaltitle"] + " (%s)" % m.group(1)
+                nfo["season"] = m.group(2)
+                nfo["episode"] = m.group(2)
 
         nfo["thumb"] = tt('<meta name="og:image" content="([^"]+)"', r,"")
         nfo["thumb"] = nfo["thumb"].replace("http:", "https:")
@@ -945,11 +959,11 @@ Host: manstv.lattelecom.tv
         nfo["runtime"] = tt('movie-informatio-title">Garums<.+?content">([^<]+)<', r, "")
         nfo["quality"] = tt('movie-informatio-title">Kvalitāte<.+?content">([^<]+)<', r, "")
         nfo["genre"]=tt('movie-informatio-title">Žanrs<.+?content">([^<]+)<', r, "")
-        nfo["director"] = tt('movie-informatio-title">Režisors<.+?content">([^<]+)<', r, "")
-        nfo["actor"] = tt2('movie-informatio-title">Aktieri<.+?content">([^<]+)<', r, "")
+        nfo["director"] = tt('movie-informatio-title">Režisor.<.+?content">([^<]+)<', r, "")
+        nfo["actor"] = tt2('class="movie-informatio-content actors">([^<]+)<', r, "")
         nfo["language"] = tt2('movie-informatio-title">Valodas*<.+?content">([^<]+)<', r, "")
         nfo["subtitles"] = tt2('movie-informatio-title">Subtitri<.+?content">([^<]+)<', r, "")
-        nfo["plot"] = tt('movie-informatio-title">Apraksts<.+?content">([^<]+)<', r, "")
+        nfo["plot"] = tt('class="movie-informatio-content introduction">([^<]+)<', r, "")
         nfo["tagline"] = nfo["plot"]
         return nfo
 

util.py

@@ -94,17 +94,17 @@ def nfo2desc(nfo):
             d = ""
         return d.encode("utf8") if isinstance(d, unicode) else d
 
-    desc += ddd("tagline")
-    if "plot" in nfo and "tagline" in nfo and nfo["tagline"] <> nfo["plot"]:
-        desc += ddd("plot")
-    elif "plot" in nfo and not "tagline" in nfo:
-        desc += ddd("plot")
     desc += ddd("genre","Genre")
     desc += ddd("runtime","Length")
     desc += ddd("director","Director")
     desc += ddd("actor","Actors")
     desc += ddd("language","Languages")
     desc += ddd("quality","Quality")
+    desc += ddd("tagline")
+    if "plot" in nfo and "tagline" in nfo and nfo["tagline"] <> nfo["plot"]:
+        desc += ddd("plot")
+    elif "plot" in nfo and not "tagline" in nfo:
+        desc += ddd("plot")
     return desc.encode("utf8") if isinstance(desc,unicode) else desc
 
 def nfo2title(nfo):
@@ -113,7 +113,14 @@ def nfo2title(nfo):
     title = nfo["title"]
     if "originaltitle" in nfo and nfo["originaltitle"] and nfo["originaltitle"]<>nfo["title"]:
         title +=" ~ "+nfo["originaltitle"]
-    if "year" in nfo and nfo["year"]:
+    se = ""
+    if "season" in nfo and nfo["season"]:
+        se += "S%s" % nfo["season"]
+    if "episode" in nfo and nfo["episode"]:
+        se += "E%s" % nfo["episode"]
+    if se:
+        title += " (%s)" % se
+    elif "year" in nfo and nfo["year"]:
         title += " (%s)"%nfo["year"]
     return title.encode("utf8") if isinstance(title,unicode) else title