[cleanup] Add more ruff rules (#10149)

[yt-dlp.git] / yt_dlp / downloader / mhtml.py
diff --git a/yt_dlp/downloader/mhtml.py b/yt_dlp/downloader/mhtml.py

index d977dcec31fbe060474a5e48d9b87d1a2fd81b99..3d4f2d7634a810bdf64e3f31cad4b62a53714462 100644 (file)
--- a/yt_dlp/downloader/mhtml.py
+++ b/yt_dlp/downloader/mhtml.py
@@ -10,7 +10,7 @@
  
  
  class MhtmlFD(FragmentFD):
-    _STYLESHEET = """\
+    _STYLESHEET = '''\
  html, body {
      margin: 0;
      padding: 0;
@@ -45,7 +45,7 @@ class MhtmlFD(FragmentFD):
      max-width: 100%;
      max-height: calc(100vh - 5em);
  }
-"""
+'''
      _STYLESHEET = re.sub(r'\s+', ' ', _STYLESHEET)
      _STYLESHEET = re.sub(r'\B \B|(?<=[\w\-]) (?=[^\w\-])|(?<=[^\w\-]) (?=[\w\-])', '', _STYLESHEET)
  
@@ -57,24 +57,19 @@ def _escape_mime(s):
          )).decode('us-ascii') + '?='
  
      def _gen_cid(self, i, fragment, frag_boundary):
-        return '%u.%s@yt-dlp.github.io.invalid' % (i, frag_boundary)
+        return f'{i}.{frag_boundary}@yt-dlp.github.io.invalid'
  
      def _gen_stub(self, *, fragments, frag_boundary, title):
          output = io.StringIO()
  
-        output.write((
+        output.write(
              '<!DOCTYPE html>'
              '<html>'
              '<head>'
-            ''  '<meta name="generator" content="yt-dlp {version}">'
-            ''  '<title>{title}</title>'
-            ''  '<style>{styles}</style>'
-            '<body>'
-        ).format(
-            version=escapeHTML(YT_DLP_VERSION),
-            styles=self._STYLESHEET,
-            title=escapeHTML(title)
-        ))
+            f'<meta name="generator" content="yt-dlp {escapeHTML(YT_DLP_VERSION)}">'
+            f'<title>{escapeHTML(title)}</title>'
+            f'<style>{self._STYLESHEET}</style>'
+            '<body>')
  
          t0 = 0
          for i, frag in enumerate(fragments):
@@ -87,15 +82,12 @@ def _gen_stub(self, *, fragments, frag_boundary, title):
                      num=i + 1,
                      t0=srt_subtitles_timecode(t0),
                      t1=srt_subtitles_timecode(t1),
-                    duration=formatSeconds(frag['duration'], msec=True)
+                    duration=formatSeconds(frag['duration'], msec=True),
                  ))
              except (KeyError, ValueError, TypeError):
                  t1 = None
-                output.write((
-                    '<figcaption>Slide #{num}</figcaption>'
-                ).format(num=i + 1))
-            output.write('<img src="cid:{cid}">'.format(
-                cid=self._gen_cid(i, frag, frag_boundary)))
+                output.write(f'<figcaption>Slide #{i + 1}</figcaption>')
+            output.write(f'<img src="cid:{self._gen_cid(i, frag, frag_boundary)}">')
              output.write('</figure>')
              t0 = t1
  
@@ -126,31 +118,24 @@ def real_download(self, filename, info_dict):
              stub = self._gen_stub(
                  fragments=fragments,
                  frag_boundary=frag_boundary,
-                title=title
+                title=title,
              )
  
              ctx['dest_stream'].write((
                  'MIME-Version: 1.0\r\n'
                  'From: <nowhere@yt-dlp.github.io.invalid>\r\n'
                  'To: <nowhere@yt-dlp.github.io.invalid>\r\n'
-                'Subject: {title}\r\n'
+                f'Subject: {self._escape_mime(title)}\r\n'
                  'Content-type: multipart/related; '
-                ''  'boundary="{boundary}"; '
-                ''  'type="text/html"\r\n'
-                'X.yt-dlp.Origin: {origin}\r\n'
+                f'boundary="{frag_boundary}"; '
+                'type="text/html"\r\n'
+                f'X.yt-dlp.Origin: {origin}\r\n'
                  '\r\n'
-                '--{boundary}\r\n'
+                f'--{frag_boundary}\r\n'
                  'Content-Type: text/html; charset=utf-8\r\n'
-                'Content-Length: {length}\r\n'
+                f'Content-Length: {len(stub)}\r\n'
                  '\r\n'
-                '{stub}\r\n'
-            ).format(
-                origin=origin,
-                boundary=frag_boundary,
-                length=len(stub),
-                title=self._escape_mime(title),
-                stub=stub
-            ).encode())
+                f'{stub}\r\n').encode())
              extra_state['header_written'] = True
  
          for i, fragment in enumerate(fragments):