i

Author: i1li

.github/workflows/static.yml

@@ -1,4 +1,4 @@
-# This is just the example GitHub workflow (https://github.com/actions/starter-workflows/blob/main/pages/static.yml) edited to serve only the /dist folder to GitHub Pages. The "static" limitation is overcome with the script in 404.html (https://github.com/i1li/i/blob/main/src/404.html)
+# This is just the example GitHub workflow (https://github.com/actions/starter-workflows/blob/main/pages/static.yml) edited to serve only the /dist folder to GitHub Pages. The "static" limitation is overcome by simply copying index.html to 404.html during the build process.
 
 name: Deploy static content to Pages from /dist
 on:

dist/404.html

@@ -1,9 +1,7 @@
 .yt-wrapper {
   display: none;
   position: relative;
-  margin: auto;
-  max-width: 720px;
-  padding-bottom: 56.25%;
+  padding: 56.25% 0 0 0;
 }
 .yt {
   position: absolute;

dist/bundle-nbkm4g.css dist/bundle-6pixvs.cssdist/bundle-nbkm4g.css renamed to dist/bundle-6pixvs.css

@@ -16,17 +16,11 @@ class YTEmbed extends HTMLElement {
   attributeChangedCallback(name, oldValue, newValue) {
     if (name === 'v' && oldValue !== newValue) {this.initFromV();}
   }
-  isPlaylistID(id) {
-    return id.length > 11 && (id.startsWith('PL') || id.startsWith('TL') || id.startsWith('OL') || id.startsWith('FL') || id.startsWith('UU'));
-  }
   initFromV() {
-    const v = this.getAttribute('v');
-    if (!v) return;
-    const [id, params] = v.split('?');
-    this.id = id;
-    this.params = params;
-    const videoIds = this.id.split(',');
-    this.videoIds = videoIds;
+    const v = this.getAttribute('v'); if (!v) return;
+    const rawIds = v.split(','); this.rawIds = rawIds;
+    const {id,params,videoIds,playlistIds} = (()=>{const parts=this.rawIds.map(r=>r.split('?'));const list=parts.map(([a,b])=>({id:a,params:b}));const videoIds=list.filter(x=>x.id.length===11).map(x=>x.id);const playlistIds=list.filter(x=>x.id.length>11).map(x=>x.id);const pick=playlistIds[0]? list.find(x=>x.id===playlistIds[0]) : list.find(x=>x.id.length===11)|| list[0];return {id:pick.id,params:pick.params,videoIds,playlistIds};})();
+    Object.assign(this, { id, params, videoIds, playlistIds });
     let linkUrl , embedUrl;
     const embedProxyUrl = 'https://embed-proxy.github.io/';
     if (this.classList.contains('no-embed')) {
@@ -39,7 +33,7 @@ class YTEmbed extends HTMLElement {
           linkUrl = `https://www.youtube.com/watch_videos?video_ids=${this.videoIds.join(',')}&autoplay=1`;
           embedUrl = null;
           break;
-        case this.isPlaylistID(this.id):
+        case this.playlistIds.length > 0:
           linkUrl = `https://www.youtube.com/playlist?list=${this.id}&autoplay=1`;
           embedUrl = null;
           break;
@@ -54,7 +48,7 @@ class YTEmbed extends HTMLElement {
           embedUrl = `https://www.youtube-nocookie.com/embed/?playlist=${this.videoIds.join(',')}&autoplay=1`;
           linkUrl = embedProxyUrl + embedUrl;
           break;
-        case this.isPlaylistID(this.id):
+        case this.playlistIds.length > 0:
           embedUrl = `https://www.youtube-nocookie.com/embed/videoseries?list=${this.id}&autoplay=1`;
           linkUrl = embedProxyUrl + embedUrl;
           break;

dist/bundle-6pixvs.js

@@ -4,39 +4,35 @@ const { readFileSync, writeFileSync } = require('fs');
 const { join } = require('path');
 const https = require('https');
 if (!KEY) throw new Error('API key missing');
-const excludedIds = new Set(
-  readFileSync(join(__dirname, '..', 'yt', 'exclude.txt'), 'utf8')
-    .split(',').map(id => id.trim()).filter(Boolean)
-);
-const htmlContent = readFileSync(join(__dirname, '..', 'index.html'), 'utf8');
-const searchDiv = htmlContent.match(/id="shuffle">([\s\S]*?)<\/div>/)?.[1] || '';
-const cleanId = id => id.split('?')[0];
-const isVideoId   = id => cleanId(id).length === 11;
-const isPlaylistId = id => cleanId(id).length > 11;
 const fetchUrl = url => new Promise((resolve, reject) => {
   https.get(url.toString(), res => {
     let data = '';
     res.on('data', c => data += c);
     res.on('end', () => resolve(JSON.parse(data)));
   }).on('error', reject);
 });
-const buildUrl = (base, params) => {
-  const u = new URL(base);
-  u.search = new URLSearchParams(params);
-  return u;
-};
+const buildUrl = (base, params) => {const u = new URL(base);
+  u.search = new URLSearchParams(params); return u; };
 const extractIds = (regex, src) => {
   const out = [];
   let m;
   while ((m = regex.exec(src))) {
     if (m[1]) out.push(...m[1].split(',').map(s => s.trim()));
-    if (m[2]) out.push(...m[2].split(',').map(s => s.trim()));
   }
   return out;
 };
-const allIds = extractIds(/(?:p="([^"]+)"|v="([^"]+)")/g, searchDiv);
+const htmlContent = readFileSync(join(__dirname, '..', 'index.html'), 'utf8');
+const searchDiv = htmlContent.match(/id="shuffle">([\s\S]*?)<\/div>/)?.[1] || '';
+const allIds = extractIds(/(?:p|v)="([^"]+)"/g, searchDiv);
+const cleanId = id => id.split('?')[0];
+const isVideoId = id => cleanId(id).length === 11;
+const isPlaylistId = id => cleanId(id).length > 11;
 const playlistIds = allIds.filter(isPlaylistId);
-const videoIds    = allIds.filter(isVideoId);
+const videoIds = allIds.filter(isVideoId);
+const excludedIds = new Set(
+  readFileSync(join(__dirname, '..', 'yt', 'exclude.txt'), 'utf8')
+    .split(',').map(id => id.trim()).filter(Boolean)
+);
 const writeOutput = async () => {
   const playlistVideos = {};
   let playlistErrors = 0;
@@ -76,49 +72,60 @@ const writeOutput = async () => {
     ...videoIds.map(cleanId),
     ...Object.values(playlistVideos).flat()
   ])].filter(id => !excludedIds.has(id));
-  const embeddableMap = {};
+  const infoMap = {};
   let videoErrors = 0;
   for (let i = 0; i < allCleanIds.length; i += 50) {
     const batch = allCleanIds.slice(i, i + 50);
     try {
       const data = await fetchUrl(buildUrl('https://www.googleapis.com/youtube/v3/videos', {
-        part: 'status',
+        part: 'status,contentDetails',
         id: batch.join(','),
         key: KEY
       }));
       if (data.error) throw new Error(data.error.message);
       for (const item of data.items || []) {
         if (item.status?.privacyStatus === 'private') continue;
-        embeddableMap[item.id] = item.status.embeddable ?? null;
+        const durationSeconds = (()=>{const m=(item.contentDetails?.duration||'PT0S').match(/PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?/); return ((+m?.[1]||0)*3600)+((+m?.[2]||0)*60)+(+m?.[3]||0);})();
+        infoMap[item.id] = {
+          embeddable: item.status.embeddable ?? null, durationSeconds
+        };
       }
-    } catch (e) {
-      videoErrors++;
-      console.error(`Videos batch error: ${e.message}`);
-    }
+    } catch (e) {videoErrors++;console.error(`Videos batch error: ${e.message}`);}
   }
   const originalMap = new Map(allIds.map(id => [cleanId(id), id]));
   let total = 0;
   const updated = searchDiv.replace(/<y-t([^>]*)>/g, (_, attrs) => {
-    const p = (attrs.match(/p="([^"]*)"/)?.[1] || '').split(',').map(s => s.trim()).filter(isPlaylistId);
-    const v = (attrs.match(/v="([^"]*)"/)?.[1] || '').split(',').map(s => s.trim());
-    const u = (attrs.match(/u="([^"]*)"/)?.[1] || '').split(',').map(s => s.trim()).filter(Boolean);
-    const fromPlaylists = p.flatMap(pid => playlistVideos[cleanId(pid)] || []);
-    const combinedClean = [...new Set([...fromPlaylists, ...v.map(cleanId)])]
-      .filter(id => !excludedIds.has(id));
-    const embeddableClean = combinedClean.filter(id => embeddableMap[id] === true);
-    const nonEmbeddableClean = combinedClean.filter(id => embeddableMap[id] === false || embeddableMap[id] === null);
+    const p_match = attrs.match(/p="([^"]*)"/);
+    const v_match = attrs.match(/v="([^"]*)"/);
+    const u_match = attrs.match(/u="([^"]*)"/);
+    const p_split = p_match ? p_match[1].split(',').map(s => s.trim()).filter(Boolean) : [];
+    const v_split = v_match ? v_match[1].split(',').map(s => s.trim()).filter(Boolean) : [];
+    const u_split = u_match ? u_match[1].split(',').map(s => s.trim()).filter(Boolean) : [];
+    const all_attr_ids = [...p_split, ...v_split];
+    const playlist_full = all_attr_ids.filter(isPlaylistId);
+    const video_full = all_attr_ids.filter(isVideoId);
+    const fromPlaylists = playlist_full.map(full => playlistVideos[cleanId(full)] || []).flat();
+    const v_clean = video_full.map(cleanId);
+    const combinedClean = [...new Set([...fromPlaylists, ...v_clean])].filter(id => !excludedIds.has(id));
+    const infoFilter = (id, condition) => {
+      const info = infoMap[id];
+      return info && condition(info.embeddable) && info.durationSeconds >= 150;
+    };
+    const embeddableClean = combinedClean.filter(id => infoFilter(id, emb => emb === true));
+    const nonEmbeddableClean = combinedClean.filter(id => infoFilter(id, emb => emb === false || emb === null));
     total += embeddableClean.length + nonEmbeddableClean.length;
     const embeddableFull = embeddableClean.map(id => originalMap.get(id) || id);
     const nonEmbeddableFull = [...new Set([
       ...nonEmbeddableClean.map(id => originalMap.get(id) || id),
-      ...u
-])].filter(Boolean);
-    let newAttrs = attrs
-      .replace(/p="[^"]*"/g, p.length ? `p="${p.join(',')}"` : 'p=""')
-      .replace(/v="[^"]*"/g, `v="${embeddableFull.join(',')}"`)
-      .replace(/u="[^"]*"/g, '');
-    if (nonEmbeddableFull.length>0) newAttrs += ` u="${nonEmbeddableFull.join(',')}"`;
-    return `<y-t ${newAttrs.trim().replace(/\s+/g, ' ')}>`;
+      ...u_split
+    ])].filter(Boolean);
+    const otherAttrs = attrs.replace(/[\s]*(p|v|u)="[^"]*"/g, '').trim();
+    const attrParts = [];
+    if (playlist_full.length > 0) attrParts.push(`p="${playlist_full.join(',')}"`);
+    attrParts.push(`v="${embeddableFull.join(',')}"`);
+    if (nonEmbeddableFull.length > 0) attrParts.push(`u="${nonEmbeddableFull.join(',')}"`);
+    const newAttrs = [otherAttrs, ...attrParts].filter(Boolean).join(' ');
+    return `<y-t${newAttrs ? ' ' + newAttrs.replace(/\s+/g, ' ') : ''}>`;
   });
   writeFileSync(join(__dirname, '..', 'index.html'),
     htmlContent
@@ -129,4 +136,4 @@ const writeOutput = async () => {
   console.log(`\nTotal videos processed: ${total.toLocaleString()}`);
   console.log(`Errors — playlists: ${playlistErrors}, videos: ${videoErrors}`);
 };
-writeOutput().catch(console.error);
+writeOutput().catch(console.error);