Merge pull request #10743 from cdrini/refactor/rm-dead-methods

Remove/move some dead methods

Author: mekarpeles

openlibrary/plugins/openlibrary/code.py

@@ -21,7 +21,7 @@
     batch_import,
 )
 from openlibrary.i18n import gettext as _
-from openlibrary.plugins.upstream.utils import setup_requests
+from openlibrary.plugins.upstream.utils import get_coverstore_public_url, setup_requests
 
 # make sure infogami.config.features is set
 if not hasattr(infogami.config, 'features'):
@@ -42,7 +42,6 @@
 from openlibrary.core.lending import get_availability
 from openlibrary.core.models import Edition
 from openlibrary.plugins.openlibrary import processors
-from openlibrary.plugins.openlibrary.home import format_work_data
 from openlibrary.plugins.openlibrary.stats import increment_error_count
 from openlibrary.utils.isbn import canonical, isbn_10_to_isbn_13, isbn_13_to_isbn_10
 
@@ -276,6 +275,31 @@ def GET(self, key: str):  # type: ignore[override]
         )
 
 
+def format_work_data(work):
+    d = dict(work)
+
+    key = work.get('key', '')
+    # New solr stores the key as /works/OLxxxW
+    if not key.startswith("/works/"):
+        key = "/works/" + key
+
+    d['url'] = key
+    d['title'] = work.get('title', '')
+
+    if 'author_key' in work and 'author_name' in work:
+        d['authors'] = [
+            {"key": key, "name": name}
+            for key, name in zip(work['author_key'], work['author_name'])
+        ]
+
+    if 'cover_edition_key' in work:
+        coverstore_url = get_coverstore_public_url()
+        d['cover_url'] = f"{coverstore_url}/b/olid/{work['cover_edition_key']}-M.jpg"
+
+    d['read_url'] = "//archive.org/stream/" + work['ia'][0]
+    return d
+
+
 class addauthor(delegate.page):
     path = '/addauthor'
 

openlibrary/plugins/openlibrary/home.py

@@ -11,7 +11,7 @@
 from infogami.utils.view import public, render_template
 from openlibrary.core import admin, cache, ia, lending
 from openlibrary.i18n import gettext as _
-from openlibrary.plugins.upstream.utils import get_blog_feeds, get_coverstore_public_url
+from openlibrary.plugins.upstream.utils import get_blog_feeds
 from openlibrary.plugins.worksearch import search, subjects
 from openlibrary.utils import dateutil
 
@@ -201,64 +201,6 @@ def generic_carousel(
     return storify(books) if books else books
 
 
-def format_list_editions(key):
-    """Formats the editions of a list suitable for display in carousel."""
-    if 'env' not in web.ctx:
-        delegate.fakeload()
-
-    seed_list = web.ctx.site.get(key)
-    if not seed_list:
-        return []
-
-    editions = {}
-    for seed in seed_list.seeds:
-        if not isinstance(seed, str):
-            if seed.type.key == "/type/edition":
-                editions[seed.key] = seed
-            else:
-                try:
-                    e = pick_best_edition(seed)
-                except StopIteration:
-                    continue
-                editions[e.key] = e
-    return [format_book_data(e) for e in editions.values()]
-
-
-# cache the results of format_list_editions in memcache for 5 minutes
-format_list_editions = cache.memcache_memoize(
-    format_list_editions, "home.format_list_editions", timeout=5 * 60
-)
-
-
-def pick_best_edition(work):
-    return next(e for e in work.editions if e.ocaid)
-
-
-def format_work_data(work):
-    d = dict(work)
-
-    key = work.get('key', '')
-    # New solr stores the key as /works/OLxxxW
-    if not key.startswith("/works/"):
-        key = "/works/" + key
-
-    d['url'] = key
-    d['title'] = work.get('title', '')
-
-    if 'author_key' in work and 'author_name' in work:
-        d['authors'] = [
-            {"key": key, "name": name}
-            for key, name in zip(work['author_key'], work['author_name'])
-        ]
-
-    if 'cover_edition_key' in work:
-        coverstore_url = get_coverstore_public_url()
-        d['cover_url'] = f"{coverstore_url}/b/olid/{work['cover_edition_key']}-M.jpg"
-
-    d['read_url'] = "//archive.org/stream/" + work['ia'][0]
-    return d
-
-
 def format_book_data(book, fetch_availability=True):
     d = web.storage()
     d.key = book.get('key')