Update app.py

app.py

@@ -436,17 +436,17 @@ class PaperDownloader:
                 with open(filepath, 'wb') as f:
                     f.write(pdf_content)
                 logger.info(f"Successfully downloaded: {filename}")
-                return filepath, f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a> <button onclick="copyLink(this)">Copy</button></div>', ""
+                return filepath, f'<a href="https://doi.org/{doi}">{doi}</a>', ""
             else:
                 logger.warning(f"Could not download: {doi}")
-                return None, f"Could not download {doi}", f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>'
+                return None, f"Could not download {doi}", f'<a href="https://doi.org/{doi}">{doi}</a>'
 
         except Exception as e:
             logger.error(f"Error processing {doi}: {e}")
             return None, f"Error processing {doi}: {e}", f"Error processing {doi}: {e}"
 
-    def download_multiple_dois(self, dois_text):
-        """Downloads multiple papers from a list of DOIs"""
+    def download_multiple_dois(self, dois_text, progress_callback=None):
+        """Downloads multiple papers from a list of DOIs with progress updates and single copy button"""
         if not dois_text:
             return None, "Error: No DOIs provided", "Error: No DOIs provided"
 
@@ -457,7 +457,9 @@ class PaperDownloader:
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
-        for i, doi in enumerate(tqdm(dois, desc="Downloading papers")):
+        total_dois = len(dois)
+
+        for i, doi in enumerate(dois):
             filepath, success_message, fail_message = self.download_single_doi(doi)
             if filepath:
                 # Unique filename for zip
@@ -465,10 +467,14 @@ class PaperDownloader:
                 filepath_unique = os.path.join(self.output_dir, filename)
                 os.rename(filepath, filepath_unique)
                 downloaded_files.append(filepath_unique)
-                downloaded_links.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
-
+                downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
             else:
-                failed_dois.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
+                failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
+            
+            if progress_callback:
+                progress = int(((i + 1) / total_dois) * 100)
+                progress_callback(progress)
+
 
         if downloaded_files:
             zip_filename = 'papers.zip'
@@ -477,9 +483,17 @@ class PaperDownloader:
                     zipf.write(file_path, arcname=os.path.basename(file_path))
             logger.info(f"ZIP file created: {zip_filename}")
 
-        return zip_filename if downloaded_files else None, "\n".join(downloaded_links), "\n".join(failed_dois)
+        
+        
+        
+        # Combine all links into a single string
+        all_links_html = "<br>".join(downloaded_links)
+        copy_button_html = f'<button onclick="copyAllLinks(\'{all_links_html}\')">Copy All Links</button>' if all_links_html else ""
 
-    def process_bibtex(self, bib_file):
+        
+        return zip_filename if downloaded_files else None, f"{all_links_html} {copy_button_html}", "\n".join(failed_dois)
+
+    def process_bibtex(self, bib_file, progress_callback=None):
         """Process BibTeX file and download papers with multiple strategies"""
         # Read BibTeX file content from the uploaded object
         try:
@@ -504,9 +518,10 @@ class PaperDownloader:
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
+        total_dois = len(dois)
 
         # Download PDFs
-        for doi in tqdm(dois, desc="Downloading papers"):
+        for i, doi in enumerate(dois):
             try:
                 # Try to download with multiple methods with retries
                 pdf_content = self.download_with_retry(doi)
@@ -522,14 +537,17 @@ class PaperDownloader:
                         f.write(pdf_content)
 
                     downloaded_files.append(filepath)
-                    downloaded_links.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
+                    downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
                     logger.info(f"Successfully downloaded: {filename}")
                 else:
-                    failed_dois.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
-
+                    failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
             except Exception as e:
-                failed_dois.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
+                failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
                 logger.error(f"Error processing {doi}: {e}")
+            
+            if progress_callback:
+                progress = int(((i + 1) / total_dois) * 100)
+                progress_callback(progress)
 
         # Create ZIP of downloaded papers
         if downloaded_files:
@@ -538,10 +556,16 @@ class PaperDownloader:
                 for file_path in downloaded_files:
                     zipf.write(file_path, arcname=os.path.basename(file_path))
             logger.info(f"ZIP file created: {zip_filename}")
+        
+        
+        # Combine all links into a single string
+        all_links_html = "<br>".join(downloaded_links)
+        copy_button_html = f'<button onclick="copyAllLinks(\'{all_links_html}\')">Copy All Links</button>' if all_links_html else ""
 
-        return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), None
 
-    async def process_bibtex_async(self, bib_file):
+        return zip_filename, f"{all_links_html} {copy_button_html}", "\n".join(failed_dois), None
+
+    async def process_bibtex_async(self, bib_file, progress_callback=None):
         """Process BibTeX file and download papers with multiple strategies"""
         # Read BibTeX file content from the uploaded object
         try:
