Skip to content

Make paths more generic #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 3, 2020
Merged

Make paths more generic #9

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e218a66
Make paths more generic
satyamtg Mar 25, 2020
628d152
Fix codefactor
satyamtg Mar 26, 2020
96c4d0c
Merge branch 'master' into more_generic_ogvjs
satyamtg Apr 2, 2020
6e40968
Fix failing tests and enhance
satyamtg Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/zimscraperlib/fix_ogvjs_dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
logging.basicConfig(format="%(levelname)s:%(message)s", level=logging.DEBUG)
logger = logging.getLogger(__name__)

function_block = """
generic_function_block = """
if (typeof zim_fix_wasm_target === 'undefined') {
IS_IN_ZIM = self.location.href.indexOf("/-/") != -1 || self.location.href.indexOf("/I/") != -1 || self.location.href.indexOf("/A/") != -1;
ZIM_IMG_NS = (IS_IN_ZIM) ? '../../../I/' : '';
ZIM_IMG_NS = (IS_IN_ZIM) ? '../../{extra_parent_jumps}../I/' : '';
hasImageNamespacePrefix = function(target) { return target.indexOf("/I/") != -1; }
hasMetaNamespacePrefix = function(target) { return target.indexOf("/-/") != -1; }
changeNamespacePrefix = function(target, new_ns) { return target.replace("/-/", new_ns); }
Expand Down Expand Up @@ -58,7 +58,10 @@

def fix_source_dir(source_vendors_path, dest_vendors_path="vendors"):
logger.info("about to add fix to ogv.js files to dynamicaly load wasm files in ZIM")

parent_dir_count = len(pathlib.Path(dest_vendors_path).parts)
function_block = generic_function_block.replace(
"{extra_parent_jumps}", "../" * (parent_dir_count - 1)
)
root = pathlib.Path(source_vendors_path)
ogvjs_path = root.joinpath("ogvjs")

Expand Down