@@ -566,9 +590,10 @@ class PaperDownloader:
         downloaded_files = []
         failed_dois = []
         downloaded_links = []
+        total_dois = len(dois)
 
         # Download PDFs
-        for doi in tqdm(dois, desc="Downloading papers"):
+        for i, doi in enumerate(dois):
             try:
                 # Try to download with multiple methods with retries
                 pdf_content = await self.download_with_retry_async(doi)
@@ -584,14 +609,17 @@ class PaperDownloader:
                         f.write(pdf_content)
 
                     downloaded_files.append(filepath)
-                    downloaded_links.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
+                    downloaded_links.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
                     logger.info(f"Successfully downloaded: {filename}")
                 else:
-                    failed_dois.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
-
+                    failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
             except Exception as e:
-                failed_dois.append(f'<div style="display: flex; align-items: center;"><a href="https://doi.org/{doi}">{doi}</a>  <button onclick="copyLink(this)">Copy</button></div>')
+                failed_dois.append(f'<a href="https://doi.org/{doi}">{doi}</a>')
                 logger.error(f"Error processing {doi}: {e}")
+            
+            if progress_callback:
+                progress = int(((i + 1) / total_dois) * 100)
+                progress_callback(progress)
 
         # Create ZIP of downloaded papers
         if downloaded_files:
@@ -600,26 +628,34 @@ class PaperDownloader:
                 for file_path in downloaded_files:
                     zipf.write(file_path, arcname=os.path.basename(file_path))
             logger.info(f"ZIP file created: {zip_filename}")
+        
+        
+        # Combine all links into a single string
+        all_links_html = "<br>".join(downloaded_links)
+        copy_button_html = f'<button onclick="copyAllLinks(\'{all_links_html}\')">Copy All Links</button>' if all_links_html else ""
 
-        return zip_filename, "\n".join(downloaded_links), "\n".join(failed_dois), None
+
+        return zip_filename, f"{all_links_html} {copy_button_html}", "\n".join(failed_dois), None
 
 def create_gradio_interface():
     """Create Gradio interface for Paper Downloader"""
     downloader = PaperDownloader()
 
-    async def download_papers(bib_file, doi_input, dois_input):
+    async def download_papers(bib_file, doi_input, dois_input, progress=gr.Progress()):
+        progress_callback = lambda p: progress(p, desc="Downloading Papers")
+    
         if bib_file:
             # Check file type
             if not bib_file.name.lower().endswith('.bib'):
                 return None, "Error: Please upload a .bib file", "Error: Please upload a .bib file", None
 
-            zip_path, downloaded_dois, failed_dois, _ = await downloader.process_bibtex_async(bib_file)
+            zip_path, downloaded_dois, failed_dois, _ = await downloader.process_bibtex_async(bib_file, progress_callback)
             return zip_path, downloaded_dois, failed_dois, None
         elif doi_input:
             filepath, message, failed_doi = downloader.download_single_doi(doi_input)
             return None, message, failed_doi, filepath
         elif dois_input:
-            zip_path, downloaded_dois, failed_dois = downloader.download_multiple_dois(dois_input)
+            zip_path, downloaded_dois, failed_dois = downloader.download_multiple_dois(dois_input, progress_callback)
             return zip_path, downloaded_dois, failed_dois, None
         else:
             return None, "Please provide a .bib file, a single DOI, or a list of DOIs", "Please provide a .bib file, a single DOI, or a list of DOIs", None
@@ -650,7 +686,7 @@ def create_gradio_interface():
                     <div id="failed-dois"></div>
                 </div>
             """),
-            gr.File(label="Downloaded Single PDF")
+             gr.File(label="Downloaded Single PDF")
         ],
         title="🔬 Academic Paper Batch Downloader",
         description="Upload a BibTeX file or enter DOIs to download PDFs. We'll attempt to fetch PDFs from multiple sources like Sci-Hub, Libgen, Google Scholar and Crossref. You can use any of the three inputs at any moment.",
@@ -700,18 +736,17 @@ def create_gradio_interface():
     
     interface.head = """
     <script>
-        function copyLink(button) {
-            const linkElement = button.previousElementSibling;
-            const link = linkElement.href;
-            navigator.clipboard.writeText(link)
+       function copyAllLinks(linksHTML) {
+            const tempElement = document.createElement('div');
+            tempElement.innerHTML = linksHTML;
+            const links = Array.from(tempElement.querySelectorAll('a')).map(a => a.href).join('\\n');
+
+            navigator.clipboard.writeText(links)
             .then(() => {
-                button.innerText = 'Copied!';
-                setTimeout(() => {
-                  button.innerText = 'Copy';
-                }, 2000);
+                alert('All links copied to clipboard!');
             })
             .catch(err => {
-              console.error('Failed to copy link: ', err);
+                console.error('Failed to copy links: ', err);
             });
         }
     </script>